commit 483a604f27ba31a02159dbf6e55088627c6b8c7b
author Benedict Wong <benedictwong@google.com> Thu Jul 15 18:20:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 15 18:20:14 2021 +0000
tree 4a96d7a7443fb79281e601adf51c8c17788f81f0
parent 2f3d6bc5932027ec425d1cf0fbdac06aac85455b
parent bc02830a593112e8a541388f3c6b87dea19e86b3

Merge "Clear binder calling identity before calling callback"

core/java/android/telephony/TelephonyRegistryManager.java

diff --git a/core/java/android/telephony/TelephonyRegistryManager.java b/core/java/android/telephony/TelephonyRegistryManager.java
index 161d10a..ba288188 100644
--- a/core/java/android/telephony/TelephonyRegistryManager.java
+++ b/core/java/android/telephony/TelephonyRegistryManager.java
@@ -111,7 +111,12 @@
         IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() {
             @Override
             public void onSubscriptionsChanged () {
-                executor.execute(() -> listener.onSubscriptionsChanged());
+                final long identity = Binder.clearCallingIdentity();
+                try {
+                    executor.execute(() -> listener.onSubscriptionsChanged());
+                } finally {
+                    Binder.restoreCallingIdentity(identity);
+                }
             }
         };
         mSubscriptionChangedListenerMap.put(listener, callback);