commit 3ce3553bd256ea6c5645d5271ff6bed35ac2a269
author Varun Shah <varunshah@google.com> Mon Mar 01 10:51:14 2021 -0800
committer Varun Shah <varunshah@google.com> Mon Mar 01 10:51:14 2021 -0800
tree 749d0078a8fe3ae72729c1c04b2ef317371865bc
parent 7edf52d6029065ecf68eac83a77d2ccbf1519cf1

Fix NPE in AbstractMasterSystemService.

Bug: 181073374
Test: m
Change-Id: Iaad90fbaccd8238d4a55fb6e5a2ee83d28028e10

services/core/java/com/android/server/infra/AbstractMasterSystemService.java

diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
index bd577f3..016c5ed 100644
--- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
@@ -1052,6 +1052,9 @@
         public void onChange(boolean selfChange, Uri uri, @UserIdInt int userId) {
             if (verbose) Slog.v(mTag, "onChange(): uri=" + uri + ", userId=" + userId);
             final String property = uri.getLastPathSegment();
+            if (property == null) {
+                return;
+            }
             if (property.equals(getServiceSettingsProperty())
                     || property.equals(Settings.Secure.USER_SETUP_COMPLETE)) {
                 synchronized (mLock) {