Merge "Ensure ActivityManagerInternal instance is non-null" am: 985723a5f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2598293

Change-Id: Ib08206ad582e96b6cce5a0b857043d7df08ad429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-06 09:06:38 +00:00
committed by Automerger Merge Worker

View File

@@ -1882,6 +1882,7 @@ public class AlarmManagerService extends SystemService {
mActivityOptsRestrictBal.setPendingIntentBackgroundActivityLaunchAllowed(false);
mBroadcastOptsRestrictBal.setPendingIntentBackgroundActivityLaunchAllowed(false);
mMetricsHelper = new MetricsHelper(getContext(), mLock);
mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
mListenerDeathRecipient = new IBinder.DeathRecipient() {
@Override
@@ -1983,7 +1984,6 @@ public class AlarmManagerService extends SystemService {
Slog.w(TAG, "Failed to open alarm driver. Falling back to a handler.");
}
}
mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
publishLocalService(AlarmManagerInternal.class, new LocalService());
publishBinderService(Context.ALARM_SERVICE, mService);
}