| commit | c52243f298aa3e570197831c8c383fdedb8f4ac6 | [log] [tgz] |
|---|---|---|
| author | Jayant Chowdhary <jchowdhary@google.com> | Mon Oct 21 17:00:19 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Oct 21 17:00:19 2019 +0000 |
| tree | ef93786ab04ffd918b68adbb25d1c3a43633d791 | |
| parent | 4426ce8d95c78ba08d86c6d6c7f329033c1876c8 [diff] | |
| parent | fd39db81e44e191baa476a579de6cc2618de025a [diff] |
Merge changes from topic "hiddenCameraDeadlock" * changes: cameraserver: Avoiding deadlocks while calling isPublicallyHiddenSecureCamera(). Do not include hidden secure cameras in camera1: getNumberOfCameras