Merge "Enable static RROs by default" into oc-dev

am: 22ea35187f Change-Id: I0a00621eb8cb54bd89c938539d8a2d7baee46833
2017-03-29 20:58:12 +00:00
parent 4e158866f8 22ea35187f
commit bfc81099f9
1 changed files with 2 additions and 1 deletions
--- 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);
                    }