Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb273b32 authored Jan 20, 2021 by Hui Yu

Checking nullness on ActivityManagerInternal.

CTS test does not have a valid ActivityManagerInternal.

Bug: 178024608
Test: atest com.android.server.am.UserControllerTest#testStartUser_background
Change-Id: I1373ff511e1fb37a7698b37020074de9bb8a6ed3

parent a6480854

services/core/java/com/android/server/am/PreBootBroadcaster.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -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,

services/core/java/com/android/server/am/UserController.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -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,

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -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,