commit f6c0a2591710b7a2c8b0018c7f1aa6dc1dbf8516
author Tyler Gunn <tgunn@google.com> Thu Apr 04 18:06:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 04 18:06:49 2019 -0700
tree 7f1e20de46f480d8756af449b87334a75811e8de
parent 4982fcdf5a845f17b07f36e49aa8ff1fb653c6ca
parent d1dec575e87b2ed060c482a9dda70b4a181bd55a

Merge "Implementation for getPhoneAccountHandleForSubscriptionId method." am: 46329f27de
am: d1dec575e8

Change-Id: Ic2b9c6185b8b3b087e0a9277a5a59a63cba8b982

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 4423921..f7d0979 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -21,6 +21,7 @@
 import static com.android.internal.telephony.PhoneConstants.SUBSCRIPTION_KEY;
 
 import android.Manifest.permission;
+import android.annotation.Nullable;
 import android.app.AppOpsManager;
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -5298,6 +5299,20 @@
         }
     }
 
+    @Override
+    public @Nullable PhoneAccountHandle getPhoneAccountHandleForSubscriptionId(int subscriptionId) {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subscriptionId);
+            if (phone == null) {
+                return null;
+            }
+            return PhoneUtils.makePstnPhoneAccountHandle(phone);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
     /**
      * @return the VoWiFi calling availability.
      */