Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf0a5d8f authored by Eran Messeri's avatar Eran Messeri Committed by android-build-merger
Browse files

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

am: c3bfdf52

Change-Id: If6b85b986c76ce894937f3cedb94a8da528b9354
parents c857e6f7 c3bfdf52
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.content.pm.PackageManagerInternal;
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 @@ class ActivityStartInterceptor {
            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);