Dianne Hackborn
1e8530e8e0
Merge \\\"Fix more of issue #28689719 : Runtime restart\\\" into nyc-dev am: 4781525399 am: 6d8e471072
...
am: 773a45272b
2016-06-10 00:01:41 +00:00
Christopher Tate
e6cd26a01b
Merge \\\"Turn down factory-default lock wallpaper support\\\" into nyc-dev am: 52e323bd38 am: 4676cc96ac
...
am: 3b2e584686
2016-06-10 00:01:26 +00:00
Dianne Hackborn
773a45272b
Merge \\"Fix more of issue #28689719 : Runtime restart\\" into nyc-dev am: 4781525399
...
am: 6d8e471072
2016-06-09 22:26:49 +00:00
Dianne Hackborn
6d8e471072
Merge \"Fix more of issue #28689719 : Runtime restart\" into nyc-dev
...
am: 4781525399
2016-06-09 22:22:00 +00:00
Chris Tate
3b2e584686
Merge \\"Turn down factory-default lock wallpaper support\\" into nyc-dev am: 52e323bd38
...
am: 4676cc96ac
2016-06-09 22:16:39 +00:00
Dianne Hackborn
4781525399
Merge "Fix more of issue #28689719 : Runtime restart" into nyc-dev
2016-06-09 22:16:27 +00:00
Christopher Tate
4676cc96ac
Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
...
am: 52e323bd38
2016-06-09 22:13:32 +00:00
Chris Tate
52e323bd38
Merge "Turn down factory-default lock wallpaper support" into nyc-dev
2016-06-09 22:07:00 +00:00
Adam Lesinski
255b8d089a
Merge \"Merge \\\"ResourcesManager: Apply ContextThemeWrapper config\\\" into nyc-dev am: 9e9c78f8ce am: 4b9a4a18f9\" into nyc-mr1-dev-plus-aosp
...
am: 47883d1b27
2016-06-09 21:40:27 +00:00
Adam Lesinski
7cdd96ec10
Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce
...
am: 4b9a4a18f9
2016-06-09 21:28:00 +00:00
Adam Lesinski
cdca6fe8a6
Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
...
am: 9e9c78f8ce
2016-06-09 21:24:09 +00:00
Adam Lesinski
4b9a4a18f9
Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
...
am: 9e9c78f8ce
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
9c02930ea0
Merge \\\"Make Activity.getReferrer tolerate custom Parcelables in intents\\\" into nyc-dev am: 7a37f8945f am: 64e3a6d760
...
am: 948b94ff2f
2016-06-09 21:15:40 +00:00
Adam Powell
948b94ff2f
Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f
...
am: 64e3a6d760
2016-06-09 21:08:50 +00:00
Adam Powell
fb310f6a2f
Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
...
am: 7a37f8945f
2016-06-09 21:05:23 +00:00
Adam Powell
64e3a6d760
Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
...
am: 7a37f8945f
2016-06-09 21:05:05 +00:00
Christopher Tate
36cb2a7a91
Turn down factory-default lock wallpaper support
...
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.
Bug 29220492
Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
2016-06-09 13:47:19 -07:00
Dianne Hackborn
41bfaf870e
Fix more of issue #28689719 : Runtime restart
...
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
2016-06-09 12:58:25 -07: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
2016-06-09 06:31:01 +00:00
Chad Brubaker
303bb79bef
Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
...
am: 55cf361d83
2016-06-09 06:27:57 +00:00
Chad Brubaker
71cab503e3
Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
...
am: 55cf361d83
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
2016-06-08 21:48:45 -07:00
Adam Lesinski
cf22b8333a
Merge \\\"Throw proper exception in ResourcesManager\\\" into nyc-dev am: 0d25fdd4a8 am: 30b5e95cbb
...
am: 07c88bd4f1
2016-06-09 04:02:56 +00:00
Adam Lesinski
07c88bd4f1
Merge \\"Throw proper exception in ResourcesManager\\" into nyc-dev am: 0d25fdd4a8
...
am: 30b5e95cbb
2016-06-09 03:56:14 +00:00
Adam Lesinski
a24ef02c6b
Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
...
am: 0d25fdd4a8
2016-06-09 03:53:56 +00:00
Adam Lesinski
30b5e95cbb
Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
...
am: 0d25fdd4a8
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
1bcd351a9f
Merge \\"Fix NPE in startup wizard caused by former change.\\" into nyc-mr1-dev am: 3c35716655
...
am: 1d33feb8bb
2016-06-08 23:01:54 +00:00
George Mount
1d33feb8bb
Merge \"Fix NPE in startup wizard caused by former change.\" into nyc-mr1-dev
...
am: 3c35716655
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
TreeHugger Robot
fb5e29f70f
Merge changes I576a8fe5,Ib8ed481e
...
* changes:
Don't touch NetworkSecurityPolicy in ActivityThread
Don't depend directly on AppplicationInfo
2016-06-08 22:06:34 +00:00
George Mount
e6b23b6ab9
Merge \\"Re-add Internal API for cross-task Activity used by assistant.\\" into nyc-mr1-dev am: 174e41b1fd
...
am: dff1fa4bb9
2016-06-08 20:39:54 +00:00
George Mount
dff1fa4bb9
Merge \"Re-add Internal API for cross-task Activity used by assistant.\" into nyc-mr1-dev
...
am: 174e41b1fd
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
2016-06-08 20:20:41 +00:00
Chad Brubaker
4c7698f631
Don't touch NetworkSecurityPolicy in ActivityThread
...
The values in NetworkSecurityPolicy set by ActivityThread are
just immediately replaced by the NetworkSecurityConfigProvider.
Change-Id: I576a8fe51bd41292db2d20d302492849d2202f4e
2016-06-08 13:04:06 -07:00
Chad Brubaker
276ee969be
Don't depend directly on AppplicationInfo
...
ApplicationInfo is mutable and unfortunately some apps to 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
Change-Id: Ib8ed481e4b192df17205a97d683059db9cfe962b
2016-06-08 12:57:46 -07:00
Felipe Leme
5493f0f6a2
Merge \\\"Wrap closeQuietly() on finally block.\\\" into nyc-dev am: fb5995cfbb am: a18a63b23a
...
am: ddafe182df
2016-06-08 19:03:38 +00:00
Felipe Leme
ddafe182df
Merge \\"Wrap closeQuietly() on finally block.\\" into nyc-dev am: fb5995cfbb
...
am: a18a63b23a
2016-06-08 18:59:10 +00:00
Felipe Leme
a18a63b23a
Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
...
am: fb5995cfbb
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
2016-06-08 07:13:37 -07:00
Chong Zhang
25007ec4df
Merge \"Merge \\\"Use getActivityToken() instead of mToken in isTopOfTask\\\" into nyc-dev am: 723e5afa9e am: 1895addcef\" into nyc-mr1-dev-plus-aosp
...
am: c6a520e090
2016-06-08 01:31:18 +00:00
Chong Zhang
456fc8cd3c
Merge \\"Use getActivityToken() instead of mToken in isTopOfTask\\" into nyc-dev am: 723e5afa9e
...
am: 1895addcef
2016-06-08 01:27:16 +00:00
