commit 89b1481f240dba5f17b3b916aab7d20e6b3f92af
author Yorke Lee <yorkelee@google.com> Mon Jun 15 21:26:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 15 21:26:17 2015 +0000
tree 87884aa77ed5ae0974e2eda125f9e624f937eceb
parent c722ad9cf7f27ce544f4b80757c42e51f5e8071f
parent b3984309ff85330e0f99270d0bcd0e3d48055a6c

Merge "Send broadcast when default dialer changes" into mnc-dev

src/com/android/server/telecom/InCallController.java

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 79110a4..7fc5842 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -273,7 +273,11 @@
         while (iterator.hasNext()) {
             final Map.Entry<ComponentName, InCallServiceConnection> entry = iterator.next();
             Log.i(this, "Unbinding from InCallService %s", entry.getKey());
-            mContext.unbindService(entry.getValue());
+            try {
+                mContext.unbindService(entry.getValue());
+            } catch (Exception e) {
+                Log.e(this, e, "Exception while unbinding from InCallService");
+            }
             iterator.remove();
         }
         mInCallServices.clear();

src/com/android/server/telecom/TelecomServiceImpl.java

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index a07cd87..5d20956 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -19,8 +19,6 @@
 import static android.Manifest.permission.CALL_PHONE;
 import static android.Manifest.permission.MODIFY_PHONE_STATE;
 import static android.Manifest.permission.READ_PHONE_STATE;
-import static android.Manifest.permission.REGISTER_CALL_PROVIDER;
-import static android.Manifest.permission.REGISTER_CONNECTION_MANAGER;
 import static android.Manifest.permission.REGISTER_SIM_SUBSCRIPTION;
 import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
 
@@ -1095,18 +1093,10 @@
         enforceFeature(PackageManager.FEATURE_CONNECTION_SERVICE);
     }
 
-    private void enforceRegisterCallProviderPermission() {
-        enforcePermission(REGISTER_CALL_PROVIDER);
-    }
-
     private void enforceRegisterSimSubscriptionPermission() {
         enforcePermission(REGISTER_SIM_SUBSCRIPTION);
     }
 
-    private void enforceRegisterConnectionManagerPermission() {
-        enforcePermission(REGISTER_CONNECTION_MANAGER);
-    }
-
     private void enforceModifyPermission() {
         enforcePermission(MODIFY_PHONE_STATE);
     }