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

Commit 656cd8d6 authored by Benjamin Gordon's avatar Benjamin Gordon
Browse files

Handle missing ActivityTaskManager service 

ActivityTaskManager.getService can return null if
SystemManager.getService(Context.ACTIVITY_TASK_SERVICE) returns null.
StrictMode.registerBackgroundActivityStartCallback needs to check for
this so it doesn't try to register a callback on a non-object.

Bug: 376302055
Bug: 324089586
Test: atest CtsPrintTestCases
Change-Id: If71e95981f1c7c23e21968405ae3e30149d16417
parent 22bc5136

core/java/android/os/StrictMode.java

+5 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.app.ActivityManager; 
import android.app.ActivityTaskManager;

import android.app.ActivityThread;

import android.app.IActivityManager;

import android.app.IActivityTaskManager;

import android.app.IBackgroundActivityLaunchCallback;

import android.app.IUnsafeIntentStrictModeCallback;

import android.app.PendingIntent;
@@ -2189,8 +2190,11 @@ public final class StrictMode { 


    private static void registerBackgroundActivityLaunchCallback() {

        try {

            ActivityTaskManager.getService().registerBackgroundActivityStartCallback(

            IActivityTaskManager service = ActivityTaskManager.getService();

            if (service != null) {

                service.registerBackgroundActivityStartCallback(

                    new BackgroundActivityLaunchCallback());

            }

        } catch (DeadObjectException e) {

            // ignore

        } catch (RemoteException e) {