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

Commit 6384812b authored by Adam He's avatar Adam He
Browse files

Check mSetupComplete on initialization to avoid service being disabled.

Fixes: 135297073
Test: manual verification && atest CtsContentCaptureServiceTestCases
Change-Id: Ida283990c7800ac6946f7e5905e67ca1b21d8bbc
parent 66c02ffd
Loading
Loading
Loading
Loading
+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();