Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-09-10 02:35:24 +00:00
committed by Android (Google) Code Review
parent c666fc8def 4121d6bd7d
commit de5f0ae846
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -2120,7 +2120,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
mActivityRecordInputSink = new ActivityRecordInputSink(this, sourceRecord); 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 Rect frame = win.getRelativeFrame();
final Drawable thumbnailDrawable = task.mUserId == mWmService.mCurrentUserId final Drawable thumbnailDrawable = task.mUserId == mWmService.mCurrentUserId
? mAtmService.mUiContext.getDrawable(R.drawable.ic_account_circle) ? mAtmService.getUiContext().getDrawable(R.drawable.ic_account_circle)
: mEnterpriseThumbnailDrawable; : mEnterpriseThumbnailDrawable;
final HardwareBuffer thumbnail = getDisplayContent().mAppTransition final HardwareBuffer thumbnail = getDisplayContent().mAppTransition
.createCrossProfileAppsThumbnail(thumbnailDrawable, frame); .createCrossProfileAppsThumbnail(thumbnailDrawable, frame);

6
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -346,7 +346,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
* This Context is themable and meant for UI display (AlertDialogs, etc.). The theme can * This Context is themable and meant for UI display (AlertDialogs, etc.). The theme can
* change at runtime. Use mContext for non-UI purposes. * change at runtime. Use mContext for non-UI purposes.
*/ */
final Context mUiContext; private final Context mUiContext;
final ActivityThread mSystemThread; final ActivityThread mSystemThread;
H mH; H mH;
UiHandler mUiHandler; UiHandler mUiHandler;
@@ -1041,6 +1041,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
} }
} }
Context getUiContext() {
return mUiContext;
}
UserManagerService getUserManager() { UserManagerService getUserManager() {
if (mUserManager == null) { if (mUserManager == null) {
IBinder b = ServiceManager.getService(Context.USER_SERVICE); IBinder b = ServiceManager.getService(Context.USER_SERVICE);

2
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -421,7 +421,7 @@ public class DisplayPolicy {
mService = service; mService = service;
mContext = displayContent.isDefaultDisplay ? service.mContext mContext = displayContent.isDefaultDisplay ? service.mContext
: service.mContext.createDisplayContext(displayContent.getDisplay()); : service.mContext.createDisplayContext(displayContent.getDisplay());
mUiContext = displayContent.isDefaultDisplay ? service.mAtmService.mUiContext mUiContext = displayContent.isDefaultDisplay ? service.mAtmService.getUiContext()
: service.mAtmService.mSystemThread : service.mAtmService.mSystemThread
.getSystemUiContext(displayContent.getDisplayId()); .getSystemUiContext(displayContent.getDisplayId());
mDisplayContent = displayContent; mDisplayContent = displayContent;