commit aadd1085e4316c36f2ec9d5da6462d54de626394
author Varun Shah <varunshah@google.com> Mon Mar 01 20:22:48 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 01 20:22:48 2021 +0000
tree 14ee70042b73631c86ffdd8a3dace649b394fb4c
parent 54e2ec28d566778d5db0d663e3f52e084e0157e5
parent 3ce3553bd256ea6c5645d5271ff6bed35ac2a269

Merge "Fix NPE in AbstractMasterSystemService." into sc-dev

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) {