Daniel Nishi
3fd8c801ba
resolve merge conflicts of 7145cac to master
...
Change-Id: Idd0a8de30697687309953fd37b568207d2fc0be8
2016-07-06 14:04:36 -07:00
Daniel Nishi
7145cace64
Merge \"Move the MIME type icon detection into the platform.\" into nyc-mr1-dev
...
am: 9459f93c97
2016-07-06 20:02:45 +00:00
Daniel Nishi
c29d2b0492
Move the MIME type icon detection into the platform.
...
This allows the MIME type icons to be used in other system apps.
In this instance, the StorageManager app needs to show file icons
for a given file. By moving the icon mapping into a static library,
we can avoid duplicating the mapping and resources.
Bug: 29826961
Change-Id: Ic2dc7970cc5a5ca430e33425eb9f1ecbd733fe9a
2016-07-06 10:57:06 -07:00
Makoto Onuki
b8e1286605
Merge \\"Start shortcuts as if publisher apps did using PendingIntent\\" into nyc-mr1-dev am: 60efbf2586
...
am: 20a9ca9311
2016-06-30 22:02:51 +00:00
Makoto Onuki
20a9ca9311
Merge \"Start shortcuts as if publisher apps did using PendingIntent\" into nyc-mr1-dev
...
am: 60efbf2586
2016-06-30 21:55:18 +00:00
Makoto Onuki
ea11db15bd
Start shortcuts as if publisher apps did using PendingIntent
...
Bug 29639471
Change-Id: I2aad115669b431cbea785ba92040b1958117ab47
2016-06-29 18:43:45 -07:00
Makoto Onuki
0ba4ec6b92
Merge \"Merge \\"Address API council feedback (continued)\\" into nyc-mr1-dev am: 01e51e59dd\" into nyc-mr1-dev-plus-aosp
...
am: bd7d03ab6a
2016-06-30 00:14:24 +00:00
Makoto Onuki
88c6a3eaa3
Merge \"Address API council feedback (continued)\" into nyc-mr1-dev
...
am: 01e51e59dd
2016-06-29 23:59:20 +00:00
Makoto Onuki
01e51e59dd
Merge "Address API council feedback (continued)" into nyc-mr1-dev
2016-06-29 23:53:51 +00:00
Makoto Onuki
d6880797f7
Address API council feedback (continued)
...
Got a second set of comments.
Bug 29757958
Change-Id: Ib3a3ffd28bc3e35eb0218b0819870eb5c6ebadb5
2016-06-29 15:22:56 -07:00
Todd Kennedy
71e4da01a6
Merge \\"Define deprecated fields in IntDef\\'s\\" into nyc-mr1-dev am: 23bc74a8d5
...
am: c3575b2149
2016-06-28 20:59:47 +00:00
Todd Kennedy
c3575b2149
Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
...
am: 23bc74a8d5
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
2016-06-28 19:27:33 +00:00
Todd Kennedy
e3cc3d8ad4
Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am: a98e3e3ede
...
am: a1066ed6c2
2016-06-28 19:22:25 +00:00
Todd Kennedy
a1066ed6c2
Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
...
am: a98e3e3ede
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
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
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
2016-06-27 19:06:14 +00:00
Steven Ng
8b764a81ef
Merge \"Disallow disable / hide device provision app\" into nyc-mr1-dev
...
am: dc52eaaa98
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
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
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
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
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
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
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
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
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
2016-06-22 19:27:30 +00:00
Adam Lesinski
a72a6aae37
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
2016-06-22 19:17:43 +00:00
Adam Lesinski
e894efa9b6
Merge \"ContextImpl: Keep DisplayAdjustments and Display in sync\" into nyc-dev
...
am: 0bf31c3fa6
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
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
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
2016-06-21 19:00:02 +00:00
Todd Kennedy
322bb3fd0a
Merge \"Change prefix based upon mask\" into nyc-mr1-dev
...
am: 1dffcfdd7b
2016-06-21 18:54:15 +00:00
