commit 247b9c4a0a6720816c1119df7a05d18a8fe8f35d
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 15 09:18:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 15 09:18:27 2017 +0000
tree ca1d8fc3cb6343bef02c5dfbda77c527b3c5da46
parent f0223b1fa8dcb7f9d779ae95229490cba6ab98f3
parent f2645400c255aae29a217c5003fa661a0b4da6f1

Merge "Clear calling identity before binding instant app resolver" into oc-dev

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

diff --git a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java
index aa780cc..1de3936 100644
--- a/services/core/java/com/android/server/pm/EphemeralResolverConnection.java
+++ b/services/core/java/com/android/server/pm/EphemeralResolverConnection.java
@@ -23,6 +23,7 @@
 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 @@
             if (mRemoteInstance != null) {
                 return mRemoteInstance;
             }
-            bindLocked(token);
+            long binderToken = Binder.clearCallingIdentity();
+            try {
+                bindLocked(token);
+            } finally {
+                Binder.restoreCallingIdentity(binderToken);
+            }
             return mRemoteInstance;
         }
     }