diff options
Diffstat (limited to 'src/com/android/documentsui/PreBootReceiver.java')
| -rw-r--r-- | src/com/android/documentsui/PreBootReceiver.java | 11 |
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); |