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

Commit b9dd1f4e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure ActivityManagerInternal instance is non-null" am: 985723a5 am: 045ed333 

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



Change-Id: If74f1a65de4aaab4c3ec80cbe737692c09b50a10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 002e6a11 045ed333

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }