Chen Xu
15878e511f
Merge "allow com.android.cellbroadcastservice grant signature permission"
...
am: a8c4669579
2019-12-07 14:02:53 -08:00
Chen Xu
a8c4669579
Merge "allow com.android.cellbroadcastservice grant signature permission"
2019-12-07 21:19:23 +00:00
Kim Baekgyeong
3a3f869e90
Merge "Add last connected device concept"
...
am: bb8b854423
2019-12-06 16:47:35 -08:00
Treehugger Robot
bb8b854423
Merge "Add last connected device concept"
2019-12-07 00:39:13 +00:00
Srinivas Paladugu
376ca93cb2
Merge "Add property to skip idle state for zram writeback"
...
am: a594a9e68c
2019-12-06 16:21:31 -08:00
Jordan Liu
6824b2d6ed
Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs"
...
am: 9fd7c05eb9
2019-12-06 16:14:48 -08:00
Treehugger Robot
a594a9e68c
Merge "Add property to skip idle state for zram writeback"
2019-12-07 00:12:04 +00:00
Jordan Liu
9fd7c05eb9
Merge "Expose some SystemApis and edit framework-cellbroadcast-shared-srcs"
2019-12-07 00:06:23 +00:00
Zach Johnson
2fb54515a2
Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled"
...
am: bd4031de4a
2019-12-06 15:27:45 -08:00
Zach Johnson
bd4031de4a
Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled"
...
* changes:
Collapse the implementations of BluetoothDevice.createBond
Call parameterized version of IBluetooth.enable
Implement isEnabled in terms of getState
2019-12-06 23:20:07 +00:00
Meng Wang
3172db5841
Merge "SubscriptionPlan: move out of telephony"
...
am: c4090312df
2019-12-06 15:18:04 -08:00
Treehugger Robot
c4090312df
Merge "SubscriptionPlan: move out of telephony"
2019-12-06 23:12:58 +00:00
Marco Nelissen
b6aaed3796
Merge "Fix bad javadoc link"
...
am: b002876a41
2019-12-06 14:38:16 -08:00
Marco Nelissen
b002876a41
Merge "Fix bad javadoc link"
2019-12-06 22:30:15 +00:00
Brad Ebinger
7c9af8e7e8
Merge "Remove old compatibility layer for old ImsService Impls"
...
am: b0a795a511
2019-12-06 14:18:40 -08:00
Shuo Qian
bf43ca5c69
Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API"
...
am: 0024076b1a
2019-12-06 14:11:42 -08:00
Treehugger Robot
b0a795a511
Merge "Remove old compatibility layer for old ImsService Impls"
2019-12-06 22:11:26 +00:00
Shuo Qian
0024076b1a
Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API"
2019-12-06 22:01:17 +00:00
Meng Wang
1ba2871a02
SubscriptionPlan: move out of telephony
...
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.
Bug: 145814152
Test: make
Change-Id: I3bfb0ec699f46b0cc34c3bc2e13bfb242bc295bf
2019-12-06 13:50:15 -08:00
Meng Wang
968927d7ff
Merge "SubscriptionPlan: move out of telephony"
...
am: a11df59bb4
2019-12-06 13:46:33 -08:00
Meng Wang
a11df59bb4
Merge "SubscriptionPlan: move out of telephony"
2019-12-06 21:37:52 +00:00
Anton Hansson
e6ef4c306d
Merge "Add TEST_MAPPING"
...
am: ed8cbcca55
2019-12-06 12:21:39 -08:00
Anton Hansson
ed8cbcca55
Merge "Add TEST_MAPPING"
2019-12-06 20:14:02 +00:00
sqian
22f5749ccc
Make getPackagesWithPriviligesForAllActiveSubscriptions system API
...
Test: build
Bug: 145550382
Change-Id: Ia7efb9e4b22b24f3c87c7cd631548c7254b28926
Merged-In: Ia7efb9e4b22b24f3c87c7cd631548c7254b28926
(cherry picked from commit 6f27c5769d
2019-12-06 12:07:57 -08:00
Meng Wang
36673a4b44
SubscriptionPlan: move out of telephony
...
Hidden APIs of SubscriptionPlan are used in system server, not
telephopny. So it makes more sense for SubscriptionPlan to be in
core instead of telephopny.
Bug: 145814152
Test: make
Change-Id: I4c7ae02f9f4f154c99263521e08265d6fb367272
2019-12-06 11:47:46 -08:00
Jordan Liu
bf68dc85a4
Expose some SystemApis and edit framework-cellbroadcast-shared-srcs
...
The APIs are used in the CellBroadcastService, and the
framework-cellbroadcast-shared-srcs library is also linked there.
Bug: 135956699
Test: manual
Change-Id: I5e71ea1ee1a858c0520c241dc7365733441e0f50
Merged-In: I5e71ea1ee1a858c0520c241dc7365733441e0f50
2019-12-06 11:19:48 -08:00
kwekua
bc68555ae5
Merge "[BugFix]Fix enter deep doze when moving"
...
am: 525d252ec1
2019-12-06 11:09:44 -08:00
Anton Hansson
9ff695eee1
Add TEST_MAPPING
...
...and remove the broken test!
Bug: 137191822
Test: treehugger (hopefully!?)
Change-Id: I175c1262275ae95caabac32a5308fd454ae62a4d
2019-12-06 19:00:33 +00:00
kwekua
525d252ec1
Merge "[BugFix]Fix enter deep doze when moving"
2019-12-06 18:59:17 +00:00
Marco Nelissen
738d5e11ce
Fix bad javadoc link
...
Method link was referring to itself.
Bug: 144964777
Test: build offline-sdk-docs, open doc in browser
Change-Id: Ib373b16d36ee91ebe10f5c6c2a635c65480a48e0
2019-12-06 10:37:31 -08:00
Kim Baekgyeong
ef06dcb4b1
Add last connected device concept
...
When connecting multiple audio devices
Media and Sonification sounds comes out of the last connected device,
not a high-priority device.
Test: play music
Test: connect wired earphone // sound : wired earphone
Test: connect usb earphone // sound : usb earphone, not the wired earphone(high-priority)
Test: connect bluetooth headset // sound : bluetooth headset
Test: disconnect bluetooth headset // sound : usb earphone, not the wired earphone(high-priority)
Bug: 135749685
Change-Id: I366e136f8e660c4d7f00935cc9088a926c9a605a
2019-12-06 09:38:30 -08:00
jiabin
13d789d480
Merge "Refactor audio device type in audio frameworks."
...
am: dd2c24061d
2019-12-06 09:33:45 -08:00
Treehugger Robot
dd2c24061d
Merge "Refactor audio device type in audio frameworks."
2019-12-06 17:26:20 +00:00
markchien
35efc80e47
Merge "Unhide NETLINK_NETFILTER constant"
...
am: 8efafa49db
2019-12-06 09:13:38 -08:00
Treehugger Robot
8efafa49db
Merge "Unhide NETLINK_NETFILTER constant"
2019-12-06 16:53:29 +00:00
Bookatz
d4d2c2bec5
Merge "Fix capitalized variable UserData"
...
am: c6f86d3403
2019-12-06 07:35:40 -08:00
Treehugger Robot
c6f86d3403
Merge "Fix capitalized variable UserData"
2019-12-06 15:26:11 +00:00
Anton Hansson
49aa386a67
Merge "Add an init service for setting sdk props"
...
am: 6a8eaf415d
2019-12-06 05:34:35 -08:00
Anton Hansson
6a8eaf415d
Merge "Add an init service for setting sdk props"
2019-12-06 13:28:21 +00:00
Anton Hansson
21699364c4
Merge "Add genrule for the current sdk proto"
...
am: 2df0a1096a
2019-12-06 04:12:38 -08:00
Anton Hansson
2df0a1096a
Merge "Add genrule for the current sdk proto"
2019-12-06 12:04:55 +00:00
Neil Fuller
c72f796176
Merge "TimeDetector improvements"
...
am: 6e3020490d
2019-12-06 04:02:09 -08:00
Neil Fuller
6e3020490d
Merge "TimeDetector improvements"
2019-12-06 11:53:14 +00:00
Anton Hansson
f176e6da35
Merge "Add derive_sdk binary for reading sdk protos"
...
am: 2613c2d9d4
2019-12-06 03:23:11 -08:00
Anton Hansson
2613c2d9d4
Merge "Add derive_sdk binary for reading sdk protos"
2019-12-06 11:13:03 +00:00
Aaron Huang
1abb8de060
Merge "Add TrafficStats methods to public APIs"
...
am: 8aed6e69f0
2019-12-06 03:08:19 -08:00
Aaron Huang
8aed6e69f0
Merge "Add TrafficStats methods to public APIs"
2019-12-06 10:59:11 +00:00
Aaron Huang
29667d2942
Add TrafficStats methods to public APIs
...
Add methods to public APIs for mainline support.
Bug: 139268426
Bug: 135998869
Test: atest FrameworksNetTests
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
atest android.net.cts
atest android.net.wifi.cts
Change-Id: I21a9c0dbdc79b1f1041fc9e23c6a4e1e97ecde92
2019-12-06 16:19:40 +08:00
lucaslin
1e2e0892ba
Merge "Remove incorrect annotation - @TransportType"
...
am: 7f81046bed
2019-12-05 20:57:08 -08:00
Treehugger Robot
7f81046bed
Merge "Remove incorrect annotation - @TransportType"
2019-12-06 04:50:27 +00:00
