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

Commit 3f8b6158 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:... 

Merge "Ensure ActivityManagerInternal instance is non-null" am: 985723a5 am: 045ed333 am: b9dd1f4e am: 3ae3e748 am: afff9959 am: 0f55f6a5

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



Change-Id: Id71964fb4762dfa9ea8f8e7ea0c3af6c927fe959
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dddbe842 0f55f6a5

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

+1 −1
Original line number Diff line number Diff line
@@ -1911,6 +1911,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
@@ -2003,7 +2004,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);

    }