OSDN Git Service

CameraManager: Handle camera service being disabled explicitly
authorEino-Ville Talvala <etalvala@google.com>
Thu, 13 Jul 2017 19:07:20 +0000 (12:07 -0700)
committerDanny Epstein <depstein@google.com>
Fri, 14 Jul 2017 20:57:59 +0000 (20:57 +0000)
commitda2c28371231259f73b282122a41468fdb06ae39
treeeec0e6d2c3fa39c46be7621a11b73cda1957246d
parent1eb9c771747ef1fc8a74a4657811b4e6107594f5
CameraManager: Handle camera service being disabled explicitly

Previously, CameraManager handled a disabled camera service
implicitly, the same as it handles a temporarily-crashed camera
service.

However, the error reporting for the those cases isn't really the
same, so switch to being explicit - check for the disabled camera
service system property, and if it's set, short-circuit calls.

Test: Camera CTS continues to pass, Watch device with no camera
      service also now passes camera CTS.
Bug: 62269118

Change-Id: I65a97f8c1b0f101999b2c04d4f1096b7f3aee858
(cherry picked from commit 19d96a197fbbca281c907f14af294dae2a8b4db1)
core/java/android/hardware/camera2/CameraManager.java