a4fcffa06b5e90b8be8b03d1bbf4e006a2124e07 - platform/frameworks/base

commit	a4fcffa06b5e90b8be8b03d1bbf4e006a2124e07	[log] [tgz]
author	Adam Lesinski <adamlesinski@google.com>	Thu Feb 22 13:32:53 2018 -0800
committer	android-build-team Robot <android-build-team-robot@google.com>	Fri Feb 23 18:03:14 2018 +0000
tree	dfe61bec9b8c8bef9fb8a246e9b3a96f9bfbc32f
parent	58f0a91480c67488c331dd94d3ab0ec4b2417787 [diff]

OMS: Make updates to category not reset the overlay's state

- Also change how default overlays are applied. Apply them if no other
overlay is enabled for the same category as the default overlay.

Bug: 73740686
Test: manual
Test: adb shell rm /data/system/overlays.xml && adb reboot #verify that colors are blue
Test: adb pull /data/system/overlays.xml \
          && <edit overlay to remove categories> \
          && adb push overlays.xml /data/system/overlays.xml \
          && adb reboot # verify that colors are blue

Change-Id: If42afd287703e2e159d0087e477c19409f724124
(cherry picked from commit 7b03181ab1d5001b6ed1fdcdeee9c2a6f4659c81)

core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk[diff]
core/tests/overlaytests/host/test-apps/UpdateOverlay/app/v1/AndroidManifest.xml[Renamed from core/tests/overlaytests/host/test-apps/UpdateOverlay/app/AndroidManifest.xml - diff]
core/tests/overlaytests/host/test-apps/UpdateOverlay/app/v2/AndroidManifest.xml[Added - diff]
services/core/java/com/android/server/om/OverlayManagerService.java[diff]
services/core/java/com/android/server/om/OverlayManagerServiceImpl.java[diff]
services/core/java/com/android/server/om/OverlayManagerSettings.java[diff]

6 files changed

tree: dfe61bec9b8c8bef9fb8a246e9b3a96f9bfbc32f