commit e8fb93cc2bde8e840e1d2c09c083428d29aec298
author Greg Kaiser <gkaiser@google.com> Wed Feb 03 07:24:05 2021 -0800
committer Greg Kaiser <gkaiser@google.com> Wed Feb 03 07:31:25 2021 -0800
tree c8d2950166141432dbd55d982f2763026a00ae58
parent c5634ebd5d96a7aec03d726d0a805be9ab07ae02

CameraService: Initialize two fields in constructor

isIndividual was potentially being read uninitialized in
onSensorPrivacyChanged().  In theory, userId wasn't being read
uninitialized with the current logic, but we choose to
future-proof by initializing it to a known value.

Bug: 170156750
Bug: 162549680
Test: TreeHugger
Change-Id: I7672fe90556ab71bc3d9021d5adc91b9f4e0a5c3

services/camera/libcameraservice/CameraService.h

diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index f455cbb..5f16d41 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/camera/libcameraservice/CameraService.h
@@ -637,7 +637,8 @@
             public virtual IBinder::DeathRecipient {
         public:
             explicit SensorPrivacyPolicy(wp<CameraService> service)
-                    : mService(service), mSensorPrivacyEnabled(false), mRegistered(false) {}
+                    : mService(service), mSensorPrivacyEnabled(false), mRegistered(false),
+                      isIndividual(false), userId(0) {}
 
             void registerSelf();
             status_t registerSelfForIndividual(int userId);