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

Commit 92d54d53 authored by Adam He's avatar Adam He Committed by android-build-merger
Browse files

Merge "Check mSetupComplete on initialization to avoid service being disabled." into qt-r1-dev 

am: 74a07534

Change-Id: Ib5616112d5a67a59c3d0e25f614f01f791d4c0e4
parents 1ca1db63 74a07534

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

+9 −3
Original line number Original line Diff line number Diff line
@@ -75,6 +75,14 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst 
        mMaster = master;

        mMaster = master;

        mLock = lock;

        mLock = lock;

        mUserId = userId;

        mUserId = userId;

        updateIsSetupComplete(userId);

    }



    /** Updates whether setup is complete for current user */

    private void updateIsSetupComplete(@UserIdInt int userId) {

        final String setupComplete = Settings.Secure.getStringForUser(

                getContext().getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, userId);

        mSetupComplete = "1".equals(setupComplete);

    }

    }





    /**

    /**
@@ -143,9 +151,7 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst 
                    + ", disabled=" + disabled + ", mDisabled=" + mDisabled);

                    + ", disabled=" + disabled + ", mDisabled=" + mDisabled);

        }

        }





        final String setupComplete = Settings.Secure.getStringForUser(

        updateIsSetupComplete(mUserId);

                getContext().getContentResolver(), Settings.Secure.USER_SETUP_COMPLETE, mUserId);

        mSetupComplete = "1".equals(setupComplete);

        mDisabled = disabled;

        mDisabled = disabled;





        updateServiceInfoLocked();

        updateServiceInfoLocked();