Commit Graph

245109 Commits

Author SHA1 Message Date
Chris Wren
7595478ff2 Merge "registerUpdatedByApp should be synchronized" into nyc-dev 2016-06-21 21:46:35 +00:00
TreeHugger Robot
72ce991692 Merge "Don't try and resolve WRAP_CONTENT too early." into nyc-dev 2016-06-21 21:24:02 +00:00
Yorke Lee
22faa5ddb1 Merge "Tweaks to DragAndDropPermissions behavior" into nyc-dev 2016-06-21 21:10:53 +00:00
Bennie Ouyang
2f59ee10b2 Merge "Fixed notificaiton Stress Test" into nyc-dev 2016-06-21 20:42:03 +00:00
Yorke Lee
c8ad0cd316 Tweaks to DragAndDropPermissions behavior
No longer release permissions in finalize(), so that
apps do not have to maintain a reference to the
DragAndDropPermissions object.

Also make it parcelable, so that permission instances can be
retained across activity instances so that they can be
manually released.

Bug: 29162822

Change-Id: Ie604dd3e83ee45a8665d743449b91857dd54e896
2016-06-21 12:57:52 -07:00
TreeHugger Robot
aab580af55 Merge "Always report window move to client" into nyc-dev 2016-06-21 19:55:55 +00:00
TreeHugger Robot
abe85d3886 Merge "Add getApplicationConfigForPackage" into nyc-dev 2016-06-21 19:51:21 +00:00
TreeHugger Robot
fa2715e03b Merge "Ignore system apps on enforceMeteredApnPolicy()." into nyc-dev 2016-06-21 19:51:00 +00:00
Dianne Hackborn
5f9afa968d Merge "Reduce race when connecting to an existing content provider." into nyc-dev 2016-06-21 19:18:39 +00:00
Chris Wren
e0aaeaaaf1 registerUpdatedByApp should be synchronized
Bug: 29524139
Change-Id: I226b5f32fdab6b369451d0c64310f788944495d0
2016-06-21 14:41:55 -04:00
Selim Cinek
1e7d8d3817 Merge "Fixed an issue where the deleteintent of children wasn't sent" into nyc-dev 2016-06-21 18:07:43 +00:00
TreeHugger Robot
1dd403b61a Merge "Allow trust agents to run during provisioning" into nyc-dev 2016-06-21 18:04:07 +00:00
Dianne Hackborn
4de5a3ac66 Reduce race when connecting to an existing content provider.
We lost the code that checks to see if the target process still
exists and aborts trying to use it if so.  To reduce the race
there, we have a new explicit check of the state of the process.

Hopefully fixes some of issue #28737082.

Change-Id: I37a7a6e9767516d564168ef5e110c4adafe3fb76
2016-06-21 10:04:22 -07:00
Bennie Ouyang
4316180061 Fixed notificaiton Stress Test
Bug: 29506953
Change-Id: I8f8e7b2f0b03b48665b524472a8e81aef6a7a708
2016-06-21 09:59:53 -07:00
TreeHugger Robot
284a71ecd6 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-21 16:52:06 +00:00
TreeHugger Robot
d837e61078 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-21 16:51:52 +00:00
Alan Viverette
7a372a13af Merge "Only block invalidation in DrawableContainer initialization" into nyc-dev 2016-06-21 13:47:21 +00:00
Sreevani Sreejith
41a7bdec97 Merge \\"Documented how to handle advertisements during audio playback.\\" into mnc-io-docs am: 07340a654a
am: 5fef4a7d44

Change-Id: Ica1016e018fe5e278babd490b631414ad220f290
2016-06-21 11:55:54 +00:00
sreevanis
5fef4a7d44 Merge \"Documented how to handle advertisements during audio playback.\" into mnc-io-docs
am: 07340a654a

Change-Id: I58c4cb8ec6d86a1bb1464a4fedd14ff21ab3a863
2016-06-21 11:50:22 +00:00
Sreevani Sreejith
07340a654a Merge "Documented how to handle advertisements during audio playback." into mnc-io-docs 2016-06-21 11:44:20 +00:00
sreevanis
0c820aa9e1 Documented how to handle advertisements during audio playback.
Bug:24986554
Change-Id: I02cc0500492661ae7cde6cdae30490c00f8e4b97
2016-06-21 04:41:33 -07:00
Bill Yi
1fbf42ce30 Import translations. DO NOT MERGE
Change-Id: I8c3ebf247f9029af5c1322e2a5c115a1d854196f
Auto-generated-cl: translation import
2016-06-21 00:53:23 -07:00
Bill Yi
dafd8ad2cf Import translations. DO NOT MERGE
Change-Id: I8d44c51c82552053591fd0f45741f5cf05c956d6
Auto-generated-cl: translation import
2016-06-21 00:24:26 -07:00
Andrii Kulian
9980514ee0 Merge "Compare intent filter when launching adjacent" into nyc-dev 2016-06-21 05:18:00 +00:00
TreeHugger Robot
8a1bc54ab0 Merge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev 2016-06-21 02:56:38 +00:00
Felipe Leme
ee27cabe34 Ignore system apps on enforceMeteredApnPolicy().
BUG: 29514913
Fixes: 29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259
2016-06-20 17:15:46 -07:00
Jeremie GARCIA
02708b1ac4 Parse "vendor/priv-app" to find privileged applications
Change-Id: Icbbafba96b7880f51ca3afcee53d5f3dd5b86a45
Signed-off-by: Jeremie GARCIA <jeremie.garcia@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bug: 29488499
2016-06-20 16:43:56 -07:00
TreeHugger Robot
f159b74608 Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev 2016-06-20 23:03:46 +00:00
Wei Jia
bd45be5032 Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev 2016-06-20 22:58:34 +00:00
Wei Jia
ce4957eb37 MediaPlayer: fix java doc for setPlaybackParams.
Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
2016-06-20 15:57:23 -07:00
Robert Carr
07421cb9bb Don't try and resolve WRAP_CONTENT too early.
At the point of showDropDownPosition measure
may have not yet been called and we can't try
and resolve WRAP_CONTENT. ViewRoot will do it for us
and set requestedWidth/Height at an appropriate point.

Bug: 29496188
Change-Id: I99f26612bec800f3e321495b3df3e37b5ffb3152
2016-06-20 15:55:02 -07:00
Selim Cinek
ce87a8af9d Fixed an issue where the deleteintent of children wasn't sent
Especially in context of autobundling this could lead to bad bugs

Change-Id: Idf722f9675f6f6e49d49c08798e38e09b1c5c01e
Fixes: 29515621
2016-06-20 15:40:07 -07:00
Sudheer Shanka
f00e780472 Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev 2016-06-20 22:38:51 +00:00
Scott Main
db4ef3f4f8 Merge "just a reorg of some links to put all Android Studio help button redirects together" into nyc-dev 2016-06-20 22:28:57 +00:00
smain@google.com
d98ba4c3b2 just a reorg of some links to put all Android Studio help button redirects together
Change-Id: If928756a87b18a12caa21effa15c5005d74f15c6
2016-06-20 15:25:56 -07:00
Antonio Cansado
c20ffc2a9e Merge "Fix infinite loop when registering data usage callback." into nyc-dev 2016-06-20 22:23:36 +00:00
Dianne Hackborn
d2480ab7bb Merge "Fix issue #29438842: Enter the "am broadcast -a..." into nyc-dev 2016-06-20 22:09:30 +00:00
Antonio Cansado
f704837429 Fix infinite loop when registering data usage callback.
Trivial fix is to call the method that takes the handler as a param.

Bug: 29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
2016-06-20 15:03:03 -07:00
Hemal Patel
2a3336813a Docs: Changed sample link under Related Samples am: ab5de09e7e
am: d5af0a1214

Change-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9
2016-06-20 22:01:02 +00:00
Adrian Roos
fb95a81a8b Allow trust agents to run during provisioning
Fixes a bug where trust agents weren't able to run during
provisioning, because user presence is only acknowledged after
provisioning completed.

Change-Id: Ib9ed235e8372555fdc40eefd0fc6b1192613abda
Fixes: 29231515
2016-06-20 14:59:02 -07:00
Hemal Patel
d5af0a1214 Docs: Changed sample link under Related Samples
am: ab5de09e7e

Change-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278
2016-06-20 21:53:54 +00:00
Roozbeh Pournader
160126e2d8 Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev 2016-06-20 21:39:22 +00:00
Hall Liu
f184789ae9 Merge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\" into mnc-dev am: fc32ec1aef am: aeba34533c am: 317d0cb169
am: edace5e820  -s ours

Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e
2016-06-20 21:31:36 +00:00
Hall Liu
edace5e820 Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am: fc32ec1aef am: aeba34533c
am: 317d0cb169

Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
2016-06-20 21:28:09 +00:00
Hall Liu
317d0cb169 Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am: fc32ec1aef
am: aeba34533c

Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
2016-06-20 21:21:25 +00:00
Wale Ogunwale
089586fd91 Don't re-launch stopped activities while the device is sleeping
Don't ensure configuration for stopped activities while the device
is sleeping as we don't want to relaunch activities in this state.
Note that the right configuration will be applied to the activity
the next time we try to make it visible. The re-launch will happen
then.

Bug: 28518380

Change-Id: Id79d7817ba8f213d89cae6964de09cafe17481f9
2016-06-20 14:16:22 -07:00
Hall Liu
aeba34533c Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am: fc32ec1aef

Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
2016-06-20 21:15:42 +00:00
TreeHugger Robot
beaf3707fa Merge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev 2016-06-20 21:11:05 +00:00
Hall Liu
fc32ec1aef Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev 2016-06-20 21:04:43 +00:00
TreeHugger Robot
361ccf5eef Merge "Make advanced storage option sticky..." into nyc-dev 2016-06-20 20:45:04 +00:00