Marie Janssen
fb0ee69ad0
Merge \\\"Fix links to Bluetooth Guide\\\" am: 6ba39e5642 am: 51f620d98d
...
am: 30975ad80b
2016-06-21 23:40:28 +00:00
Robert Carr
b964f26d7a
Merge \\"Don\\'t try and resolve WRAP_CONTENT too early.\\" into nyc-dev am: 72ce991692
...
am: 5a35355364
2016-06-21 23:40:26 +00:00
Yorke Lee
bf18ee7b76
Merge \\"Tweaks to DragAndDropPermissions behavior\\" into nyc-dev am: 22faa5ddb1
...
am: 072ce0c29c
2016-06-21 23:37:51 +00:00
Chad Brubaker
7103211d6b
Merge \\"Add getApplicationConfigForPackage\\" into nyc-dev am: abe85d3886
...
am: 0f1b7d3b3d
2016-06-21 23:37:41 +00:00
Marie Janssen
30975ad80b
Merge \\"Fix links to Bluetooth Guide\\" am: 6ba39e5642
...
am: 51f620d98d
2016-06-21 21:38:25 +00:00
Marie Janssen
51f620d98d
Merge \"Fix links to Bluetooth Guide\"
...
am: 6ba39e5642
2016-06-21 21:34:13 +00:00
Robert Carr
5a35355364
Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev
...
am: 72ce991692
2016-06-21 21:30:53 +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
072ce0c29c
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
...
am: 22faa5ddb1
2016-06-21 21:20:11 +00:00
Yorke Lee
22faa5ddb1
Merge "Tweaks to DragAndDropPermissions behavior" into nyc-dev
2016-06-21 21:10:53 +00:00
Chad Brubaker
0f1b7d3b3d
Merge \"Add getApplicationConfigForPackage\" into nyc-dev
...
am: abe85d3886
2016-06-21 19:59:58 +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
abe85d3886
Merge "Add getApplicationConfigForPackage" into nyc-dev
2016-06-21 19:51:21 +00:00
Dianne Hackborn
ee18f5fe68
Merge \\"Reduce race when connecting to an existing content provider.\\" into nyc-dev am: 5f9afa968d
...
am: 3716762e38
2016-06-21 19:33:15 +00:00
Dianne Hackborn
3716762e38
Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
...
am: 5f9afa968d
2016-06-21 19:27:33 +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
Todd Kennedy
322bb3fd0a
Merge \"Change prefix based upon mask\" into nyc-mr1-dev
...
am: 1dffcfdd7b
2016-06-21 18:54:15 +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
Todd Kennedy
409b0a13e1
Change prefix based upon mask
...
The mask may not be all F's.
Change-Id: I50ff4e4fb95af2037b84a1531b60dd9c0986bf86
2016-06-21 09:42:08 -07:00
Chris Banes
09bf9e69bc
Fix NPE in Toolbar - framework edition
...
am: 3b925c1ab0
2016-06-21 08:16:28 +00:00
Chris Banes
3b925c1ab0
Fix NPE in Toolbar - framework edition
...
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.
BUG: 28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
2016-06-21 08:09:24 +00: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
Antonio Cansado
1d4fd3ed27
Merge \\"Fix infinite loop when registering data usage callback.\\" into nyc-dev am: c20ffc2a9e
...
am: 13cf0e7d54
2016-06-20 22:36:49 +00:00
Roozbeh Pournader
2704d4ead1
Merge \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\" into nyc-mr1-dev
...
am: 55d9051e58
2016-06-20 22:33:29 +00:00
Antonio Cansado
13cf0e7d54
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
2016-06-20 22:29:49 +00:00
Antonio Cansado
43f0bd6e60
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
...
am: c20ffc2a9e
2016-06-20 22:29:45 +00:00
Antonio Cansado
c20ffc2a9e
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
2016-06-20 22:23:36 +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
Roozbeh Pournader
ad48dc18a5
Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"
...
This reverts commit e977b0ae59
2016-06-20 14:59:29 -07:00
Roozbeh Pournader
a1de63c871
Merge \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\" into nyc-dev am: 160126e2d8
...
am: 73939d8a60
2016-06-20 21:51:12 +00:00
Roozbeh Pournader
1f2f328025
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
...
am: 160126e2d8
2016-06-20 21:44:50 +00:00
Roozbeh Pournader
73939d8a60
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
...
am: 160126e2d8
2016-06-20 21:44:42 +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
Makoto Onuki
c07a7518d6
Merge \"Launcher shortcut callback should deliver manifest shortcuts too\" into nyc-mr1-dev
...
am: 901c03faba
2016-06-20 21:15:26 +00:00
Makoto Onuki
901c03faba
Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-dev
2016-06-20 21:06:42 +00:00
Adam Lesinski
0f7b0a8cc6
Merge \\"BatteryStats: record best estimated battery capacity\\" into nyc-dev am: c2e06a55f9
...
am: a804fae3be
2016-06-20 20:00:07 +00:00
Adam Lesinski
145e50243e
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
Adam Lesinski
a804fae3be
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
2016-06-20 19:49:46 +00:00
Chad Brubaker
9f779ab4af
Add getApplicationConfigForPackage
...
getApplicationConfigForPackage will be used by system components that
need to make connections for apps, e.g. DownloadManager, so that their
secure connections have the same configuration as those from the app
itself.
Bug: 29505888
Change-Id: Idf1cac6307431911eda34529d3fd50f9ca0da314
2016-06-20 12:40:20 -07:00
Roozbeh Pournader
e7978c11c8
Merge \"Fix AAPT-compatible output format for locales\" into nyc-mr1-dev
...
am: 63ed39f395
2016-06-20 19:27:50 +00:00
Roozbeh Pournader
63ed39f395
Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev
2016-06-20 19:22:27 +00:00
Todd Kennedy
fcb121216c
Merge \"fix resolver\" into nyc-mr1-dev
...
am: acc21f572d
2016-06-20 19:06:15 +00:00
TreeHugger Robot
acc21f572d
Merge "fix resolver" into nyc-mr1-dev
2016-06-20 18:45:04 +00:00
Android Build Merger (Role)
6ffddc03b7
Merge "Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev am: d94a40f46d" into nyc-mr1-dev-plus-aosp
2016-06-20 18:28:42 +00:00
Adrian Roos
531c90e38d
Merge \"Enable tap-to-pulse only when needed\" into nyc-mr1-dev
...
am: d94a40f46d
2016-06-20 18:27:54 +00:00
Gustav Sennton
90888027d8
Merge \\"Use newly fetched PackageInfo for loading WebView code.\\" into nyc-dev am: cdbf412f8e
...
am: deac870fd1
2016-06-20 18:27:32 +00:00
Android Build Merger (Role)
6806472ab9
Merge "Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev am: cdbf412f8e" into nyc-mr1-dev
2016-06-20 18:23:48 +00:00
Gustav Sennton
deac870fd1
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
2016-06-20 18:23:44 +00:00
Gustav Sennton
47b391cf1d
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
...
am: cdbf412f8e
2016-06-20 18:23:26 +00:00
