Commit Graph

4542 Commits

Author SHA1 Message Date
Makoto Onuki
fd949c63e4 Merge \\"Hide more shortcut APIs\\" into nyc-mr1-dev am: 07e234c9d7
am: 639a862315

Change-Id: I215b00bae0bb6f9f6c44c23a713f69988f9ec9df
2016-07-07 21:16:43 +00:00
Makoto Onuki
639a862315 Merge \"Hide more shortcut APIs\" into nyc-mr1-dev
am: 07e234c9d7

Change-Id: If18c62359352c928e2b36c42563d5223c517964e
2016-07-07 21:10:00 +00:00
Makoto Onuki
07e234c9d7 Merge "Hide more shortcut APIs" into nyc-mr1-dev 2016-07-07 20:52:23 +00:00
Jeff Sharkey
fd9c9ee13d Merge \\"Treat everyone the same.\\" into nyc-mr1-dev am: a1b026ea2e
am: f32a5c426f

Change-Id: I5e3c1c5fc2b25fd7a5b8cd61ed9fb073b66240e2
2016-07-07 20:35:36 +00:00
Jeff Sharkey
f32a5c426f Merge \"Treat everyone the same.\" into nyc-mr1-dev
am: a1b026ea2e

Change-Id: I853c743364189e689e29d87ab6c53b7963ebae2f
2016-07-07 20:27:55 +00:00
TreeHugger Robot
a1b026ea2e Merge "Treat everyone the same." into nyc-mr1-dev 2016-07-07 20:20:01 +00:00
Makoto Onuki
f805b43da7 Hide more shortcut APIs
Change-Id: I911b4963b878e67ad2084190ac080e8555ba63c0
2016-07-07 11:56:04 -07:00
Dave Langemak
c48903b7e9 Merge \\"Hide APIs that shouldn\\'t have been public\\" into nyc-mr1-dev am: 8317f93012
am: d34da3b659

Change-Id: I49e9fc1f0f58db9f6200b954b5b639ac263ca8da
2016-07-07 15:56:10 +00:00
Makoto Onuki
d34da3b659 Merge \"Hide APIs that shouldn\'t have been public\" into nyc-mr1-dev
am: 8317f93012

Change-Id: I28a43a5391d8f815029a3f78ef2f45bc67105bb9
2016-07-07 15:47:43 +00:00
Dave Langemak
8317f93012 Merge "Hide APIs that shouldn't have been public" into nyc-mr1-dev 2016-07-07 15:38:12 +00:00
Makoto Onuki
598aca4672 Hide APIs that shouldn't have been public
Change-Id: I40f1c8e9c6fe991e782bf3dd772f305df641b267
2016-07-06 16:11:54 -07:00
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

Change-Id: I151a72b8ee1c16ef94da70e85378dd44b4ac077c
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

Change-Id: I3bb569bb53b95176dc5e3b19f4122cf75511ac1e
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

Change-Id: If43a09cd1580edb318404f56459b8557b69b7d5a
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

Change-Id: I4a2dd860bdf4ebdcc6ab420d162579307734fa6f
2016-06-30 00:14:24 +00:00
Makoto Onuki
88c6a3eaa3 Merge \"Address API council feedback (continued)\" into nyc-mr1-dev
am: 01e51e59dd

Change-Id: Ia3a6d4eb224667956eebd6b935628a2ba40dfb18
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
Jeff Sharkey
7678aeddd9 Treat everyone the same.
Bug: 29746499
Change-Id: I8344e42c5c55e5414bcc223e4caa857dc06de750
2016-06-29 15:24:37 -06:00
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