commit 101f907ddb6b3edc259792a841d8e10c58c0f613
author Xiangyu/Malcolm Chen <refuhoo@google.com> Wed Oct 31 01:38:15 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 31 01:38:15 2018 +0000
tree db7b3c16bae493c908da6ae4c3db19f57c02c639
parent 6b5d06fe4d68eef79056785a2819fadc2148bb69
parent 74b7cbc0324ef4caac53dc46405f0e24a705e0cb

Merge "Clear calling identity in callback."

telephony/java/android/telephony/SubscriptionManager.java

diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 0459667..0ba18ee 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -43,6 +43,7 @@
 import android.net.INetworkPolicyManager;
 import android.net.NetworkCapabilities;
 import android.net.Uri;
+import android.os.Binder;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
@@ -781,8 +782,13 @@
         IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() {
             @Override
             public void onSubscriptionsChanged() {
-                if (DBG) log("onOpportunisticSubscriptionsChanged callback received.");
-                mExecutor.execute(() -> onOpportunisticSubscriptionsChanged());
+                final long identity = Binder.clearCallingIdentity();
+                try {
+                    if (DBG) log("onOpportunisticSubscriptionsChanged callback received.");
+                    mExecutor.execute(() -> onOpportunisticSubscriptionsChanged());
+                } finally {
+                    Binder.restoreCallingIdentity(identity);
+                }
             }
         };