diff options
| -rw-r--r-- | src/com/android/documentsui/PreBootReceiver.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/documentsui/PreBootReceiver.java b/src/com/android/documentsui/PreBootReceiver.java index 2bdbee555..afb32dd54 100644 --- a/src/com/android/documentsui/PreBootReceiver.java +++ b/src/com/android/documentsui/PreBootReceiver.java @@ -95,8 +95,11 @@ public class PreBootReceiver extends BroadcastReceiver { if (resId != 0) { final ComponentName component = new ComponentName(packageName, className); 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 (VersionUtils.isAtLeastS() && !pm.hasSystemFeature(PackageManager.FEATURE_PC) + && CONFIG_IS_LAUNCHER_ENABLED.equals(config)) { + // Devices using S+ that don't support the `FEATURE_PC` system feature should not + // show Files in the launcher. + enabled = false; } if (DEBUG) { Log.i(TAG, |