Snap for 5713174 from df0177f979a4f5ca82f302bc00aab03f417432b8 to qt-release (14f0e3a4) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/PhoneSubInfoController.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -126,7 +126,14 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {

		public String getSubscriberIdForSubscriber(int subId, String callingPackage) {
		String message = "getSubscriberId";
		if (SubscriptionController.getInstance().isActiveSubId(subId, callingPackage)) {
		long identity = Binder.clearCallingIdentity();
		boolean isActive;
		try {
		isActive = SubscriptionController.getInstance().isActiveSubId(subId, callingPackage);
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		if (isActive) {
		return callPhoneMethodForSubIdWithReadSubscriberIdentifiersCheck(subId, callingPackage,
		message, (phone) -> phone.getSubscriberId());
		} else {
		@@ -134,7 +141,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
		mContext, subId, callingPackage, message)) {
		return null;
		}
		final long identity = Binder.clearCallingIdentity();
		identity = Binder.clearCallingIdentity();
		try {
		return SubscriptionController.getInstance().getImsiPrivileged(subId);
		} finally {