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 am: de5f0ae846 am: d0eb2c42e4

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

Change-Id: I95221660a3dd69c1694fa3683c115dbc7f994eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-09-10 03:01:39 +00:00
committed by Automerger Merge Worker
parent 9469a8e885 d0eb2c42e4
commit e1c357c29d
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);
updateEnterpriseThumbnailDrawable(mAtmService.mUiContext);
updateEnterpriseThumbnailDrawable(mAtmService.getUiContext());
}
/**
@@ -7424,7 +7424,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);

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

@@ -345,7 +345,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;
@@ -1040,6 +1040,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
}
}
Context getUiContext() {
return mUiContext;
}
UserManagerService getUserManager() {
if (mUserManager == null) {
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;
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;