Adam Lesinski
122cbd1705
Merge \\\"Prevent early boot crash reading PowerProfile\\\" into nyc-dev am: ec6db57ac7 am: 31ef27c249
...
am: 965ed1170b
2016-06-22 17:47:02 +00:00
Adam Lesinski
965ed1170b
Merge \\"Prevent early boot crash reading PowerProfile\\" into nyc-dev am: ec6db57ac7
...
am: 31ef27c249
2016-06-22 17:41:15 +00:00
Adam Lesinski
31ef27c249
Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev
...
am: ec6db57ac7
2016-06-22 17:37:41 +00:00
Dianne Hackborn
c0b583d4d6
Merge \\\"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\\" into nyc-dev am: a62a7eef24 am: 56197c9e9e
...
am: 2d1788828f
2016-06-22 17:35:40 +00:00
Adam Lesinski
ec6db57ac7
Merge "Prevent early boot crash reading PowerProfile" into nyc-dev
2016-06-22 17:31:35 +00:00
Adam Lesinski
1a76a62b8d
Prevent early boot crash reading PowerProfile
...
The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.
Bug:29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
2016-06-22 10:28:47 -07:00
Dianne Hackborn
2d1788828f
Merge \\"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am: a62a7eef24
...
am: 56197c9e9e
2016-06-22 17:24:25 +00:00
Jason Monk
4519b87423
Merge \\\"QS Tiles: Fix some problems with connecting through intent\\\" into nyc-dev am: 126088536d am: a5076ef7fa
...
am: 8f21a99bfa
2016-06-22 17:18:52 +00:00
Dianne Hackborn
56197c9e9e
Merge \"Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\" into nyc-dev
...
am: a62a7eef24
2016-06-22 17:18:38 +00:00
Dianne Hackborn
a62a7eef24
Merge "Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag..." into nyc-dev
2016-06-22 17:12:09 +00:00
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
d8aa42f3e2
Merge \"QS Tiles: Fix some problems with connecting through intent\" into nyc-dev
...
am: 126088536d
2016-06-22 16:53:58 +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
Dianne Hackborn
121e1645d1
Fix issue #29545190 : JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...
...
...isn't respected if previous job was scheduled with same URI
Change-Id: Ib04f6d7cf72e7efc8e84c1a759e91ba520eda139
2016-06-21 20:39:02 -07:00
Calvin On
2e540390ec
Merge \\"Guard concurrent accesses to BluetoothA2dp service object\\" into nyc-mr1-dev am: 30ec4f2732
...
am: 1fef349549
2016-06-22 02:44:20 +00: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
02f355df6b
Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e47c\" into nyc-mr1-dev-plus-aosp
...
am: 24c52732d7
2016-06-22 00:55:32 +00:00
Marie Janssen
e55a3669a8
Merge \\\\"Fix links to Bluetooth Guide\\\\" am: 6ba39e5642 am: 51f620d98d am: 30975ad80b
...
am: fb0ee69ad0
2016-06-22 00:12:21 +00:00
Robert Carr
538b49b85f
Merge \\\"Don\\\'t try and resolve WRAP_CONTENT too early.\\\" into nyc-dev am: 72ce991692 am: 5a35355364
...
am: b964f26d7a
2016-06-22 00:12:18 +00:00
Yorke Lee
c502ca33ed
Merge \\\"Tweaks to DragAndDropPermissions behavior\\\" into nyc-dev am: 22faa5ddb1 am: 072ce0c29c
...
am: bf18ee7b76
2016-06-21 23:56:51 +00:00
Chad Brubaker
7ba3f0cafe
Merge \\\"Add getApplicationConfigForPackage\\\" into nyc-dev am: abe85d3886 am: 0f1b7d3b3d
...
am: 7103211d6b
2016-06-21 23:56:28 +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
e0e7f9cbe8
Merge \\\"Reduce race when connecting to an existing content provider.\\\" into nyc-dev am: 5f9afa968d am: 3716762e38
...
am: ee18f5fe68
2016-06-21 19:38:50 +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
