summaryrefslogtreecommitdiff
path: root/framework-s/java
diff options
context:
space:
mode:
author Jay Thomas Sullivan <jaysullivan@google.com> 2024-02-09 16:13:20 -0800
committer Jay Sullivan <jaysullivan@google.com> 2024-02-23 02:40:18 +0000
commit61f1f96a404c2bfc645055cec0431ff3b4982cab (patch)
tree9ddd39b19ecaa9edb5d7d908da3a270d37edab5c /framework-s/java
parent837331657d9a1170f75e3be19a39537c29f712fa (diff)
[ECM] Point intent at new EnhancedConfirmationDialog
We recently moved---well, copied---the "Restricted setting" dialog into PermissionController. But, we're not using the new dialog yet. The new dialog receives a different intent action than the old. So, to migrate to the new dialog, we'll need to update all code that launches the old intent. Fortunately, we've encapsulated this in EnhancedConfirmationManager, so this is a one-line change. Bug: 322026141 Test: CtsPermissionUiTestCases:android.permissionui.cts.EnhancedConfirmationManagerTest Change-Id: Ied3e2712e409e056945be08e5911ae232149de68
Diffstat (limited to 'framework-s/java')
-rw-r--r--framework-s/java/android/app/ecm/EnhancedConfirmationManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java b/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java
index 1b7398251..74062165e 100644
--- a/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java
+++ b/framework-s/java/android/app/ecm/EnhancedConfirmationManager.java
@@ -33,7 +33,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build;
import android.os.RemoteException;
import android.permission.flags.Flags;
-import android.provider.Settings;
import android.util.ArraySet;
import androidx.annotation.NonNull;
@@ -343,7 +342,7 @@ public final class EnhancedConfirmationManager {
*/
public @NonNull Intent createRestrictedSettingDialogIntent(@NonNull String packageName,
@NonNull String settingIdentifier) throws NameNotFoundException {
- Intent intent = new Intent(Settings.ACTION_SHOW_RESTRICTED_SETTING_DIALOG);
+ Intent intent = new Intent(ACTION_SHOW_ECM_RESTRICTED_SETTING_DIALOG);
intent.putExtra(Intent.EXTRA_PACKAGE_NAME, packageName);
intent.putExtra(Intent.EXTRA_UID, getPackageUid(packageName));
intent.putExtra(Intent.EXTRA_SUBJECT, settingIdentifier);