summaryrefslogtreecommitdiffstats
path: root/src/com/android/documentsui/PreBootReceiver.java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-06 22:53:54 +0000
committerXin Li <delphij@google.com>2021-10-06 22:53:54 +0000
commit8c348c41a50cb3fe83e9d2403cc34db5d5ddcb70 (patch)
tree2ba30a68b1e5a2246c7e071219139cea61cab0e6 /src/com/android/documentsui/PreBootReceiver.java
parent4bc189377da5f3cb27fb439d677cb89f3390a7a6 (diff)
parent84af7ecf6ae45a2ab3aba9b0019baa191b430af5 (diff)
downloadplatform_packages_apps_DocumentsUI-master.tar.gz
platform_packages_apps_DocumentsUI-master.tar.bz2
platform_packages_apps_DocumentsUI-master.zip
Merge Android 12HEADmaster
Bug: 202323961 Merged-In: I64e7be8bd815a3f3bf84277ffb9ea801a5dceb24 Change-Id: Ib2ecaa196b974cec584f6ae5c1e8b4092818d73a
Diffstat (limited to 'src/com/android/documentsui/PreBootReceiver.java')
-rw-r--r--src/com/android/documentsui/PreBootReceiver.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/documentsui/PreBootReceiver.java b/src/com/android/documentsui/PreBootReceiver.java
index c47631654..f5ad9395a 100644
--- a/src/com/android/documentsui/PreBootReceiver.java
+++ b/src/com/android/documentsui/PreBootReceiver.java
@@ -30,6 +30,7 @@ import android.content.res.Resources;
import android.util.Log;
import com.android.documentsui.theme.ThemeOverlayManager;
+import com.android.documentsui.util.VersionUtils;
/**
* A receiver listening action.PRE_BOOT_COMPLETED event for setting component enable or disable.
@@ -91,11 +92,15 @@ public class PreBootReceiver extends BroadcastReceiver {
int resId = overlayRes.getIdentifier(config, "bool", overlayPkg);
if (resId != 0) {
final ComponentName component = new ComponentName(packageName, className);
- final boolean value = overlayRes.getBoolean(resId);
+ boolean enabled = overlayRes.getBoolean(resId);
+ if (VersionUtils.isAtLeastS() && CONFIG_IS_LAUNCHER_ENABLED.equals(config)) {
+ enabled = false; // Do not allow LauncherActivity to be enabled for S+.
+ }
if (DEBUG) {
- Log.i(TAG, "Overlay package:" + overlayPkg + ", customize " + config + ":" + value);
+ Log.i(TAG,
+ "Overlay package:" + overlayPkg + ", customize " + config + ":" + enabled);
}
- pm.setComponentEnabledSetting(component, value
+ pm.setComponentEnabledSetting(component, enabled
? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);