commit d1dec575e87b2ed060c482a9dda70b4a181bd55a
author Tyler Gunn <tgunn@google.com> Thu Apr 04 11:35:22 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 04 11:35:22 2019 -0700
tree b71603a47d9bc7c8529d2c5780369c7e812f6e9b
parent c0e45e86c545288c7560d6718a2f44c7c468505e
parent 46329f27deaf72089ffdb498ad66a7d6e7dfb3b1

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

Change-Id: I9a44ca8696c226fdce5a9d45f39ad37147e8c079

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6c8991f..23fa48f 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.
      */