From 84d7f1ecfb962cb6c8e4adefa077729128c26d3b Mon Sep 17 00:00:00 2001 From: Jaekyun Seok Date: Wed, 29 Mar 2017 11:02:15 +0900 Subject: [PATCH] Enable static RROs by default Static RROs should be always enabled. This is a missing part from ag/1949458. The design details are in go/treble-static-rro. Test: building succeeded and tested with static RROs. Bug: 35742444 Change-Id: Ia9851f91c97cdde2436a29a161194eeb56ea47d5 --- .../core/java/com/android/server/om/OverlayManagerServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java index db133f876d17..5bdef9ea7d49 100644 --- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java +++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java @@ -102,7 +102,8 @@ final class OverlayManagerServiceImpl { if (oi == null) { // This overlay does not exist in our settings. - if (mDefaultOverlays.contains(overlayPackage.packageName)) { + if (overlayPackage.isStaticOverlay || + mDefaultOverlays.contains(overlayPackage.packageName)) { // Enable this overlay by default. mSettings.setEnabled(overlayPackage.packageName, newUserId, true); } -- 2.11.0