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

Commit fed93f24 authored by Ronish Kalia's avatar Ronish Kalia Committed by Android (Google) Code Review
Browse files

Merge "Fix possible NPE for isolated apps and tests." into main

parents de2bc10f 381436a1

core/java/android/hardware/camera2/CameraManager.java

+4 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.os.Handler; 
import android.os.HandlerExecutor;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceSpecificException;
@@ -1704,7 +1705,9 @@ public final class CameraManager { 
            return ICameraService.ROTATION_OVERRIDE_NONE;

        }



        if (context != null) {

        // Isolated process does not have access to ActivityTaskManager service, which is used

        // indirectly in `ActivityManager.getAppTasks()`.

        if (context != null && !Process.isIsolated()) {

            final ActivityManager activityManager = context.getSystemService(ActivityManager.class);

            if (activityManager != null) {

                for (ActivityManager.AppTask appTask : activityManager.getAppTasks()) {