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

Commit 862307a3 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE during restore" into sc-dev am: c9c32d5f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15235504

Change-Id: Idabb95e4f756f373763221bcc4e70ce1e74523e5
parents bb668433 c9c32d5f

services/core/java/com/android/server/notification/ManagedServices.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -570,10 +570,12 @@ abstract public class ManagedServices { 
    protected final void migrateToXml() {

    protected final void migrateToXml() {

        for (UserInfo user : mUm.getUsers()) {

        for (UserInfo user : mUm.getUsers()) {

            final ContentResolver cr = mContext.getContentResolver();

            final ContentResolver cr = mContext.getContentResolver();

            if (!TextUtils.isEmpty(getConfig().secureSettingName)) {

                addApprovedList(Settings.Secure.getStringForUser(

                addApprovedList(Settings.Secure.getStringForUser(

                        cr,

                        cr,

                        getConfig().secureSettingName,

                        getConfig().secureSettingName,

                        user.id), user.id, true);

                        user.id), user.id, true);

            }

            if (!TextUtils.isEmpty(getConfig().secondarySettingName)) {

            if (!TextUtils.isEmpty(getConfig().secondarySettingName)) {

                addApprovedList(Settings.Secure.getStringForUser(

                addApprovedList(Settings.Secure.getStringForUser(

                        cr,

                        cr,

services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java

+51 −0
Original line number Original line Diff line number Diff line
@@ -278,6 +278,36 @@ public class ManagedServicesTest extends UiServiceTestCase { 
        }

        }

    }

    }





    @Test

    public void testReadXml_noLongerMigrateFromSettings() throws Exception {

        for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {

            ManagedServices service = new TestManagedServicesNoSettings(getContext(), mLock,

                    mUserProfiles, mIpm, approvalLevel);



            // approved services aren't in xml

            TypedXmlPullParser parser = Xml.newFastPullParser();

            parser.setInput(new BufferedInputStream(new ByteArrayInputStream(new byte[]{})),

                    null);

            writeExpectedValuesToSettings(approvalLevel);



            service.migrateToXml();

            // No crash? success



            ArrayMap<Integer, String> verifyMap = approvalLevel == APPROVAL_BY_COMPONENT

                    ? mExpectedPrimary.get(service.mApprovalLevel)

                    : mExpectedSecondary.get(service.mApprovalLevel);

            for (int userId : verifyMap.keySet()) {

                for (String verifyValue : verifyMap.get(userId).split(":")) {

                    if (!TextUtils.isEmpty(verifyValue)) {

                        assertFalse("service type " + service.mApprovalLevel + ":"

                                        + verifyValue + " is allowed for user " + userId,

                                service.isPackageOrComponentAllowed(verifyValue, userId));

                    }

                }

            }

        }

    }



    @Test

    @Test

    public void testReadXml() throws Exception {

    public void testReadXml() throws Exception {

        for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {

        for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
@@ -1766,4 +1796,25 @@ public class ManagedServicesTest extends UiServiceTestCase { 
            return true;

            return true;

        }

        }

    }

    }



    class TestManagedServicesNoSettings extends TestManagedServices {



        public TestManagedServicesNoSettings(Context context, Object mutex, UserProfiles userProfiles,

                IPackageManager pm, int approvedServiceType) {

            super(context, mutex, userProfiles, pm, approvedServiceType);

        }



        @Override

        protected Config getConfig() {

            Config c = super.getConfig();

            c.secureSettingName = null;

            c.secondarySettingName = null;

            return c;

        }



        @Override

        public boolean shouldReflectToSettings() {

            return false;

        }

    }

}
 
}