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

Commit 3ccf6490 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Handle missing ActivityTaskManager service" into main

parents 263e09ff 656cd8d6

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) {