Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aadd1085 authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

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

parents 54e2ec28 3ce3553b

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

+3 −0
Original line number Diff line number Diff line
@@ -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) {