Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c913ae4f authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Android (Google) Code Review
Browse files

Merge "Skips ThemeOverlayController check during Boot on WearOS" into main

parents f49f22f4 9f44b9ab

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -5483,9 +5483,11 @@ public class ActivityManagerService extends IActivityManager.Stub 
        // without even solving the underlying issue (it merely hits the timeout).

        // This feature is disabled on TV since the ThemeOverlayController is currently not present

        // and therefore we do not want to wait unnecessarily.

        // This feature is currently disabled in WearOS to avoid extreme boot regressions

        return enableHomeDelay()

                && !mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)

                && !mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);

                && !mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)

                && !mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);

    }















    final void ensureBootCompleted() {