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

Merge "Checking nullness on ActivityManagerInternal."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-21 00:14:38 +00:00
committed by Android (Google) Code Review
parent c3a35738c1 cb273b324c
commit 3f37252db3
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,