From bc297b9f3cf4e5f7f81437b714fc55502b3d27bf Mon Sep 17 00:00:00 2001
From: Yanting Yang <yantingyang@google.com>
Date: Thu, 11 May 2023 16:29:07 +0800
Subject: [PATCH] =?UTF-8?q?Make=20=E2=80=9CReset=20app=20preferences?=
 =?UTF-8?q?=E2=80=9D=20restricted=20by=20DISALLOW=5FAPPS=5FCONTROL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.

“System >Reset options > Reset app preferences” can take the above
actions which should be restricted by DISALLOW_APPS_CONTROL to fix the
security vulnerability.

Bug: 278559731
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: I387a95aa7f54fe04d5ed92372e43a88d5fe3e79a
---
 res/xml/reset_dashboard_fragment.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index 98f6c02a8f2..3bd7a136760 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -38,9 +38,10 @@
         settings:controller="com.android.settings.network.BluetoothWiFiResetPreferenceController" />
 
     <!-- Reset app preferences -->
-    <Preference
+    <com.android.settingslib.RestrictedPreference
         android:key="reset_app_prefs"
-        android:title="@string/reset_app_preferences" />
+        android:title="@string/reset_app_preferences"
+        settings:userRestriction="no_control_apps" />
 
     <!-- Erase Euicc data -->
     <Preference