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);
         }
     }
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);
-    }
 }
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();
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