Jason Monk
8f21a99bfa
Merge \\"QS Tiles: Fix some problems with connecting through intent\\" into nyc-dev am: 126088536d
...
am: a5076ef7fa
2016-06-22 17:10:34 +00:00
Jason Monk
a5076ef7fa
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
...
am: 126088536d
2016-06-22 16:54:06 +00:00
Jason Monk
8753e184f9
QS Tiles: Fix some problems with connecting through intent
...
- Don't send Tile through intent, it can cause crashes
- Clean up other issues surrounding this
Change-Id: I08c626cf39b36d349592c1e0b81627b9bc7eeeb3
Fixes: 29519485
2016-06-22 10:52:58 -04:00
Calvin On
1fef349549
Merge \"Guard concurrent accesses to BluetoothA2dp service object\" into nyc-mr1-dev
...
am: 30ec4f2732
2016-06-22 02:38:11 +00:00
Calvin On
d7d16b9f37
Guard concurrent accesses to BluetoothA2dp service object
...
This fixes potential NPEs that happen on methods that access
mService after checking nullness, i.e. getConnectedDevices.
Bug: 29514788
Change-Id: Ic97054fd5a3563a374c0e863fb116c52535a6509
2016-06-22 01:08:03 +00:00
Makoto Onuki
5665a66b44
Merge \"Shortcut Manager: Address API council feedback and fix TODOs\" into nyc-mr1-dev
...
am: 3c67b3e47c
2016-06-21 23:50:32 +00:00
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
Android Build Merger (Role)
d74f7e7362
Merge "Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev am: 72ce991692" into nyc-mr1-dev
2016-06-21 23:37:12 +00:00
Android Build Merger (Role)
4d46efc084
Merge "Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev am: 22faa5ddb1" into nyc-mr1-dev
2016-06-21 23:37:00 +00:00
Android Build Merger (Role)
9de968daed
Merge "Merge \"Add getApplicationConfigForPackage\" into nyc-dev am: abe85d3886" into nyc-mr1-dev
2016-06-21 23:36:02 +00:00
Makoto Onuki
3c67b3e47c
Merge "Shortcut Manager: Address API council feedback and fix TODOs" into nyc-mr1-dev
2016-06-21 23:35:16 +00:00
Robert Carr
d748b54615
Merge \"Don\'t try and resolve WRAP_CONTENT too early.\" into nyc-dev
...
am: 72ce991692
2016-06-21 23:35:11 +00:00
Yorke Lee
d22536666a
Merge \"Tweaks to DragAndDropPermissions behavior\" into nyc-dev
...
am: 22faa5ddb1
2016-06-21 23:35:09 +00:00
Chad Brubaker
b375228afe
Merge \"Add getApplicationConfigForPackage\" into nyc-dev
...
am: abe85d3886
2016-06-21 23:35:00 +00:00
Makoto Onuki
b5a012fd6f
Shortcut Manager: Address API council feedback and fix TODOs
...
Bug 29515722
Bug 29516909
Bug 29515090
Bug 29516954
Bug 29515088
Change-Id: Ibe1d27033cbd0fd50d37e3d9945b47551211c568
2016-06-21 14:42:48 -07: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
580f2e159e
Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
...
am: 5f9afa968d
2016-06-21 19:27:31 +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
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
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
