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

Commit f2c2e0ac authored by Ronish Kalia's avatar Ronish Kalia Committed by Automerger Merge Worker
Browse files

Merge "Use ActivityService from lock screen" into tm-dev am: 27e35ec6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17106086

Change-Id: I272a2ea2de87be68412622fdfe6baf13915b8702
parents d3016318 27e35ec6

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

+7 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.app.ActivityManager; 
import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.app.admin.DevicePolicyManager;

import android.content.ActivityNotFoundException;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;
@@ -1109,8 +1108,13 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL 
        Intent intent = mQRCodeScannerController.getIntent();

        if (intent != null) {

            try {

                mContext.startActivity(intent);

            } catch (ActivityNotFoundException e) {

                ActivityTaskManager.getService().startActivityAsUser(

                                null, getContext().getBasePackageName(),

                                getContext().getAttributionTag(), intent,

                                intent.resolveTypeIfNeeded(getContext().getContentResolver()),

                                null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, null,

                                UserHandle.CURRENT.getIdentifier());

            } catch (RemoteException e) {

                // This is unexpected. Nonetheless, just log the error and prevent the UI from

                // crashing

                Log.e(TAG, "Unexpected intent: " + intent