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

Commit d0eb2c42 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make ATMService#mUiContext mockable" into tm-qpr-dev am: de5f0ae8 

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



Change-Id: Ie47dcdc2938cfcf10f4d46ed75f0b37aa0da34e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bf13e3b de5f0ae8

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

+2 −2
Original line number Diff line number Diff line
@@ -2120,7 +2120,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


        mActivityRecordInputSink = new ActivityRecordInputSink(this, sourceRecord);



        updateEnterpriseThumbnailDrawable(mAtmService.mUiContext);

        updateEnterpriseThumbnailDrawable(mAtmService.getUiContext());

    }



    /**
@@ -7433,7 +7433,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        }

        final Rect frame = win.getRelativeFrame();

        final Drawable thumbnailDrawable = task.mUserId == mWmService.mCurrentUserId

                ? mAtmService.mUiContext.getDrawable(R.drawable.ic_account_circle)

                ? mAtmService.getUiContext().getDrawable(R.drawable.ic_account_circle)

                : mEnterpriseThumbnailDrawable;

        final HardwareBuffer thumbnail = getDisplayContent().mAppTransition

                .createCrossProfileAppsThumbnail(thumbnailDrawable, frame);

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

+5 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
     * This Context is themable and meant for UI display (AlertDialogs, etc.). The theme can

     * change at runtime. Use mContext for non-UI purposes.

     */

    final Context mUiContext;

    private final Context mUiContext;

    final ActivityThread mSystemThread;

    H mH;

    UiHandler mUiHandler;
@@ -1041,6 +1041,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        }

    }



    Context getUiContext() {

        return mUiContext;

    }



    UserManagerService getUserManager() {

        if (mUserManager == null) {

            IBinder b = ServiceManager.getService(Context.USER_SERVICE);

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

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ public class DisplayPolicy { 
        mService = service;

        mContext = displayContent.isDefaultDisplay ? service.mContext

                : service.mContext.createDisplayContext(displayContent.getDisplay());

        mUiContext = displayContent.isDefaultDisplay ? service.mAtmService.mUiContext

        mUiContext = displayContent.isDefaultDisplay ? service.mAtmService.getUiContext()

                : service.mAtmService.mSystemThread

                        .getSystemUiContext(displayContent.getDisplayId());

        mDisplayContent = displayContent;