commit ffac02d98f60d213053646dff781768be0cdeab7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Dec 31 11:16:42 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 31 11:16:42 2019 +0000
tree 7ebbf537cb283d38b6aeac7803f250cf2a786e2c
parent eff34ec9113a4b5fb0bb90ea048db3ea8afeafa2
parent 9fa43dad068f7348f9a66fe3805416282a034332

Merge "Make getCameraIdListNoLazy handle no service case"

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

diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java
index b61b1ef..9b58578 100644
--- a/core/java/android/hardware/camera2/CameraManager.java
+++ b/core/java/android/hardware/camera2/CameraManager.java
@@ -1076,6 +1076,10 @@
         }
 
         public String[] getCameraIdListNoLazy() {
+            if (sCameraServiceDisabled) {
+                return new String[] {};
+            }
+
             CameraStatus[] cameraStatuses;
             ICameraServiceListener.Stub testListener = new ICameraServiceListener.Stub() {
                 @Override