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

Make ATMService#mUiContext mockable

Browse Source 
Some vendor-specific (lightweight) unit tests use the real class for
ActivityRecord but mock ActivityTaskManagerService (e.g.
ArcLaunchParamsModifierTest).

The problem is that ActivityRecord directly accesses
ATMService#mUiContext to get the DevicePolicyManager service and the
property itself is marked as final, so this cannot be replaced with a
mock and instantiating ActivityRecord fails.

Bug: 244515960
Test: atest ArcLaunchParamsModifierTest
Change-Id: I2fc015d9f3dc4ce88607355b8e2a2849c2ac7fb4
This commit is contained in:
Kazuki Takise
2022-09-09 17:35:46 +09:00
parent f5ee8436e1
commit 4121d6bd7d
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());
}
/**
@@ -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);

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
* 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);

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;