commit 22ea35187f7d8a55ad7ede0d0e97be65b83801be
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Mar 29 20:48:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 29 20:48:57 2017 +0000
tree 7102ccc0e73ac2cbaf7e6fb9799b62c1aedaa220
parent 2ce80c839e852927607c2fe6de5a32a7ca3f38ae
parent 84d7f1ecfb962cb6c8e4adefa077729128c26d3b

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

services/core/java/com/android/server/om/OverlayManagerServiceImpl.java

diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
index db133f8..5bdef9e 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 @@
 
                 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);
                     }