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

2021-03-01 20:22:48 +00:00
parent 54e2ec28d5 3ce3553bd2
commit aadd1085e4
1 changed files with 3 additions and 0 deletions
--- 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 abstract class AbstractMasterSystemService<M extends AbstractMasterSystem
        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) {