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

Commit 4506b628 authored by Omer Ozer's avatar Omer Ozer
Browse files

Add get permissions flag to package info query in factory 

reset preference controller.

Bug: 341802418
Test: manual
Change-Id: I1603662b706ec94e109afe957b585577876c8e75
parent 504ac0cf

src/com/android/settings/system/FactoryResetPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ public class FactoryResetPreferenceController extends BasePreferenceController { 
            String packageName = resolution.activityInfo.packageName;

            PackageInfo factoryResetWizardPackageInfo;

            try {

                factoryResetWizardPackageInfo = pm.getPackageInfo(packageName, 0);

                factoryResetWizardPackageInfo = pm.getPackageInfo(packageName,

                        PackageManager.GET_PERMISSIONS);

            } catch (PackageManager.NameNotFoundException e) {

                Log.e(TAG, "Unable to resolve a Factory Reset Handler Application");

                return null;

tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java

+4 −1
Original line number Diff line number Diff line
@@ -145,10 +145,13 @@ public class FactoryResetPreferenceControllerTest { 


    @Test

    @RequiresFlagsEnabled(com.android.settings.factory_reset.Flags.FLAG_ENABLE_FACTORY_RESET_WIZARD)

    public void handlePreference_factoryResetWizardEnabled() {

    public void handlePreference_factoryResetWizardEnabled()

            throws PackageManager.NameNotFoundException {

        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);



        assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();

        verify(mPackageManager).getPackageInfo(eq(FACTORY_RESET_APP_PACKAGE),

                eq(PackageManager.GET_PERMISSIONS));

        verify(mFactoryResetLauncher).launch(intentArgumentCaptor.capture());

        assertThat(intentArgumentCaptor.getValue()).isNotNull();

        assertThat(intentArgumentCaptor.getValue().getAction())