Merge "Clear binder calling identity before calling callback" into sc-dev (520eb408) · Commits · e / os / android_frameworks_base

core/java/android/telephony/TelephonyRegistryManager.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 () {
			final long identity = Binder.clearCallingIdentity();
			try {
	executor.execute(() -> listener.onSubscriptionsChanged());		executor.execute(() -> listener.onSubscriptionsChanged());
			} finally {
			Binder.restoreCallingIdentity(identity);
			}
	}		}
	};		};
	mSubscriptionChangedListenerMap.put(listener, callback);		mSubscriptionChangedListenerMap.put(listener, callback);