commit e895000febd3ab0e9c82d37e4840afdc8ad46864
author Chen Xu <fionaxu@google.com> Mon Jan 30 21:11:16 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 30 21:11:16 2017 +0000
tree 637c5af9d7295b234ae96768dcf4737cba926db7
parent 740162d7f72937bd6433c574aeb0b5ad4ae6a778
parent 5e93bb6e9e746d7c64f8309e2d207368266c030b

Merge "revert deprecated sim activation logic"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 24a0aed..febb6e4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -133,6 +133,7 @@
     <uses-permission android:name="android.permission.DUMP" />
     <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
     <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
+    <uses-permission android:name="android.permission.BIND_IMS_SERVICE" />
     <uses-permission android:name="android.permission.BIND_CARRIER_SERVICES" />
     <!-- BIND_CARRIER_MESSAGING_SERVICE has been deprecated in favor of BIND_CARRIER_SERVICES. -->
     <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 38e40d7..b1ad364 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -62,6 +62,8 @@
 import android.util.Pair;
 import android.util.Slog;
 import com.android.ims.ImsManager;
+import com.android.ims.internal.IImsServiceController;
+import com.android.ims.internal.IImsServiceFeatureListener;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CellNetworkScanResult;
 import com.android.internal.telephony.CommandException;
@@ -2353,6 +2355,19 @@
         return mPhone.getPcscfAddress(apnType);
     }
 
+    /**
+     * Returns the {@link IImsServiceController} that corresponds to the given slot Id and IMS
+     * feature or {@link null} if the service is not available. If an ImsServiceController is
+     * available, the {@link IImsServiceFeatureListener} callback is registered as a listener for
+     * feature updates.
+     */
+    public IImsServiceController getImsServiceControllerAndListen(int slotId, int feature,
+            IImsServiceFeatureListener callback) {
+        enforceModifyPermission();
+        return PhoneFactory.getImsResolver().getImsServiceControllerAndListen(slotId, feature,
+                callback);
+    }
+
     public void setImsRegistrationState(boolean registered) {
         enforceModifyPermission();
         mPhone.setImsRegistrationState(registered);

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 59cba42..66df1a8 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -25,12 +25,13 @@
 
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := telephony-common android-support-test
+LOCAL_JAVA_LIBRARIES := telephony-common
 
 LOCAL_INSTRUMENTATION_FOR := TeleService
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
         android-support-test \
-        mockito-target
+        mockito-target \
+        legacy-android-test
 
 include $(BUILD_PACKAGE)