Merge "Clear calling identity before binding instant app resolver" into oc-dev (247b9c4a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/EphemeralResolverConnection.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.Context;
		import android.content.Intent;
		import android.content.ServiceConnection;
		import android.content.pm.InstantAppResolveInfo;
		import android.os.Binder;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -140,7 +141,12 @@ final class EphemeralResolverConnection implements DeathRecipient {
		if (mRemoteInstance != null) {
		return mRemoteInstance;
		}
		long binderToken = Binder.clearCallingIdentity();
		try {
		bindLocked(token);
		} finally {
		Binder.restoreCallingIdentity(binderToken);
		}
		return mRemoteInstance;
		}
		}