Commit Graph

4408 Commits

Author SHA1 Message Date
Adam Lesinski
3d53abec7d Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am: f8e99e72e7
am: 165e9d92b2

Change-Id: I184f3508fd602409d01f105500693b5d02ab37a3
2016-07-14 01:57:52 +00:00
Adam Lesinski
165e9d92b2 Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
2016-07-14 01:50:52 +00:00
Adam Lesinski
e60064ab3c Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.

crbug.com/627586

Bug:30118654

Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
2016-07-14 00:22:12 +00:00
Makoto Onuki
a74fce83ae Merge \"Revert \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\"\" into nyc-mr1-dev
am: 6eefe67b2c

Change-Id: I514fb0b48c79644f7bc3154b3a18fabfc4c35d15
2016-07-13 20:21:56 +00:00
Makoto Onuki
f34c308dfd Revert "Revert "Revert "Handle package broadcasts before apps do"""
This reverts commit 886ba78dfb.

With the tests updated.

Change-Id: I162e6ca23c667f90feddc1e9f42b554a416295cf
2016-07-13 10:40:31 -07:00
Makoto Onuki
80dd14e061 Merge \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\" into nyc-mr1-dev
am: 98802f6007

Change-Id: I51e9cedb8cba67b987f8ed6b92bcf66082594990
2016-07-13 17:18:16 +00:00
Makoto Onuki
886ba78dfb Revert "Revert "Handle package broadcasts before apps do""
This reverts commit efbbe7ea9d.

Change-Id: I3dbb080db5121307f533a7d411f4f5d47225500e
2016-07-13 17:08:26 +00:00
Makoto Onuki
5f18bbe034 Merge \"Revert \"Handle package broadcasts before apps do\"\" into nyc-mr1-dev
am: 7f3187bb0d

Change-Id: I15a7629138e1c0b44620bd6239d7a14d3df14b82
2016-07-13 16:47:11 +00:00
Makoto Onuki
efbbe7ea9d Revert "Handle package broadcasts before apps do"
And fix b/29939691 (don't try to load locked users) in a different way

Bug 29939691
Bug 29895275

Change-Id: Ib55f9c5d5547c54daa4e05c1e50bf4bbceaf1991
2016-07-12 14:47:20 -07:00
Makoto Onuki
b1e0982173 Merge \"Throw ActivityNotFoundException when failed to launch shortcut\" into nyc-mr1-dev
am: 50752f7391

Change-Id: I0dcb7b89a32de22dee41ebe617e47ae935ac8227
2016-07-12 17:14:56 +00:00
Makoto Onuki
fcf7db9eed Merge \"Handle package broadcasts before apps do\" into nyc-mr1-dev
am: ae13eee9c6

Change-Id: I4eee7d585bfe1218fae425f2b3f2097965924587
2016-07-11 21:40:25 +00:00
Makoto Onuki
83f6d2da37 Throw ActivityNotFoundException when failed to launch shortcut
Originally the code used IIntentSender, but I had to switch to calling
startActivitiesInPackage() directly, because sendIntentSender() does
not support returning errors.

Bug 30035853

Change-Id: I5d7669c96a2f1805373c71aebf45b97ac1d01ff6
2016-07-11 14:37:18 -07:00
Jeff Sharkey
6e4fc19617 Merge \"Revert \"Treat everyone the same.\"\" into nyc-mr1-dev
am: 9dbc259b4f

Change-Id: Idbddd94cb16c2dee3891bcff14ceb618793dd767
2016-07-11 21:34:05 +00:00
Makoto Onuki
ae13eee9c6 Merge "Handle package broadcasts before apps do" into nyc-mr1-dev 2016-07-11 21:29:59 +00:00
Jeff Sharkey
9dbc259b4f Merge "Revert "Treat everyone the same."" into nyc-mr1-dev 2016-07-11 21:23:31 +00:00
Makoto Onuki
a2241834a5 Handle package broadcasts before apps do
- Have PM to call the shortcut manager directly before sending a
pacakge broadcast.

- The shortcut manager will enqueue a task to handle a package
broadcast, which will be executed on Handler.

- At the entry points of all external facing methods, block until
all pending tasks are finished.

Bug 29895275

Change-Id: Ib29fa3c9c8d9b9e0ca5c8f1e9da2a390324960a4
2016-07-11 11:28:10 -07:00
Makoto Onuki
d4255a9c95 Merge \"ShortcutManager javadoc\" into nyc-mr1-dev
am: 3746d2224d

Change-Id: I1a856a61c3453acd02a2541533a268ade9dd5933
2016-07-11 17:58:34 +00:00
Jeff Sharkey
f9c41aeeb5 Revert "Treat everyone the same."
This reverts commit 7678aeddd9.

Bug: 30051184, 29746499
Change-Id: Ibd8bc2771d67c4db61c82dcc8a569eb8adfef8de
2016-07-11 16:22:29 +00:00
Makoto Onuki
4a91096a4c ShortcutManager javadoc
Bug 29515722

Change-Id: If4805a7f28a2ee602094fca06eb1ff30f258dc1e
2016-07-11 09:08:49 -07:00
Todd Kennedy
296b9edfb5 Merge \"Add values to ApplicationInfoFlags\" into nyc-mr1-dev
am: 6ac6ceb28b

Change-Id: I3aa2488496d7f21440c2bef03944b0f2bdaaa0b3
2016-07-07 23:24:00 +00:00
TreeHugger Robot
6ac6ceb28b Merge "Add values to ApplicationInfoFlags" into nyc-mr1-dev 2016-07-07 23:15:26 +00:00
Todd Kennedy
5a32c6c290 Add values to ApplicationInfoFlags
Need to add MATCH_DISABLED_UNTIL_USED_COMPONENTS [and the deprecated
GET_DISABLED_UNTIL_USED_COMPONENTS] since those are used when building
the ApplicationInfo object.

Bug: 29824931
Change-Id: I09b24427222fed082f0946717826d2e0db857c7a
2016-07-07 14:29:06 -07: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
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
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
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
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
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
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
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
08739a2778 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: Ib3d99a331f49c2e8af2fcda24149314fc939f4c0
2016-06-28 19:16:35 +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
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
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