commit e8ecb98d5341395e073d02c065143ae3ac76ef71
author Sailesh Nepal <sail@google.com> Fri Jul 11 17:19:42 2014 -0700
committer Sailesh Nepal <sail@google.com> Fri Jul 11 19:53:48 2014 -0700
tree 51ab026e917a8dadb6dfde7c5aaff76f78a7eecf
parent 13e7740a9fed2ca0d998613dae45254f08e5b1c6

Misc Telecomm API changes - impl

This CL contains plumbing for Telecomm API changes made in
ag/501321.

As a cleanup I also made InCallController listen to changes
to calls directly instead of using CallsManager.

Change-Id: Iaffe0b84cea6003f2a9b9d8b30676743d2b236d4

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 94f5b6e..d8e4030 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -28,6 +28,7 @@
 import android.os.UserHandle;
 import android.telecomm.CallAudioState;
 import android.telecomm.CallCapabilities;
+import android.telecomm.CallPropertyPresentation;
 import android.telecomm.CallServiceDescriptor;
 import android.telecomm.CallState;
 import android.telecomm.InCallCall;
@@ -60,6 +61,38 @@
         }
     }
 
+    private final Call.Listener mCallListener = new Call.ListenerBase() {
+        @Override
+        public void onCallCapabilitiesChanged(Call call) {
+            updateCall(call);
+        }
+
+        @Override
+        public void onCannedSmsResponsesLoaded(Call call) {
+            updateCall(call);
+        }
+
+        @Override
+        public void onCallVideoProviderChanged(Call call) {
+            updateCall(call);
+        }
+
+        @Override
+        public void onStatusHintsChanged(Call call) {
+            updateCall(call);
+        }
+
+        @Override
+        public void onHandleChanged(Call call) {
+            updateCall(call);
+        }
+
+        @Override
+        public void onCallerDisplayNameChanged(Call call) {
+            updateCall(call);
+        }
+    };
+
     /** Maintains a binding connection to the in-call app. */
     private final InCallServiceConnection mConnection = new InCallServiceConnection();
 
@@ -80,6 +113,7 @@
             Log.i(this, "Adding call: %s", call);
             if (mCallIdMapper.getCallId(call) == null) {
                 mCallIdMapper.addCall(call);
+                call.addListener(mCallListener);
                 try {
                     mInCallService.addCall(toInCallCall(call));
                 } catch (RemoteException ignored) {
@@ -94,6 +128,7 @@
             // TODO(sail): Wait for all messages to be delivered to the service before unbinding.
             unbind();
         }
+        call.removeListener(mCallListener);
         mCallIdMapper.removeCall(call);
     }
 
@@ -133,37 +168,11 @@
     }
 
     @Override
-    public void onCallCapabilitiesChanged(Call call) {
-        updateCall(call);
-    }
-
-    @Override
     public void onIsConferencedChanged(Call call) {
         Log.v(this, "onIsConferencedChanged %s", call);
         updateCall(call);
     }
 
-    @Override
-    public void onCannedSmsResponsesLoaded(Call call) {
-        updateCall(call);
-    }
-
-    @Override
-    public void onCallVideoProviderChanged(Call call) {
-        updateCall(call);
-    }
-
-    @Override
-    public void onFeaturesChanged(Call call) {
-        Log.v(this,"onFeaturesChanged: %d", call.getFeatures());
-        updateCall(call);
-    }
-
-    @Override
-    public void onStatusHintsChanged(Call call) {
-        updateCall(call);
-    }
-
     void bringToForeground(boolean showDialpad) {
         if (mInCallService != null) {
             try {
@@ -303,10 +312,16 @@
             capabilities |= CallCapabilities.RESPOND_VIA_TEXT;
         }
 
+        Uri handle = call.getHandlePresentation() == CallPropertyPresentation.ALLOWED ?
+                call.getHandle() : null;
+        String callerDisplayName = call.getCallerDisplayNamePresentation() ==
+                CallPropertyPresentation.ALLOWED ?  call.getCallerDisplayName() : null;
+
         return new InCallCall(callId, state, call.getDisconnectCause(), call.getDisconnectMessage(),
-                call.getCannedSmsResponses(), capabilities, connectTimeMillis, call.getHandle(),
-                call.getGatewayInfo(), call.getPhoneAccount(), descriptor,
-                call.getCallVideoProvider(), parentCallId, childCallIds, call.getFeatures(),
-                call.getStatusHints());
+                call.getCannedSmsResponses(), capabilities, connectTimeMillis, handle,
+                call.getHandlePresentation(), callerDisplayName,
+                call.getCallerDisplayNamePresentation(), call.getGatewayInfo(),
+                call.getPhoneAccount(), descriptor, call.getCallVideoProvider(), parentCallId,
+                childCallIds, call.getStatusHints());
     }
 }