Sudheer Shanka
9404fb8f72
Merge "Add PACKAGE_USAGE_STATS permission to shell." into oc-mr1-dev am: 471656b6d8
...
am: 1605878d62
2017-09-06 05:11:56 +00:00
Sudheer Shanka
1605878d62
Merge "Add PACKAGE_USAGE_STATS permission to shell." into oc-mr1-dev
...
am: 471656b6d8
2017-09-06 05:04:46 +00:00
Sudheer Shanka
471656b6d8
Merge "Add PACKAGE_USAGE_STATS permission to shell." into oc-mr1-dev
2017-09-06 04:59:15 +00:00
fionaxu
1af24abbb9
Merge "disable carrier actions on redirection by default" into oc-mr1-dev am: 5bed401148
...
am: bd1a716135
2017-09-06 04:19:45 +00:00
fionaxu
bd1a716135
Merge "disable carrier actions on redirection by default" into oc-mr1-dev
...
am: 5bed401148
2017-09-06 04:11:02 +00:00
TreeHugger Robot
5bed401148
Merge "disable carrier actions on redirection by default" into oc-mr1-dev
2017-09-06 04:01:43 +00:00
Lucas Dupin
162790c257
Merge "Lighter Quick Settings" into oc-mr1-dev am: f94e7b2c8b
...
am: f3bd8a9a3f
2017-09-06 02:32:18 +00:00
Lucas Dupin
f3bd8a9a3f
Merge "Lighter Quick Settings" into oc-mr1-dev
...
am: f94e7b2c8b
2017-09-06 02:22:52 +00:00
TreeHugger Robot
f94e7b2c8b
Merge "Lighter Quick Settings" into oc-mr1-dev
2017-09-06 02:16:47 +00:00
Paul McLean
aa12c85c98
Merge "Add dump of USB descriptors to the dumpsys for UsbHostManager service." into oc-mr1-dev am: e7b8f6d24a
...
am: a3841871a3
2017-09-06 01:59:32 +00:00
Paul McLean
a3841871a3
Merge "Add dump of USB descriptors to the dumpsys for UsbHostManager service." into oc-mr1-dev
...
am: e7b8f6d24a
2017-09-06 01:50:42 +00:00
Xiangyu/Malcolm Chen
d2dff96c45
Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev am: aa4c059da1
...
am: 647f6a7ceb
2017-09-06 01:45:09 +00:00
TreeHugger Robot
e7b8f6d24a
Merge "Add dump of USB descriptors to the dumpsys for UsbHostManager service." into oc-mr1-dev
2017-09-06 01:36:41 +00:00
Jack He
2241bf20bc
Merge "Bluetooth: Thread-safe binder invocation" am: 94f1fd0da2 am: a672ffa42f am: 9a68d78b44
...
am: c86e2f98a4
2017-09-06 01:34:32 +00:00
Xiangyu/Malcolm Chen
647f6a7ceb
Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev
...
am: aa4c059da1
2017-09-06 01:22:49 +00:00
Android Build Merger (Role)
6e5aad8daf
Merge "Merge "Update documentation for startScan" am: 7d2219d170 am: 04d061e891 am: 2ace7d5b63 am: e4eddfd682"
2017-09-06 01:18:45 +00:00
Vinay Kalia
86fb7a3c37
Merge "Update documentation for startScan" am: 7d2219d170 am: 04d061e891 am: 2ace7d5b63
...
am: e4eddfd682
2017-09-06 01:14:55 +00:00
Android Build Merger (Role)
c4539b1bcc
Merge "Merge "audio: Fix for IPlayerShell object leak." into oc-mr1-dev am: bff95c0d66 am: b36f98cec5"
2017-09-06 01:12:24 +00:00
Xiangyu/Malcolm Chen
aa4c059da1
Merge "Add EVENT_ROAMING_SETTING_CHANGE in DctConstants." into oc-mr1-dev
2017-09-06 01:09:35 +00:00
Jean-Michel Trivi
a0982b1877
Merge "audio: Fix for IPlayerShell object leak." into oc-mr1-dev am: bff95c0d66
...
am: b36f98cec5
2017-09-06 01:08:55 +00:00
Android Build Merger (Role)
9a8e49007d
Merge "Merge "Fix issue #65298216 : DeviceIdleController needs to watch..." into oc-mr1-dev am: 33489a9f84 am: a6fba5b59a -s ours"
2017-09-06 01:07:03 +00:00
TreeHugger Robot
a9c1d3f671
Merge "incident_section_gen: fix a memory leak warning."
2017-09-06 01:03:14 +00:00
Dianne Hackborn
c9b2c3f719
Merge "Fix issue #65298216 : DeviceIdleController needs to watch..." into oc-mr1-dev am: 33489a9f84
...
am: a6fba5b59a
2017-09-06 01:01:51 +00:00
Hugo Benichi
504b16ac55
Merge "Nat464Xlat: correct racefree teardown" into oc-mr1-dev am: 3cdb095ef4 -s ours
...
am: ce170b96d8
2017-09-06 00:54:38 +00:00
Jack He
c86e2f98a4
Merge "Bluetooth: Thread-safe binder invocation" am: 94f1fd0da2 am: a672ffa42f
...
am: 9a68d78b44
2017-09-06 00:53:03 +00:00
Jack He
9a68d78b44
Merge "Bluetooth: Thread-safe binder invocation" am: 94f1fd0da2
...
am: a672ffa42f
2017-09-06 00:39:55 +00:00
Vinay Kalia
e4eddfd682
Merge "Update documentation for startScan" am: 7d2219d170 am: 04d061e891
...
am: 2ace7d5b63
2017-09-06 00:34:20 +00:00
Jack He
a672ffa42f
Merge "Bluetooth: Thread-safe binder invocation"
...
am: 94f1fd0da2
2017-09-06 00:30:09 +00:00
Yifan Hong
1476e0fa5e
Merge "Merge "Fix ownership of objects returned by VintfObject::Get*" am: 2cdd1ce600 am: 56d8c8297d am: b519119efd" into oc-mr1-dev-plus-aosp
...
am: 7d9492eec8
2017-09-06 00:22:30 +00:00
Vinay Kalia
2ace7d5b63
Merge "Update documentation for startScan" am: 7d2219d170
...
am: 04d061e891
2017-09-06 00:21:37 +00:00
Treehugger Robot
94f1fd0da2
Merge "Bluetooth: Thread-safe binder invocation"
2017-09-06 00:10:55 +00:00
Jack He
16eeac356c
Bluetooth: Thread-safe binder invocation
...
* Binder object may become null between null check and actual invocation
if using a instance private variable assignable by service connection
callbacks
* The solution to this problem without locking is to assign existing
binder variable to a local final variable before the null check
* Any further invocation to a disconnected binder object will result in
RemoteException that is caught by the try-catch block
* Read and write to volatile variable is always atomic and hence thread-safe
* Removed unnecessary synchronization in BluetoothAdapter constructor
* Private mConnection objects should be final
* Simplfied several return statements where booleans can be returned
directly
* Removed unnecessary catches for NPE since there won't be any
Bug: 64724692
Test: make, pair and use devices, no functional change
Change-Id: Ifc9d6337c0d451a01484b61243230725d5314f8e
2017-09-06 00:09:47 +00:00
Vinay Kalia
04d061e891
Merge "Update documentation for startScan"
...
am: 7d2219d170
2017-09-06 00:08:24 +00:00
Android Build Merger (Role)
9df79f6a4b
Merge "Merge "Allow translucent RenderNode->Bitmap captures" into oc-mr1-dev am: 31897d8848 am: 2444a100fd"
2017-09-05 23:58:20 +00:00
John Reck
218e119ac8
Merge "Allow translucent RenderNode->Bitmap captures" into oc-mr1-dev am: 31897d8848
...
am: 2444a100fd
2017-09-05 23:52:58 +00:00
Android Build Merger (Role)
92f7bcad9e
Merge "Merge "Always use SSID average for SpeedLabel." into oc-mr1-dev am: 6c198f9e57 am: 94cb0ea479"
2017-09-05 23:52:29 +00:00
Treehugger Robot
7d2219d170
Merge "Update documentation for startScan"
2017-09-05 23:50:24 +00:00
Derek Sollenberger
7c47898ddb
Merge "Only flush after all layers are drawn instead of after each layer."
2017-09-05 23:50:13 +00:00
Sundeep Ghuman
d1411d9ef2
Merge "Always use SSID average for SpeedLabel." into oc-mr1-dev am: 6c198f9e57
...
am: 94cb0ea479
2017-09-05 23:47:17 +00:00
Todd Kennedy
19d18524a4
Merge "resolve stage dir before validation" into oc-mr1-dev am: 40f9beb589
...
am: 1e2855971e
2017-09-05 23:43:34 +00:00
Julius D'souza
727dccb9f5
Merge "DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am: 1f3da1c8b9 -s ours am: c7088d8bf8 -s ours am: ef6e002b30 am: 44bdde7bd1" into oc-mr1-dev am: fc696366b5
...
am: 41c7c711f4
2017-09-05 23:38:34 +00:00
Lucas Dupin
fc755e9c07
Lighter Quick Settings
...
Now using material grey 900 for QS, volume and power menus.
Feels more polished than just a solid black.
Test: Visual, on multiple devices
Change-Id: Ife05454d9fa0cf5f587ed0e58f3b28447de14f7b
Fixes: 65369406
2017-09-05 16:35:25 -07:00
Winson Chung
684a07e531
Merge "Merge "Double tap to expand PiP." into oc-mr1-dev am: 2a6f25b995" into oc-mr1-dev-plus-aosp
...
am: aa960edb78
2017-09-05 23:33:45 +00:00
Julius D'souza
f03159ba97
DO NOT MERGE: Dynamic doze check should be required before adjusting sensor rate. am: 1f3da1c8b9 -s ours am: c7088d8bf8 -s ours am: ef6e002b30 am: 44bdde7bd1 am: d9d18633f8
...
am: 0943dba2ac
2017-09-05 23:28:36 +00:00
Tyler Gunn
86b4bb9be5
Merge "Prevent INTERACT_ACROSS_USERS exception in DefaultDialerManager." into oc-mr1-dev am: dc79e248cb
...
am: 4a25d72eb5
2017-09-05 23:24:58 +00:00
Kai Wang
a8595bbfee
Merge "MediaBrowserService: Clean up ConnectionRecord when browser is dead" into oc-mr1-dev am: bbf55bb7ae
...
am: 86baa82d01
2017-09-05 23:21:07 +00:00
Jean-Michel Trivi
b36f98cec5
Merge "audio: Fix for IPlayerShell object leak." into oc-mr1-dev
...
am: bff95c0d66
2017-09-05 23:09:20 +00:00
TreeHugger Robot
bff95c0d66
Merge "audio: Fix for IPlayerShell object leak." into oc-mr1-dev
2017-09-05 22:59:02 +00:00
Dianne Hackborn
a6fba5b59a
Merge "Fix issue #65298216 : DeviceIdleController needs to watch..." into oc-mr1-dev
...
am: 33489a9f84
2017-09-05 22:57:41 +00:00
Yunlian Jiang
3809bbf256
incident_section_gen: fix a memory leak warning.
...
This fixes the warning
frameworks/base/tools/incident_section_gen/main.cpp:170:48:
warning: Potential memory leak [clang-analyzer-cplusplus.NewDeleteLeaks]
Bug:None
Test: The warning is gone.
Change-Id: I48dbd51ff53b35aa3fcd0b6507485ec61c1a160c
2017-09-05 15:53:41 -07:00
