PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add get permissions flag to package info query in factory reset preference controller." into main

Browse Source
This commit is contained in:
Omer Ozer
2024-05-21 16:04:41 +00:00
committed by Android (Google) Code Review
parent 640ad978b8 4506b6287a
commit 81a2c38a98
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/system/FactoryResetPreferenceController.java
View File

@@ -90,7 +90,8 @@ public class FactoryResetPreferenceController extends BasePreferenceController {
String packageName = resolution.activityInfo.packageName; String packageName = resolution.activityInfo.packageName;
PackageInfo factoryResetWizardPackageInfo; PackageInfo factoryResetWizardPackageInfo;
try { try {
factoryResetWizardPackageInfo = pm.getPackageInfo(packageName, 0); factoryResetWizardPackageInfo = pm.getPackageInfo(packageName,
PackageManager.GET_PERMISSIONS);
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Unable to resolve a Factory Reset Handler Application"); Log.e(TAG, "Unable to resolve a Factory Reset Handler Application");
return null; return null;

5
tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
View File

@@ -145,10 +145,13 @@ public class FactoryResetPreferenceControllerTest {
@Test @Test
@RequiresFlagsEnabled(com.android.settings.factory_reset.Flags.FLAG_ENABLE_FACTORY_RESET_WIZARD) @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); ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue(); assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
verify(mPackageManager).getPackageInfo(eq(FACTORY_RESET_APP_PACKAGE),
eq(PackageManager.GET_PERMISSIONS));
verify(mFactoryResetLauncher).launch(intentArgumentCaptor.capture()); verify(mFactoryResetLauncher).launch(intentArgumentCaptor.capture());
assertThat(intentArgumentCaptor.getValue()).isNotNull(); assertThat(intentArgumentCaptor.getValue()).isNotNull();
assertThat(intentArgumentCaptor.getValue().getAction()) assertThat(intentArgumentCaptor.getValue().getAction())