commit f49416b2abe24a53a4593da4c099634abeee80da
author joshmccloskey <joshmccloskey@google.com> Tue Jan 05 10:24:54 2021 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 16 01:11:06 2021 +0000
tree 89a87c538ce6361da4743aa79cbccdfb364c5eba
parent 5d3dfbadf159411481d4ac58c3bf493bf09a5222

Added nullptr check to pullFaceSettingsLocked

Fixes: 175852187
Test: It builds.
Change-Id: Id1eb98f071a96178de42285bb21ef7009517f748
(cherry picked from commit dab89bdde3893e53eb9a7df7f54fff3b2f4c5029)

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

diff --git a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
index 486de39..68ff022 100644
--- a/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
+++ b/services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
@@ -3362,7 +3362,11 @@
     int pullFaceSettingsLocked(int atomTag, List<StatsEvent> pulledData) {
         final long callingToken = Binder.clearCallingIdentity();
         try {
-            List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();
+            UserManager manager = mContext.getSystemService(UserManager.class);
+            if (manager == null) {
+                return StatsManager.PULL_SKIP;
+            }
+            List<UserInfo> users = manager.getUsers();
             int numUsers = users.size();
             FaceManager faceManager = mContext.getSystemService(FaceManager.class);