Commit Graph

7868 Commits

Author SHA1 Message Date
dd3d95f182 resolved conflicts for merge of 4ad93639 to klp-modular-dev-plus-aosp
Change-Id: I7ad222301ec0b863d48a1a9a839469436c385ea0
2014-02-12 11:05:59 -08:00
48d22323ce Runtime resource overlay, iteration 2
Support any number of overlay packages. Support any target package.

UPDATED PACKAGE MATCHING
------------------------
In Runtime resource overlay, iteration 1, only a single overlay package
was considered. Package matching was based on file paths:
/vendor/overlay/system/framework-res.apk corresponded to
/system/framework-res.apk. Introduce a more flexible matching scheme
where any package is an overlay package if its manifest includes

    <overlay targetPackage="com.target.package"/>

For security reasons, an overlay package must fulfill certain criteria
to take effect: see below.

THE IDMAP TOOL AND IDMAP FILES
------------------------------
Idmap files are created by the 'idmap' binary; idmap files must be
present when loading packages. For the Android system, Zygote calls
'idmap' as part of the resource pre-loading. For application packages,
'idmap' is invoked via 'installd' during package installation (similar
to 'dexopt').

UPDATED FLOW
------------
The following is an outline of the start-up sequences for the Android
system and Android apps. Steps marked with '+' are introduced by this
commit.

Zygote initialization
   Initial AssetManager object created
+    idmap --scan creates idmaps for overlays targeting 'android', \
           stores list of overlays in /data/resource-cache/overlays.list
   AssetManager caches framework-res.apk
+  AssetManager caches overlay packages listed in overlays.list

Android boot
   New AssetManager's ResTable acquired
     AssetManager re-uses cached framework-res.apk
+    AssetManager re-uses cached 'android' overlays (if any)

App boot
   ActivityThread prepares AssetManager to load app.apk
+  ActivityThread prepares AssetManager to load app overlays (if any)
   New AssetManager's ResTable acquired as per Android boot

SECURITY
--------
Overlay packages are required to be pre-loaded (in /vendor/overlay).
These packages are trusted by definition. A future iteration of runtime
resource overlay may add support for downloaded overlays, which would
likely require target and overlay signatures match for the overlay to
be trusted.

LOOKUP PRIORITY
---------------
During resource lookup, packages are sequentially queried to provide a
best match, given the constraints of the current configuration. If any
package provide a better match than what has been found so far, it
replaces the previous match. The target package is always queried last.

When loading a package with more than one overlay, the order in which
the overlays are added become significant if several packages overlay
the same resource.

Had downloaded overlays been supported, the install time could have been
used to determine the load order. Regardless, for pre-installed
overlays, the install time is randomly determined by the order in which
the Package Manager locates the packages during initial boot. To support
a well-defined order, pre-installed overlay packages are expected to
define an additional 'priority' attribute in their <overlay> tags:

    <overlay targetPackage="com.target.package" priority="1234"/>

Pre-installed overlays are loaded in order of their priority attributes,
sorted in ascending order.

Assigning the same priority to several overlays targeting the same base
package leads to undefined behaviour. It is the responsibility of the
vendor to avoid this.

The following example shows the ResTable and PackageGroups after loading
an application and two overlays. The resource lookup framework will
query the packages in the order C, B, A.

        +------+------+-     -+------+------+
        | 0x01 |      |  ...  |      | 0x7f |
        +------+------+-     -+------+------+
            |                           |
        "android"                Target package A
                                        |
                       Pre-installed overlay B (priority 1)
                                        |
                       Pre-installed overlay C (priority 2)

Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
2014-02-03 11:20:30 +01:00
4fda2d5ab7 Update READ&WRITE_DREAM_STATE to signature|system.
Change-Id: Ic3c4c5445384712571e7a1188ed9e2ab6ceb4bde
2014-01-31 14:14:19 -05:00
9e24357ddb Make MANAGE_ACTIVITY_STACKS a signature|system permission.
To allow ActivityView support within privileged apps.

Change-Id: Ic0246939bf71c52ca9415149415a976537c8270b
2014-01-26 21:58:51 -08:00
dafb2420a3 am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit 'd4b688cf97736eb4c543149686ab851b9ea21161':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 16:55:49 +00:00
d165f365b3 am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8."
* commit '5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
  Telephony: Modify code to check that PUK code length is always 8.
2014-01-26 08:49:09 -08:00
d1eeb67478 Merge "Telephony: Modify code to check that PUK code length is always 8." 2014-01-25 21:51:34 +00:00
aef49f9a71 Fwk: Adding a micro theme
Adding a micro theme affects 3 different GIT repositories:

1. Repository 'device/google/clockwork' - https://ar/398971
This has the overlay for the DeviceDefault for ClockWork

2. Repository 'platform/vendor/google_clockwork' - https://ar/399378
This has the changes to Clockwork Home to use the new micro Theme.

3. Repository 'frameworks/base' - https://ar/398959
This adds the *_micro.xml style/theme files.

Change-Id: Ib1e87953b052a9ec2ff0ea11dd0dfe55317442b4
2014-01-09 11:11:56 -08:00
f05ae3fe0f am bc0207fd: am 2626d0e1: am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'bc0207fdbd6cd8b3f250704b07edef07ab376bcb':
  telephony: Add same named operator configuration for some operators
2014-01-08 19:37:30 +00:00
2626d0e18d am ad068837: am 76d5cdd8: Merge "telephony: Add same named operator configuration for some operators"
* commit 'ad06883730b4cd4af98c0c3ec69a7e851f9cace9':
  telephony: Add same named operator configuration for some operators
2014-01-08 11:31:02 -08:00
76d5cdd820 Merge "telephony: Add same named operator configuration for some operators" 2014-01-08 19:25:11 +00:00
b8b7bd3185 Telephony: Modify code to check that PUK code length is always 8.
As per 3GPP TS 31.101 Release 11 section 9.6, the number of digits
for UNBLOCK PIN (PUK) is always 8.

Change-Id: I4ea69fd8e2e8e96330d10a67b2d1f5a1859c1016
2014-01-08 19:46:25 +05:30
080d1bdd7f am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '132a55375e89d809e1cc116aa4cca49e2351294a':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-08 00:50:16 +00:00
400e6b705f am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
  Revert "Do not show roaming icon for Videotron operator when access Canada network"
2014-01-07 16:44:30 -08:00
74435010c4 Revert "Do not show roaming icon for Videotron operator when access Canada network"
This reverts commit 119e24f987.

Bug: 12163013
Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
2013-12-16 07:46:07 +00:00
054379313d telephony: Add same named operator configuration for some operators
Add same named operator configuration for 404, 405, and 520.
That is, show roaming icon though same named operators.

Bug: 12121959
Change-Id: I9148bab727170f670fd2679db69b123b0526bb32
2013-12-16 09:18:13 +09:00
09e9cdcece DO NOT MERGE : Move some system services to their own sub package.
(Cherry pick from master)

As a next step they can be moved into separate directories to be
built as separate modules that may or may not be included in a
particular configuration.

Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,
and WallpaperMS.

Change-Id: Idd92871c1828bdde81d85fe99a9c87a22d53169d
2013-12-09 15:14:41 -08:00
f508c2b0fb am d2a0192b: am b40ce4b8: Make action bar media router icons blue again.
* commit 'd2a0192bf237994f0132625fc00d21896912151e':
  Make action bar media router icons blue again.
2013-11-20 16:51:07 -08:00
d2a0192bf2 am b40ce4b8: Make action bar media router icons blue again.
* commit 'b40ce4b8e85b44c8dc190bdfac0106402102280b':
  Make action bar media router icons blue again.
2013-11-20 16:48:52 -08:00
b40ce4b8e8 Make action bar media router icons blue again.
This partially reverts commit e7ae644522.

Bug: 11790271
Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723
2013-11-20 15:27:43 -08:00
853251e74f Import translations. DO NOT MERGE
Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
Auto-generated-cl: translation import
2013-11-20 09:17:20 -08:00
2337eb1b65 Import translations. DO NOT MERGE
Change-Id: Ia6d256fedf7e3d888942d66397f5842d46658c0f
Auto-generated-cl: translation import
2013-11-18 08:49:48 -08:00
044bc25fb5 am 67979256: am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev
* commit '67979256865f63330a1352e450e26baf24e914ec':
  Add config_restartRadioAfterProvisioning
2013-11-15 11:42:55 -08:00
6797925686 am 31cab2f8: Merge "Add config_restartRadioAfterProvisioning" into klp-dev
* commit '31cab2f803951edb13ea07e7e34916189fec5167':
  Add config_restartRadioAfterProvisioning
2013-11-15 11:39:16 -08:00
31cab2f803 Merge "Add config_restartRadioAfterProvisioning" into klp-dev 2013-11-15 19:35:05 +00:00
9124d56acc Add config_restartRadioAfterProvisioning
Bug: 11673637
Change-Id: Ie758a303fd751d204fd6baa60217e88df6376aae
2013-11-15 08:27:53 -08:00
461febadc4 am 64397749: am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev
* commit '64397749effa088dcea3799fc8440845c5a1c193':
  Handle backup transport registration dynamically
2013-11-14 18:41:02 -08:00
64397749ef am 22010817: Merge "Handle backup transport registration dynamically" into klp-dev
* commit '22010817b90f97756a76777fcd1dbe7e3b63e808':
  Handle backup transport registration dynamically
2013-11-14 18:37:54 -08:00
22010817b9 Merge "Handle backup transport registration dynamically" into klp-dev 2013-11-15 02:34:38 +00:00
cefba58d14 Handle backup transport registration dynamically
Bug 11369873

Change-Id: I9bbdcc21ce25159c6645690123b5d03c553b0ddc
2013-11-14 18:13:25 -08:00
d216944765 am 2bced6dc: am a7a46a66: Merge "Update cast screen strings." into klp-dev
* commit '2bced6dcb53c1743d6d11ffcb213206a07a63737':
  Update cast screen strings.
2013-11-14 17:35:00 -08:00
2bced6dcb5 am a7a46a66: Merge "Update cast screen strings." into klp-dev
* commit 'a7a46a66fa9f9ce547bac6c2e800a0ae287d9e5c':
  Update cast screen strings.
2013-11-14 17:31:32 -08:00
cef34fce3c Update cast screen strings.
Bug: 11257292
Change-Id: Ia66152985bafcdd8ec88a3145623536a2b439b78
2013-11-14 16:03:36 -08:00
bc3be0e3dc Import translations. DO NOT MERGE
Change-Id: I3b40e99b029a65ade59ec8f7ad06c0a143895269
Auto-generated-cl: translation import
2013-11-13 12:24:32 -08:00
e5ae0bfdf7 am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
* commit 'a20f625cc1006b03d4a2be90ba35d1a9783ad363':
  Finalize assets for screen casting.
2013-11-13 08:58:53 -08:00
a20f625cc1 am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
* commit '41b92b008e03be95db938e0238ccb9373c2aaadc':
  Finalize assets for screen casting.
2013-11-13 08:54:27 -08:00
e7ae644522 Finalize assets for screen casting.
Extend wifi display connection timeout.

Show a notification while connecting to wifi display.

Ensure that remote display providers are really trusted before
connecting to them.

Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
2013-11-13 02:17:53 -08:00
9ffc4a65e5 am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev
* commit '854395add8ceaa2b80a14e063567f1292eb91c4d':
  UI tweaks.
2013-11-11 22:04:54 -08:00
854395add8 am c481a634: Merge "UI tweaks." into klp-dev
* commit 'c481a634f4db6e95bc03b22b72414ba12da99f4b':
  UI tweaks.
2013-11-11 22:01:22 -08:00
39ad0e5598 UI tweaks.
Hide disabled routes from the chooser.

Fix layout of chooser dialog when the settings button is visible and
the list is very long to prevent truncation of the settings button.

Fix an issue when we fake the route connecting status when a route
is selected.  The route changed notification needs to be propagated
to apps.  Fake it better.

Immediately disconnect from a route when the connection is lost or
a connection attempt fails.  Added a few new test displays for this
case.

Bug: 11257292
Change-Id: I360ab5dc937ad60d97592eab54b19f034519645e
2013-11-11 21:48:53 -08:00
082c7dbc02 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-11-11 22:39:21 +00:00
fa0d9c2fa8 am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit '02b775755105a956456cb193b60d765e1a4690b6':
  Changes to support new screen cast settings screen.
2013-11-11 10:23:57 -08:00
02b7757551 am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit '1cdbbb1e73bff05f5dd1679bae2e3502d4f82368':
  Changes to support new screen cast settings screen.
2013-11-11 10:21:58 -08:00
8a56d180fb Import translations. DO NOT MERGE
Change-Id: Ie2f34cfeb48a5d7762fc3d63be02267ce37d45d0
Auto-generated-cl: translation import
2013-11-11 08:22:01 -08:00
75af171006 Changes to support new screen cast settings screen.
Fixed the Preference ordering code to consider the case where
two preferences might have the same order.  In that case, it
falls back on the title to disambiguate.  Previous behavior was
undefined (and technically not stable).

Expose the wifi display device address.

Perform wifi display scans every 10 seconds instead of every 15
to improve reponsiveness.

Make sure to define routes for wifi displays that we are connecting
to even if they are not yet paired.  Simplified the logic for
adding and removing these routes to avoid possibly getting out
of sync and leaving stale routes behind.

Fix wifi display notification icon.

Bug: 11257292
Change-Id: I8ac15fb17d83758c0bdce80399e12723c367b83c
2013-11-10 22:51:15 -08:00
f0b9ee9637 am 5773f724: am dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev
* commit '5773f72457246e437c24624cda8ec2a869165ee8':
  Update the media router dialogs and integrate into system UI.
2013-11-10 22:04:54 -08:00
40c81e4a5d am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '3105b6d2f192fc25f57911ef7bafbd62bae5b7e3':
  Make quick settings show the standard media router icon.
2013-11-10 22:04:51 -08:00
5773f72457 am dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev
* commit 'dd4f9e8b61c0a5639aa82480b7fdd760a2ed609c':
  Update the media router dialogs and integrate into system UI.
2013-11-10 22:02:23 -08:00
3105b6d2f1 am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '12c32b4d484cc7cc2278a76c6e0fc2304a74b593':
  Make quick settings show the standard media router icon.
2013-11-10 22:02:20 -08:00
dd4f9e8b61 Merge "Update the media router dialogs and integrate into system UI." into klp-dev 2013-11-11 05:59:38 +00:00