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

Commit 5d26b8c0 authored by Annie Meng's avatar Annie Meng
Browse files

Fix NPE in ComponentNameValidator 

In general, we should consider null component names as invalid settings,
meaning that we don't restore.

b/79925290 to allow restoring null component names for specific
settings where null has semantic meaning.

Bug: 79910479
Test: 1) atest SettingsValidatorsTest
2) Manual:
- In Settings UI, select "None" for autofill service and accessibility
shortcut target
- "adb backup -keyvalue -f nullsettings.ab com.android.providers.settings"
- "adb restore nullsettings.ab" and verify no crashes
Change-Id: Iffecbe7d26a93a816e7be42f564ba471f9681876
parent bc7a12b0

core/java/android/provider/SettingsValidators.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ public class SettingsValidators { 
    public static final Validator COMPONENT_NAME_VALIDATOR = new Validator() {

    public static final Validator COMPONENT_NAME_VALIDATOR = new Validator() {

        @Override

        @Override

        public boolean validate(String value) {

        public boolean validate(String value) {

            return ComponentName.unflattenFromString(value) != null;

            return value != null && ComponentName.unflattenFromString(value) != null;

        }

        }

    };

    };

core/tests/coretests/src/android/provider/SettingsValidatorsTest.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ 




package android.provider;

package android.provider;





import static org.junit.Assert.fail;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;





import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.provider.SettingsValidators.Validator;

import android.provider.SettingsValidators.Validator;
@@ -62,6 +62,11 @@ public class SettingsValidatorsTest { 
        assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate("rectangle"));

        assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate("rectangle"));

    }

    }





    @Test

    public void testComponentNameValidator_onNullValue_doesNotThrow() {

        assertFalse(SettingsValidators.COMPONENT_NAME_VALIDATOR.validate(null));

    }



    @Test

    @Test

    public void testLocaleValidator() {

    public void testLocaleValidator() {

        assertTrue(SettingsValidators.LOCALE_VALIDATOR.validate("en_US"));

        assertTrue(SettingsValidators.LOCALE_VALIDATOR.validate("en_US"));