commit 2d7e351a6e934b0f6bf17c61bc38880bc3af13ce
author Jaekyun Seok <jaekyun@google.com> Wed Mar 28 19:12:11 2018 +0900
committer Jaekyun Seok <jaekyun@google.com> Sat Mar 31 02:01:40 2018 +0900
tree 0d6428db774f7b773ad09321c97c775ba2af857d
parent 92f8d8b1f3818a793bce02b6c956a6a23ae7985a

Fix NPE on a device having no sensor

If a device has no sensor, mUidPolicy isn't set. So mUidPolicy should be
initialized unconditionally.

Bug: 77151317
Bug: 76407833
Test: succeeded building and tested with a device having no sensor
Change-Id: I3ef9f252c220d58bdab5e4f458e48b74b66091ee

services/sensorservice/SensorService.cpp

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 2bd0a19..8e9e7fd 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -86,6 +86,7 @@
 SensorService::SensorService()
     : mInitCheck(NO_INIT), mSocketBufferSize(SOCKET_BUFFER_SIZE_NON_BATCHED),
       mWakeLockAcquired(false) {
+    mUidPolicy = new UidPolicy(this);
 }
 
 bool SensorService::initializeHmacKey() {
@@ -283,7 +284,6 @@
             enableSchedFifoMode();
 
             // Start watching UID changes to apply policy.
-            mUidPolicy = new UidPolicy(this);
             mUidPolicy->registerSelf();
         }
     }