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

Merge "Ensure ActivityManagerInternal instance is non-null"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-06 08:31:14 +00:00
committed by Gerrit Code Review
parent 37c9cdbd92 683bb56f33
commit 985723a5f5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
View File

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