Commit Graph

8424 Commits

Author SHA1 Message Date
Adam Lesinski
7cdd96ec10 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce
am: 4b9a4a18f9

Change-Id: Ibac064cbafdfffb0078e32027e789be98e9e1358
2016-06-09 21:28:00 +00:00
Adam Lesinski
4b9a4a18f9 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: I71250c58f237135d156c64bdc08caafbe5b4a59e
2016-06-09 21:22:34 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
Adam Powell
948b94ff2f Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f
am: 64e3a6d760

Change-Id: I7167b5f8112fff8c1e47c2cc954742f1f368d01c
2016-06-09 21:08:50 +00:00
Adam Powell
64e3a6d760 Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am: 7a37f8945f

Change-Id: I8e14173836f153d75b9c9f29f3493335af5f2763
2016-06-09 21:05:05 +00:00
Adam Lesinski
c1b0ebf579 ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.

Bug:27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
2016-06-09 12:57:45 -07:00
Adam Powell
d3c63a66f2 Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.

Bug 28972438

Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
2016-06-09 12:36:16 -07:00
Chad Brubaker
06fa572a53 Merge \\"Don\\'t depend directly on AppplicationInfo\\" into nyc-dev am: 55cf361d83
am: 303bb79bef

Change-Id: I1ef92a21e310a92310af1127de32945b8ba3e82d
2016-06-09 06:31:01 +00:00
Chad Brubaker
303bb79bef Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am: 55cf361d83

Change-Id: If30e7300c84a79871dc8a0288f8402ed49e4a662
2016-06-09 06:27:57 +00:00
Chad Brubaker
71cab503e3 Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am: 55cf361d83

Change-Id: Idb332dd0b729b5394ff06ae611349b674b2e7f2c
2016-06-09 06:27:53 +00:00
TreeHugger Robot
55cf361d83 Merge "Don't depend directly on AppplicationInfo" into nyc-dev 2016-06-09 06:22:20 +00:00
Chad Brubaker
c3a6c78fed Don't depend directly on AppplicationInfo
ApplicationInfo is mutable and unfortunately some apps do actually
modify the flags. Due to the lazy loading nature of the network security
config this may lead to issues. Instead cache the needed flags and
resources at application startup.

Bug: 29063413

(cherry picked from commit 276ee969be)

Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c
2016-06-08 21:48:45 -07:00
Adam Lesinski
07c88bd4f1 Merge \\"Throw proper exception in ResourcesManager\\" into nyc-dev am: 0d25fdd4a8
am: 30b5e95cbb

Change-Id: I0c8477d2eda299cb9a773860e3ce24a88e1011f1
2016-06-09 03:56:14 +00:00
Adam Lesinski
a24ef02c6b Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: I156c373b858e99b892c66f941005409097937714
2016-06-09 03:53:56 +00:00
Adam Lesinski
30b5e95cbb Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: Iac56b8b134244013730317adf2b417cef402fd09
2016-06-09 03:53:13 +00:00
TreeHugger Robot
0d25fdd4a8 Merge "Throw proper exception in ResourcesManager" into nyc-dev 2016-06-09 03:45:20 +00:00
Adam Lesinski
c82f28a913 Throw proper exception in ResourcesManager
In M we would bubble up a NameNotFoundException when failing
to load an assetmanager from another application. We switched
to throwing an IllegalArgumentException, which isn't something
anyone should handle.

This change has ResourcesManager throw Resources.NotFoundException,
which callers like ApplicationPackageManager can catch and rethrow
with the appropriate checked exception. This adds more detail to
errors than we had in M.

Bug:28876344
Change-Id: I250aeef8a4ccfd90c6abef2243edc1c5337ebde9
2016-06-08 17:25:35 -07:00
George Mount
1d33feb8bb Merge \"Fix NPE in startup wizard caused by former change.\" into nyc-mr1-dev
am: 3c35716655

Change-Id: I8c1b64aee8c6e2b793fdc41def968113f71ed15c
2016-06-08 22:56:56 +00:00
George Mount
963837821a Fix NPE in startup wizard caused by former change.
Bug 29211438

Change-Id: I0c979c945e79a6982d97013f961b00db3c9a9f00
2016-06-08 15:13:52 -07:00
George Mount
dff1fa4bb9 Merge \"Re-add Internal API for cross-task Activity used by assistant.\" into nyc-mr1-dev
am: 174e41b1fd

Change-Id: I5f3a1b398af15963b317fbce6726d77ef85c60b2
2016-06-08 20:33:58 +00:00
TreeHugger Robot
174e41b1fd Merge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-08 20:23:03 +00:00
Felipe Leme
556ac231e9 Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am: fb5995cfbb

Change-Id: I5f649b54038b586be375394d35fd34453213df0a
2016-06-08 20:20:41 +00:00
Felipe Leme
ddafe182df Merge \\"Wrap closeQuietly() on finally block.\\" into nyc-dev am: fb5995cfbb
am: a18a63b23a

Change-Id: I3e6769579e08887888b1358be0cb695f32e13749
2016-06-08 18:59:10 +00:00
Felipe Leme
a18a63b23a Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am: fb5995cfbb

Change-Id: I34fbe82455b113d2608f64f9220f5a1757e39627
2016-06-08 18:16:43 +00:00
TreeHugger Robot
fb5995cfbb Merge "Wrap closeQuietly() on finally block." into nyc-dev 2016-06-08 17:59:48 +00:00
Felipe Leme
c74972f891 Wrap closeQuietly() on finally block.
BUG: 29123428
Change-Id: Ife7a919343ce4b73eef759bbc87dd37f12a71bca
2016-06-08 09:12:37 -07:00
George Mount
413739e8c6 Re-add Internal API for cross-task Activity used by assistant.
Bug: 29091742

This reverts commit 563df3b328.

This also fixes the problems experienced by b/29128683.

Change-Id: I8e3d485cb818ea9e03ca475cba88934f6f903f11
2016-06-08 07:13:37 -07:00
Chong Zhang
456fc8cd3c Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e
am: 1895addcef

Change-Id: Ifb8ca430fbb754a73e6b891c5a97e0cf201cf7f4
2016-06-08 01:27:16 +00:00
Chong Zhang
5c689127ba Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc
2016-06-08 01:22:43 +00:00
Felipe Leme
3b37c224b5 Merge \\"Duplicate file descriptor when dumping asynchronously.\\" into nyc-dev am: c02ba17898
am: 9d178342d8

Change-Id: I9afdc281e2fe68c74ef7a676dd4f437013fe909a
2016-06-08 01:21:57 +00:00
Chong Zhang
1895addcef Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
2016-06-08 01:19:03 +00:00
Felipe Leme
53c1637134 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d
2016-06-08 01:15:06 +00:00
Felipe Leme
9d178342d8 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: I8a483e5295a5dccf4f11f76316bf47d962fb8f12
2016-06-08 01:13:55 +00:00
Chong Zhang
723e5afa9e Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev 2016-06-08 01:12:27 +00:00
Felipe Leme
29de4922db Duplicate file descriptor when dumping asynchronously.
dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5
2016-06-07 16:35:50 -07:00
Eino-Ville Talvala
abb7488998 Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev
am: fe3ecdab1b

* commit 'fe3ecdab1b461d811825ce363d7041f3c8c120c3':
  Revert "Internal API for cross-task Activity used by assistant."

Change-Id: If16a43f4a17e71cc12ed7c912ed5e6a46c85e56c
2016-06-06 23:50:36 +00:00
TreeHugger Robot
fe3ecdab1b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 2016-06-06 23:44:34 +00:00
Eino-Ville Talvala
563df3b328 Revert "Internal API for cross-task Activity used by assistant."
This reverts commit 04073dc5be.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
2016-06-06 22:04:54 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
2016-06-04 00:27:04 +00:00
TreeHugger Robot
c27660d45a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 2016-06-04 00:22:06 +00:00
George Mount
579a1e973f Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev
am: 3af59ef42c

* commit '3af59ef42c83fbe4bf9e54f807597bddc6aa7ecd':
  Internal API for cross-task Activity used by assistant.

Change-Id: Idb8c49437ff7d151e186edd2112e4def8d7a7e15
2016-06-03 23:27:31 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
2016-06-03 15:50:31 -07:00
George Mount
3af59ef42c Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-03 22:22:53 +00:00
George Mount
04073dc5be Internal API for cross-task Activity used by assistant.
29091742

A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.

The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.

This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.

Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda
2016-06-03 14:08:06 -07:00
Chong Zhang
6f9ae4ffc5 Use getActivityToken() instead of mToken in isTopOfTask
mToken could be local tokan and causes IllegalArgumentException.

bug: 29072444
Change-Id: I0f889a70a848ffea31663ed80337e1605c75223e
2016-06-03 11:50:44 -07:00
Makoto Onuki
51c7ce7531 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
am: 37087ad710

* commit '37087ad710087755786c115508b14e053c47f882':
  ShortcutManager: Implement usage report API

Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
2016-06-03 15:37:10 +00:00
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Tony Mak
aefec202de OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43
am: fff6650de4

* commit 'fff6650de4ac847db61ffdf3fbc82a39e3878313':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Id88584fff3f69e554793ea1e99dd491796a470ff
2016-06-03 10:54:46 +00:00
Tony Mak
fff6650de4 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
2016-06-03 10:43:37 +00:00
Tony Mak
d73c6eb6f3 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: I2de02ec6febdc58ff9a79562059cc11e7d617be5
2016-06-03 10:43:30 +00:00