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

Commit e347075d authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Allow BAL permission for UserManagerService" into main

parents b3f4129f 656c408d

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

+5 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.annotation.UserIdInt; 
import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.ActivityManagerNative;

import android.app.ActivityOptions;

import android.app.BroadcastOptions;

import android.app.IActivityManager;

import android.app.IStopUserCallback;
@@ -587,7 +588,10 @@ public class UserManagerService extends IUserManager.Stub { 
        public void onFinished(int id, Bundle extras) {

            mHandler.post(() -> {

                try {

                    mContext.startIntentSender(mTarget, null, 0, 0, 0);

                    ActivityOptions activityOptions =

                            ActivityOptions.makeBasic().setPendingIntentBackgroundActivityStartMode(

                                    ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

                    mContext.startIntentSender(mTarget, null, 0, 0, 0, activityOptions.toBundle());

                } catch (IntentSender.SendIntentException e) {

                    Slog.e(LOG_TAG, "Failed to start the target in the callback", e);

                }