Commit Graph

4520 Commits

Author SHA1 Message Date
Todd Kennedy
71e4da01a6 Merge \\"Define deprecated fields in IntDef\\'s\\" into nyc-mr1-dev am: 23bc74a8d5
am: c3575b2149

Change-Id: Ic1d2ac7e3cdb06ce1b01661dac1981aafc05b260
2016-06-28 20:59:47 +00:00
Todd Kennedy
c3575b2149 Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
am: 23bc74a8d5

Change-Id: Ic8648d5acff4afdb65074eb9313be082482e2b17
2016-06-28 20:53:40 +00:00
TreeHugger Robot
23bc74a8d5 Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev 2016-06-28 20:48:37 +00:00
Todd Kennedy
e6c821a812 Merge \\\"Default minSdkVersion to \\\'1\\\'\\\" into nyc-dev am: a98e3e3ede am: a1066ed6c2
am: e3cc3d8ad4

Change-Id: I42b6c96d661f4f8b3036513303f319c010c00485
2016-06-28 19:27:33 +00:00
Todd Kennedy
e3cc3d8ad4 Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am: a98e3e3ede
am: a1066ed6c2

Change-Id: I58d97cd42bc939a91d00bd6189a1c2ffcc913b37
2016-06-28 19:22:25 +00:00
Todd Kennedy
a1066ed6c2 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
2016-06-28 19:16:40 +00:00
Todd Kennedy
1f397f4e7b Define deprecated fields in IntDef's
Tools need all of the valid constants to handle legacy apps; even
though we want developers to use the new constant names.

Bug: 29824931
Change-Id: I5f8055d50d1d3f32cfbed7459d8a497cfbd3661e
2016-06-28 12:14:11 -07:00
Todd Kennedy
4f6570878c Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.

Bug: 29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
2016-06-28 10:31:05 -07:00
Andreas Gampe
1a0a502d47 Merge \"Merge \\"Frameworks/base: Add new flow to OtaDexoptService\\" into nyc-mr1-dev am: d06f87399b\" into nyc-mr1-dev-plus-aosp
am: 8299d7156e

Change-Id: I61e73af556b718e58b14a7fed707c7520e3673d9
2016-06-28 00:12:03 +00:00
Andreas Gampe
bd2503e5f4 Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev
am: d06f87399b

Change-Id: Iaefa3414cb7ca7d113e9ac776f8f667d5dc724c8
2016-06-28 00:00:13 +00:00
TreeHugger Robot
d06f87399b Merge "Frameworks/base: Add new flow to OtaDexoptService" into nyc-mr1-dev 2016-06-27 23:50:37 +00:00
Andreas Gampe
cc241a580c Frameworks/base: Add new flow to OtaDexoptService
Add functionality to capture/intercept installd communication, and
use this to return the full communication for dexopt. These parameters
can be used to drive otapreopt_chroot directly.

Keep the old direct invocation alive until devices have transitioned
to a service that exposes this API.

In preparation for renaming of A/B OTA artifacts to include target
slot names.

Bug: 25612095
Bug: 28069686
Change-Id: I14728ee1266f3882cada8f08dd21891ed5f7a0cb
2016-06-27 15:10:12 -07:00
Steven Ng
4eefd6801c Merge \\"Disallow disable / hide device provision app\\" into nyc-mr1-dev am: dc52eaaa98
am: 8b764a81ef

Change-Id: Id04c937ce560d0446037a495394ec168875782cb
2016-06-27 19:06:14 +00:00
Steven Ng
8b764a81ef Merge \"Disallow disable / hide device provision app\" into nyc-mr1-dev
am: dc52eaaa98

Change-Id: I638ca8d2c03bb75bf4881511db993fdc29961a3e
2016-06-27 18:57:06 +00:00
Steven Ng
dc52eaaa98 Merge "Disallow disable / hide device provision app" into nyc-mr1-dev 2016-06-27 18:50:02 +00:00
Adam Lesinski
3d26f768a2 Merge \\"Update DisplayMetrics when resizing\\" into nyc-mr1-dev am: 038084e61c
am: 89aea239cd

Change-Id: I9cc73d39e690d30c736b705235bb93e92bd029a6
2016-06-24 22:15:56 +00:00
Adam Lesinski
ac3e0e590a Update DisplayMetrics when resizing
Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.

Bug:29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
(cherry picked from commit 8e8d23214a)
2016-06-24 22:11:27 +00:00
Adam Lesinski
89aea239cd Merge \"Update DisplayMetrics when resizing\" into nyc-mr1-dev
am: 038084e61c

Change-Id: I82318bbd8dbf03ab4bc01533b8c5650306cff0aa
2016-06-24 22:11:14 +00:00
TreeHugger Robot
038084e61c Merge "Update DisplayMetrics when resizing" into nyc-mr1-dev 2016-06-24 22:04:15 +00:00
Makoto Onuki
a9d2a39bb1 Merge \\"Shortcut: Only \\"main\\" activities can have shortcuts.\\" into nyc-mr1-dev am: 1af9a58956
am: 312933e043

Change-Id: I26419c323a33bf26f2dea4666e07c64a4e7d6254
2016-06-24 21:47:54 +00:00
Makoto Onuki
312933e043 Merge \"Shortcut: Only \"main\" activities can have shortcuts.\" into nyc-mr1-dev
am: 1af9a58956

Change-Id: Id878608aec49985228e129de9736b751c9ae8567
2016-06-24 21:42:54 +00:00
Adam Lesinski
8e8d23214a Update DisplayMetrics when resizing
Previously the DisplayMetrics passed to a new ResourcesImpl
object would be generated from the default DisplayAdjustments.
We now use the correct DisplayAdjustments for the ResourcesImpl
and make sure to update them for things like rotation changes.

Bug:29619314
Change-Id: If2ba0d7670a4554dcd3fde9766e2337f20a191fd
2016-06-24 13:13:19 -07:00
Makoto Onuki
b08790c3b2 Shortcut: Only "main" activities can have shortcuts.
- Don't publish shortcuts when their target activities are not main.
- Only scan manifest shortcuts for main activities.
- When an app is updated, remove shortcuts that no longer belong to
valid main activities.

- Also re-publish manifest shortcuts after 'clear data'
- Also listen to PACKAGE_CHANGED and disable/re-publish shortcuts
properly.

Bug 29355786
Bug 29582255
Bug 29601844

Change-Id: I6c701ce669cf30a227bc2af4aa01de467ef73e3a
2016-06-24 13:07:17 -07:00
Steven Ng
9d48a731d0 Disallow disable / hide device provision app
+ Rename functions in ProtectedPackages.
+ Add a Set in ProtectedPackages to store protected package.

Bug: 29116229
Change-Id: Ib7dd93a158c09ebbf70f4d57c1afbd2c5102edbd
2016-06-24 19:04:14 +01:00
Fyodor Kupolov
e4c1812750 Merge \\\"Use granted userId to look up provider info\\\" into nyc-dev am: f9f2c7ceef am: 7bc1db96ed
am: d50b61ff36

Change-Id: Iceec1009f0ac020d402b980e6952a0de7d0a671c
2016-06-22 22:54:09 +00:00
Fyodor Kupolov
d50b61ff36 Merge \\"Use granted userId to look up provider info\\" into nyc-dev am: f9f2c7ceef
am: 7bc1db96ed

Change-Id: I914c389f3b326eefdada42e2d55c116d308521c4
2016-06-22 22:47:46 +00:00
Fyodor Kupolov
7bc1db96ed Merge \"Use granted userId to look up provider info\" into nyc-dev
am: f9f2c7ceef

Change-Id: Ifb6876fbb424632d3b47ec68686c01b56720b0a4
2016-06-22 22:41:42 +00:00
Fyodor Kupolov
f9f2c7ceef Merge "Use granted userId to look up provider info" into nyc-dev 2016-06-22 22:28:38 +00:00
Adam Lesinski
b5c8a98b76 Merge \\\"ContextImpl: Keep DisplayAdjustments and Display in sync\\\" into nyc-dev am: 0bf31c3fa6 am: a72a6aae37
am: ce71c120df

Change-Id: I93c1714ded50dc0233185f68b08b7b7803cfc264
2016-06-22 21:22:15 +00:00
Adam Lesinski
ce71c120df Merge \\"ContextImpl: Keep DisplayAdjustments and Display in sync\\" into nyc-dev am: 0bf31c3fa6
am: a72a6aae37

Change-Id: I8c85a4bb67d470c5bba5bcf81915e4684019027b
2016-06-22 19:27:30 +00:00
Adam Lesinski
a72a6aae37 Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6

Change-Id: If0da3136f1fcb17c43a5b8c22ca890b8abcfc25c
2016-06-22 19:17:43 +00:00
Adam Lesinski
e894efa9b6 Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
am: 0bf31c3fa6

Change-Id: Id0d16d2f9d69b87d4b4c01370eeceafe329d1817
2016-06-22 19:16:44 +00:00
Fyodor Kupolov
9bbaacf845 Use granted userId to look up provider info
In getPersistedUriPermissions, use granted userId instead of the calling
userId to look up provider info.

Bug: 29058113
Change-Id: Ia637be414f9ef3b8e9bce13bb56bd335cfb28ac7
2016-06-22 10:31:18 -07:00
Adam Lesinski
4ece3d6bb1 ContextImpl: Keep DisplayAdjustments and Display in sync
Make sure that when our Resources get updated, that DisplayAdjustment
and Display properly reflect the potentially new screen dimensions.

Bug:28388969
Change-Id: I340550ea094ece87abc8790dd46aaa60ab3cedd3
2016-06-21 17:55:58 -07:00
Makoto Onuki
02f355df6b Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp
am: 24c52732d7

Change-Id: Ib54aff79c823b6819d94ef0ef6194e4541bf734f
2016-06-22 00:55:32 +00:00
Makoto Onuki
5665a66b44 Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev
am: 3c67b3e47c

Change-Id: If7346f3dea63a31592d430b7503af170cb354677
2016-06-21 23:50:32 +00:00
Makoto Onuki
3c67b3e47c Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev 2016-06-21 23:35:16 +00:00
Makoto Onuki
b5a012fd6f Shortcut Manager: Address API council feedback and fix TODOs
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088

Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
2016-06-21 14:42:48 -07:00
Todd Kennedy
6b2df04ce4 Merge \\"Change prefix based upon mask\\" into nyc-mr1-dev am: 1dffcfdd7b
am: 322bb3fd0a

Change-Id: Ib2a7aee7e2d2dd7195a7a4d4e7c8c0b03885d25b
2016-06-21 19:00:02 +00:00
Todd Kennedy
322bb3fd0a Merge \"Change prefix based upon mask\" into nyc-mr1-dev
am: 1dffcfdd7b

Change-Id: I6a01e9ba3c914730b364766036e9c9c00b9d0a40
2016-06-21 18:54:15 +00:00
Todd Kennedy
409b0a13e1 Change prefix based upon mask
The mask may not be all F's.

Change-Id: I50ff4e4fb95af2037b84a1531b60dd9c0986bf86
2016-06-21 09:42:08 -07:00
Tony Mak
39fcc6acbc Merge "Fix the handling of bundle array in RestrictionsManager" 2016-06-21 09:14:48 +00:00
Makoto Onuki
7e346ef853 Merge \\"Launcher shortcut callback should deliver manifest shortcuts too\\" into nyc-mr1-dev am: 901c03faba
am: c07a7518d6

Change-Id: Ibc270d83d7c8544195ce1f6e9eee245db7e095f5
2016-06-20 21:22:15 +00:00
Makoto Onuki
c07a7518d6 Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
am: 901c03faba

Change-Id: Iaccb15163fd5b795adced796ede0a56e30a544a3
2016-06-20 21:15:26 +00:00
Makoto Onuki
901c03faba Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev 2016-06-20 21:06:42 +00:00
Tony Mak
1d18efe080 Fix the handling of bundle array in RestrictionsManager
Fix: 29506624

Change-Id: I0683d406f8b70d5d5f78bfc337d3952b6513d102
2016-06-20 19:41:08 +00:00
Roozbeh Pournader
d8914879b5 Merge \\"Fix AAPT-compatible output format for locales\\" into nyc-mr1-dev am: 63ed39f395
am: e7978c11c8

Change-Id: I18ba70a18087cba3c5472e991bef42e0b140a710
2016-06-20 19:38:05 +00:00
Roozbeh Pournader
e7978c11c8 Merge \"Fix AAPT-compatible output format for locales\" into nyc-mr1-dev
am: 63ed39f395

Change-Id: I55f2edc543d1d029a63a9352522a3e18ace655ac
2016-06-20 19:27:50 +00:00
Roozbeh Pournader
63ed39f395 Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev 2016-06-20 19:22:27 +00:00
Todd Kennedy
7182948b56 Merge \"Merge \\"fix resolver\\" into nyc-mr1-dev am: acc21f572d\" into nyc-mr1-dev-plus-aosp
am: 3e68026036

Change-Id: Ie4f8397a0511c527cfa46b2c04c888e7d0141847
2016-06-20 19:12:31 +00:00