Merge "Clear binder calling identity before calling callback" am: 483a604f27 am: cda8a7ec57

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1767051

Change-Id: Ia3476638f5ccf52d19ab2b0510e279ba70d519b0
This commit is contained in:
Benedict Wong
2021-07-15 18:55:23 +00:00
committed by Automerger Merge Worker

View File

@@ -111,7 +111,12 @@ public class TelephonyRegistryManager {
IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() { IOnSubscriptionsChangedListener callback = new IOnSubscriptionsChangedListener.Stub() {
@Override @Override
public void onSubscriptionsChanged () { 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); mSubscriptionChangedListenerMap.put(listener, callback);