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

Merge "Change the existing permission to a system level perm for factory reset prep." into main

Browse Source
This commit is contained in:
Omer Ozer
2023-11-27 22:57:32 +00:00
committed by Android (Google) Code Review
parent 958a6ab7aa 1d9c2a6f11
commit b347d32b31
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@
*/
package com.android.settings.system;
import android.Manifest;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
@@ -38,9 +39,6 @@ public class FactoryResetPreferenceController extends BasePreferenceController {
private static final String ACTION_PREPARE_FACTORY_RESET =
"com.android.settings.ACTION_PREPARE_FACTORY_RESET";
private static final String PREPARE_FACTORY_RESET_PERMISSION =
"com.android.settings.permissions.PREPARE_FACTORY_RESET";
private final UserManager mUm;
private ActivityResultLauncher<Intent> mFactoryResetPreparationLauncher;
@@ -103,7 +101,7 @@ public class FactoryResetPreferenceController extends BasePreferenceController {
boolean isGranted =
(factoryResetWizardPackageInfo.requestedPermissionsFlags[i]
& PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
if (permission.equals(PREPARE_FACTORY_RESET_PERMISSION) && isGranted) {
if (permission.equals(Manifest.permission.PREPARE_FACTORY_RESET) && isGranted) {
return prepareFactoryResetWizardRequest;
}
}