From 683bb56f3385e3566148e360b69fb5c775822344 Mon Sep 17 00:00:00 2001 From: "gang.huang" Date: Mon, 22 May 2023 15:44:55 +0800 Subject: [PATCH] Ensure ActivityManagerInternal instance is non-null Pulling up the initialization to avoid having earlier code run into uses of mActivityManagerInternal. Bug: 283724099 Test: Manual. Change-Id: I910993401915bc67af73bc7ad3e68a6a76df8026 --- .../java/com/android/server/alarm/AlarmManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java index 37ce0d29d0e10..af6334cbbd868 100644 --- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java +++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java @@ -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); }