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

Commit 985723a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Ensure ActivityManagerInternal instance is non-null"

parents 37c9cdbd 683bb56f

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

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

    }

    }