commit 3ec906f3bff85943c084454191cad1f8e8b255c9
author Baligh Uddin <baligh@google.com> Fri Jun 27 23:45:57 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 26 18:07:29 2014 +0000
tree 1a3246725b63224a78aeb97fbaafbe4f737d81e9
parent c75401c58c60aca1fd8528f3bc1e1f7336efbf3b
parent d673b19f5b9a6de11bc8cde6aa0b6aa7c0dd8691

Merge "Import translations. DO NOT MERGE"

src/com/android/phone/CallLogger.java

diff --git a/src/com/android/phone/CallLogger.java b/src/com/android/phone/CallLogger.java
index 8322101..fcc55ce 100644
--- a/src/com/android/phone/CallLogger.java
+++ b/src/com/android/phone/CallLogger.java
@@ -130,7 +130,7 @@
             }
 
             CallLogAsync.AddCallArgs args = new CallLogAsync.AddCallArgs(mApplication, ci, number,
-                    presentation, callType, start, duration);
+                    presentation, callType, null, start, duration);
             mCallLog.addCall(args);
         }
     }

src/com/android/services/telephony/GsmConnection.java

diff --git a/src/com/android/services/telephony/GsmConnection.java b/src/com/android/services/telephony/GsmConnection.java
index d37accd..34ef27e 100644
--- a/src/com/android/services/telephony/GsmConnection.java
+++ b/src/com/android/services/telephony/GsmConnection.java
@@ -53,10 +53,4 @@
             Log.e(this, e, "Failed to conference call.");
         }
     }
-
-    @Override
-    public void setIsConferenceCapable(boolean isConferenceCapable) {
-        // This method increases access modifier.
-        super.setIsConferenceCapable(isConferenceCapable);
-    }
 }

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 43e72c8..f379347 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -124,7 +124,7 @@
     }
 
     @Override
-    protected void onSetAudioState(CallAudioState audioState) {
+    public void onSetAudioState(CallAudioState audioState) {
         // TODO: update TTY mode.
         if (mOriginalConnection != null) {
             Call call = mOriginalConnection.getCall();

tests/src/com/android/phone/CnapTest.java

diff --git a/tests/src/com/android/phone/unit/CnapTest.java b/tests/src/com/android/phone/CnapTest.java
similarity index 100%
rename from tests/src/com/android/phone/unit/CnapTest.java
rename to tests/src/com/android/phone/CnapTest.java