commit bf0a5d8fcc710bf7b64d41da99469e7b875f60ea
author Eran Messeri <eranm@google.com> Tue May 14 09:59:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 14 09:59:37 2019 -0700
tree cf62184155b3a9043a5e0cd30fd57c70ed5e437d
parent c857e6f7794b04b519b6a887de651277cb598d86
parent c3bfdf5267958a1c792e958f5e2d3f8306f28776

Merge "Fix sharing into a locked work profile" into qt-dev
am: c3bfdf5267

Change-Id: If6b85b986c76ce894937f3cedb94a8da528b9354

services/core/java/com/android/server/wm/ActivityStartInterceptor.java

diff --git a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
index b8442a8..1cdb49d 100644
--- a/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
+++ b/services/core/java/com/android/server/wm/ActivityStartInterceptor.java
@@ -46,7 +46,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.SuspendDialogInfo;
 import android.content.pm.UserInfo;
-import android.os.Binder;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.os.UserHandle;
@@ -304,7 +303,7 @@
             return null;
         }
         // TODO(b/28935539): should allow certain activities to bypass work challenge
-        final IntentSender target = createIntentSenderForOriginalIntent(Binder.getCallingUid(),
+        final IntentSender target = createIntentSenderForOriginalIntent(mCallingUid,
                 FLAG_CANCEL_CURRENT | FLAG_ONE_SHOT | FLAG_IMMUTABLE);
         final KeyguardManager km = (KeyguardManager) mServiceContext
                 .getSystemService(KEYGUARD_SERVICE);