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

Checking nullness on ActivityManagerInternal.

Browse Source 
CTS test does not have a valid ActivityManagerInternal.

Bug: 178024608
Test: atest com.android.server.am.UserControllerTest#testStartUser_background
Change-Id: I1373ff511e1fb37a7698b37020074de9bb8a6ed3
This commit is contained in:
Hui Yu
2021-01-20 13:33:10 -08:00
parent a648085407
commit cb273b324c
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/PreBootBroadcaster.java
View File

@@ -110,8 +110,12 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
EventLogTags.writeAmPreBoot(mUserId, componentName.getPackageName());
mIntent.setComponent(componentName);
final long duration = LocalServices.getService(ActivityManagerInternal.class)
.getBootTimeTempAllowListDuration();
long duration = 10_000;
final ActivityManagerInternal amInternal =
LocalServices.getService(ActivityManagerInternal.class);
if (amInternal != null) {
duration = amInternal.getBootTimeTempAllowListDuration();
}
final BroadcastOptions bOptions = BroadcastOptions.makeBasic();
bOptions.setTemporaryAppWhitelistDuration(
BroadcastOptions.TEMPORARY_WHITELIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

8
services/core/java/com/android/server/am/UserController.java
View File

@@ -2811,8 +2811,12 @@ class UserController implements Handler.Callback {
}
private BroadcastOptions getTemporaryAppWhitelistBroadcastOptions() {
final long duration = LocalServices.getService(ActivityManagerInternal.class)
.getBootTimeTempAllowListDuration();
long duration = 10_000;
final ActivityManagerInternal amInternal =
LocalServices.getService(ActivityManagerInternal.class);
if (amInternal != null) {
duration = amInternal.getBootTimeTempAllowListDuration();
}
final BroadcastOptions bOptions = BroadcastOptions.makeBasic();
bOptions.setTemporaryAppWhitelistDuration(
BroadcastOptions.TEMPORARY_WHITELIST_TYPE_FOREGROUND_SERVICE_ALLOWED,

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -15071,8 +15071,12 @@ public class PackageManagerService extends IPackageManager.Stub
}
final IActivityManager am = ActivityManager.getService();
try {
final long duration = LocalServices.getService(ActivityManagerInternal.class)
.getBootTimeTempAllowListDuration();
long duration = 10_000;
final ActivityManagerInternal amInternal =
LocalServices.getService(ActivityManagerInternal.class);
if (amInternal != null) {
duration = amInternal.getBootTimeTempAllowListDuration();
}
final BroadcastOptions bOptions = BroadcastOptions.makeBasic();
bOptions.setTemporaryAppWhitelistDuration(
BroadcastOptions.TEMPORARY_WHITELIST_TYPE_FOREGROUND_SERVICE_ALLOWED,