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

Commit 7bb62bac 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: I9548863dbd15504f8845d42a9d09ffbf87c45283
parents 979393c4 c3bfdf52

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -46,7 +46,6 @@ import android.content.pm.PackageManagerInternal; 
import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.SuspendDialogInfo;

import android.content.pm.SuspendDialogInfo;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.os.Binder;

import android.os.Bundle;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserHandle;
@@ -304,7 +303,7 @@ class ActivityStartInterceptor { 
            return null;

            return null;

        }

        }

        // TODO(b/28935539): should allow certain activities to bypass work challenge

        // 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);

                FLAG_CANCEL_CURRENT | FLAG_ONE_SHOT | FLAG_IMMUTABLE);

        final KeyguardManager km = (KeyguardManager) mServiceContext

        final KeyguardManager km = (KeyguardManager) mServiceContext

                .getSystemService(KEYGUARD_SERVICE);

                .getSystemService(KEYGUARD_SERVICE);