| commit | ee844a800889eca5dfe658fbd953946ca1920fae | [log] [tgz] |
|---|---|---|
| author | Ivan Podogov <ginkage@google.com> | Thu Sep 15 11:32:41 2016 +0100 |
| committer | Ivan Podogov <ginkage@google.com> | Fri Sep 16 11:15:58 2016 +0100 |
| tree | 2cf0bebb0f1a709bc5556c91a78219c53c538594 | |
| parent | 47c996ba170821326a98fdde468ecf860904db3e [diff] |
Don't try to connect camera service if it is disabled. On Android Wear devices we don't have cameras, so we don't need the proxy service as well. If it is disabled by the system property, don't wait for it to start, but rather return null pointer in getCameraService(), which causes getNumberOfCameras() to report zero cameras available. The same logic applies to ACameraManager, where we return an empty list. Bug: 28560707 Change-Id: I4c0bc29f061f1b66710c8188a7916bfaf089d23f