OSDN Git Service

Track both framework and app overlays per package
authorTodd Kennedy <toddke@google.com>
Fri, 16 Jun 2017 20:55:13 +0000 (13:55 -0700)
committerTodd Kennedy <toddke@google.com>
Fri, 16 Jun 2017 21:00:16 +0000 (14:00 -0700)
commit560830c9f06d07d97055426420709733571ca05b
treead69e2b79ffc518b06f5c1b9aa86ba16349c6bb5
parentb274947dfb03f04872546774af0f8770ade5bed7
Track both framework and app overlays per package

Always bundle framework and app overlays. The old implementation, where
framework and app overlays were tracked independently, lead to an error
in the following scenario:

  1. Enable app overlay -> change reflected in app
  2. Enable framework overlay -> error: no change reflected in app
  3. Disable app overlay -> change reflected in app, including framework
     overlay

This change also leads to better architecture since the package manager
no longer needs to know that an app's overlays consist of both framework
and app specific overlays. Instead, that knowledge is handled by the
overlay manager.

Also, correct indentation in "cmd package dump packages" output and
remove obsolete constant DUMP_ENABLED_OVERLAYS.

Test: Manual
Change-Id: I707fc00052a15b22fb8c17e6155732520e6b2e52
Bug: 62680061
services/core/java/com/android/server/om/OverlayManagerService.java
services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
services/core/java/com/android/server/pm/PackageManagerService.java
services/core/java/com/android/server/pm/PackageSettingBase.java
services/core/java/com/android/server/pm/Settings.java