OSDN Git Service
Yifan Hong [Tue, 15 Nov 2016 03:06:44 +0000 (03:06 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am:
8cc1343724
Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
Treehugger Robot [Tue, 15 Nov 2016 02:59:51 +0000 (02:59 +0000)]
Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
Sohani Rao [Mon, 14 Nov 2016 21:14:44 +0000 (21:14 +0000)]
Merge "Add WiFi toggle prompts - framework"
am:
584b5cee49 -s ours
Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c
Sohani Rao [Mon, 14 Nov 2016 20:59:35 +0000 (20:59 +0000)]
Merge "Add WiFi toggle prompts - framework"
Sohani Rao [Mon, 14 Nov 2016 19:33:31 +0000 (19:33 +0000)]
Merge "Permissions check for Wifi Display configuration"
am:
f5c32a411c
Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
Sohani Rao [Mon, 14 Nov 2016 19:21:57 +0000 (19:21 +0000)]
Merge "Permissions check for Wifi Display configuration"
Svetoslav Ganov [Wed, 27 Jul 2016 01:23:01 +0000 (18:23 -0700)]
Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Bug:
28715749
Test: Unit Tests
Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
Sohani Rao [Thu, 29 Sep 2016 23:20:45 +0000 (16:20 -0700)]
Permissions check for Wifi Display configuration
Wifi Display is configured using the AIDL call setMiracastMode()
and using a message over the async channel SET_WFD_INFO.
Enforce permissions on the calling uid before updating the config
Bug:
18668877
Test: Unit tests
Change-Id: I0be2d2af49070aad759f24bd31331f7df39a0422
Merged-In: I0be2d2af49070aad759f24bd31331f7df39a0422
Tyler Gunn [Mon, 14 Nov 2016 18:08:11 +0000 (18:08 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
am:
8223dc1ae9
Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
Tyler Gunn [Mon, 14 Nov 2016 16:23:42 +0000 (16:23 +0000)]
Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
Steven Moreland [Mon, 14 Nov 2016 15:15:39 +0000 (15:15 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
am:
e17e68f139
Change-Id: Iefe4ae60d8e7f0473f1b417ac09c5e37b082d07b
Treehugger Robot [Mon, 14 Nov 2016 15:03:31 +0000 (15:03 +0000)]
Merge "hidl: Update for IFoo::descriptor -> const char *."
Yifan Hong [Sat, 12 Nov 2016 01:20:54 +0000 (17:20 -0800)]
Update for removing read/writeEmbeddedFrom/ToParcel methods.
Test: mma
Bug:
32756130
Change-Id: I179a1fbd4962e9b3be383cc25d95a6d492ef6a1f
Jakub Pawlowski [Fri, 11 Nov 2016 23:48:51 +0000 (23:48 +0000)]
Merge "Bluetooth: advertising improvements"
am:
82c9ba9c55
Change-Id: I662ba0f326aa204f9f07ce88bc9d48f5b06770cb
Robert Sesek [Fri, 11 Nov 2016 23:44:49 +0000 (23:44 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."
am:
b828b6bf6c
Change-Id: I9b4d0000c29d5e404f333d8e8c89af2425452a17
Marie Janssen [Fri, 11 Nov 2016 23:41:42 +0000 (23:41 +0000)]
Merge "Bluetooth: BLE app tracking fixes"
am:
2174731449
Change-Id: Id07abb3d5ad76b318d1b7cee6d9fb9351737b141
Jakub Pawlowski [Fri, 11 Nov 2016 23:33:14 +0000 (23:33 +0000)]
Merge "Bluetooth: advertising improvements"
Jakub Pawlowski [Fri, 4 Nov 2016 22:25:57 +0000 (15:25 -0700)]
Bluetooth: advertising improvements
This patch removes isPeripheralModeSupported(), hidden public method
which is always returning true. It also modify the BluetoothLeAdvertiser
to be able to use advertising instance with instance id equal 0.
Bug:
30622771
Bug:
24099160
Change-Id: Id31582621dbe56d5c3a8d4ee5cd296af66a5f026
Treehugger Robot [Fri, 11 Nov 2016 23:25:43 +0000 (23:25 +0000)]
Merge "Respect force_mount_namespace in MountEmulatedStorage()."
Treehugger Robot [Fri, 11 Nov 2016 23:22:55 +0000 (23:22 +0000)]
Merge "Bluetooth: BLE app tracking fixes"
Marie Janssen [Wed, 9 Nov 2016 20:01:24 +0000 (12:01 -0800)]
Bluetooth: BLE app tracking fixes
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.
Test: enable and disable bluetooth an LE-only app running
Bug:
32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
Steven Moreland [Fri, 11 Nov 2016 20:33:41 +0000 (12:33 -0800)]
hidl: Update for IFoo::descriptor -> const char *.
Test: hidl_test, hidl_test_java
Bug:
32745840
Change-Id: I9e4dcaaf7365d03cb53a2e1e8cd6336fbc08417d
Marco Nelissen [Fri, 11 Nov 2016 20:10:00 +0000 (20:10 +0000)]
Merge "Make AmrInputStream use MediaCodec"
am:
866658261f
Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
Treehugger Robot [Fri, 11 Nov 2016 19:54:38 +0000 (19:54 +0000)]
Merge "Make AmrInputStream use MediaCodec"
Jack Yu [Fri, 11 Nov 2016 19:51:23 +0000 (19:51 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API"
am:
4469e48d5c
Change-Id: Id92b8eaeec12885af3748d1e839da1a5560e2619
Tyler Gunn [Fri, 11 Nov 2016 19:31:28 +0000 (11:31 -0800)]
Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount.
Adding companion PhoneAccount capability which is used to indicate when a
PhoneAccount supports video calling. That is, whether it can potentially
make video calls, but not necessarily at the current time.
This is an often requested OEM enhancement which is used to drive UX (e.g.
imagine a video calling icon showing up if the device supports video, but
only being enabled when the device is in range of a VT capable tower).
See bug for reference to design doc.
Merged-Id: I38379a3a1cf1be04c6136b89b93ee95193ee7b6f
Bug:
27328615
Test: Manual
Change-Id: I08fc18950e6d35a8a7df47ce37aa2326624b9fd3
Jack Yu [Fri, 11 Nov 2016 19:41:46 +0000 (19:41 +0000)]
Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG:
32609966 Test: CTS Testing new API"
Marco Nelissen [Thu, 13 Oct 2016 21:38:40 +0000 (14:38 -0700)]
Make AmrInputStream use MediaCodec
Bug:
32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
liangweikang [Fri, 11 Nov 2016 03:25:41 +0000 (03:25 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"
am:
264d1f12a3
Change-Id: Icfaf039b078d7ce43b23bed09cd0102427c6f047
Treehugger Robot [Fri, 11 Nov 2016 03:16:42 +0000 (03:16 +0000)]
Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"
Robert Sesek [Fri, 11 Nov 2016 02:50:04 +0000 (21:50 -0500)]
Respect force_mount_namespace in MountEmulatedStorage().
In Ieb75cc3009ed26b7366213409d5fad836f597084, the unshare step was
skipped if no storage is required. But the change failed to take the force
parameter into account
Test: m
Test: angler boots
Test: fugu boots
Bug:
21643067
Change-Id: I52447f02fd25f553628564733fd6bf2523c07f7c
Robert Sesek [Fri, 11 Nov 2016 00:13:57 +0000 (00:13 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."
am:
c0aacbe513
Change-Id: I7199d687e2e67dd4672bcb388053c33db6b693f5
Treehugger Robot [Fri, 11 Nov 2016 00:02:45 +0000 (00:02 +0000)]
Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."
Peter Qiu [Thu, 10 Nov 2016 22:07:11 +0000 (22:07 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
am:
0295d7bd38
Change-Id: I79279f22bfc9642ed7905d099dd43555714ea815
Ta-wei Yen [Thu, 10 Nov 2016 22:02:17 +0000 (22:02 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
am:
0a3b6b70dd
Change-Id: I512e68bccda115ad7c58ec1f1fbfbb2c69c86578
Treehugger Robot [Thu, 10 Nov 2016 21:56:55 +0000 (21:56 +0000)]
Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
Ta-wei Yen [Thu, 10 Nov 2016 21:46:34 +0000 (21:46 +0000)]
Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
Peter Qiu [Thu, 10 Nov 2016 20:19:51 +0000 (20:19 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
am:
44e817fdcf
Change-Id: If165cadffd0ae93fb94d1883f41851f1d92d50f6
Ta-wei Yen [Thu, 10 Nov 2016 20:11:56 +0000 (12:11 -0800)]
Add createForPhoneAccountHandle() and getServicetate()
Respect TelephonyManager's subId when listening to phone state
TelecomManager perfers to use a PhoneAccountHandle to represent a
account but TelephonyManager prefers subscription IDs.
This CL added createForPhoneAccountHandle() in TelephonyManager so
telephony values can be queried from it.
Currently the ServiceState can be retrieved through registering a
PhoneStatelistener, but it is a callback which the handler cannot be
specified.
getServiceState() is added to allow the ServiceState to be polled.
While TelphonyManager has createForSubscriptionId(), listen() does not
respect the subId on the manager created from it, and will always use
the hidden subId on the listener, which is always the default subId
through public API.
After this CL, the default subId on the listener will null.
TelephonyManager use its' own subId if the listener does not set the
subId to something else.
Bug:
32637799
Bug:
32414216
Test: cts-tradefed run cts-dev --module CtsTelephonyTestCases
Change-Id: I9995e4da1573cf1f6b6e4acf2daf7a538fb60d5f
Jakub Pawlowski [Thu, 10 Nov 2016 20:07:39 +0000 (20:07 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)"
am:
97d9fe0a2f
Change-Id: I935cc35d9f7f1eea5459f0091ad14dc8b200bc02
Akira Oshimi [Thu, 10 Nov 2016 20:06:34 +0000 (20:06 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity"
am:
5bb91bacc3
Change-Id: I0e9d19f297c158ff0c6acd1aa6665e3459fa416b
Treehugger Robot [Thu, 10 Nov 2016 20:06:06 +0000 (20:06 +0000)]
Merge "wifi: hotspot2: add support for parsing Release 1 installation file"
Treehugger Robot [Thu, 10 Nov 2016 20:00:50 +0000 (20:00 +0000)]
Merge "BLE OOB Pairing - parse address type (5/5)"
Treehugger Robot [Thu, 10 Nov 2016 19:54:16 +0000 (19:54 +0000)]
Merge "Add null check before finish SystemUI Tuner's activity"
Jakub Pawlowski [Thu, 10 Nov 2016 00:51:09 +0000 (16:51 -0800)]
BLE OOB Pairing - parse address type (5/5)
When address type is not parsed, creating bond to devices not using
random address is impossible.
Bug:
32780409
Test: try pairing with nRF52DK using random address
Change-Id: Ie6cc1f8c008d43b2acd021b47f9bbfb1f63472e8
Andreas Huber [Thu, 10 Nov 2016 19:08:28 +0000 (19:08 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
am:
df3d68c9b2
Change-Id: I56e293d16dee7503f717f3cca4902720307a2024
Treehugger Robot [Thu, 10 Nov 2016 18:58:28 +0000 (18:58 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
Peter Qiu [Tue, 25 Oct 2016 18:38:01 +0000 (11:38 -0700)]
wifi: hotspot2: add Passpoint APIs to WifiManager
Add dedicated APIs for managing Passpoint configurations, since
Passpoint configurations are different from WiFi network
configurations. A Passpoint configuration provides a credential for
authenticating to one or more WiFi networks that are operated
by the "same" service provider.
Bug:
32282711
Test: make -j32
Change-Id: I52822ab3074e2f2a3d986e3c0a24d024f2c06dca
Peter Qiu [Mon, 24 Oct 2016 16:59:43 +0000 (09:59 -0700)]
wifi: hotspot2: add support for parsing Release 1 installation file
Bug:
32277793
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: I526c5e88e504c9c843d517a1a8208bc35d8655e9
Randy Pan [Thu, 10 Nov 2016 16:15:52 +0000 (16:15 +0000)]
Merge "Wifi Tx/Rx rate computation"
am:
bccf93311c
Change-Id: I8b564af08155dcb49cf5f71d283b21091b80d3e0
Randy Pan [Thu, 10 Nov 2016 16:02:58 +0000 (16:02 +0000)]
Merge "Wifi Tx/Rx rate computation"
Akira Oshimi [Thu, 29 Sep 2016 03:17:24 +0000 (12:17 +0900)]
Add null check before finish SystemUI Tuner's activity
SystemUI Tuner's activity changes to null when Multi-window's state is
changed after confirmation dialog about removing SystemUI Tuner is
shown. Then NullPointerException occurs by trying to finish the
activity to tap "REMOVE" button on the confirmation dialog.
So add null check before finish the activity.
Bug:
32786029
Test: manual - remove System UI Tuner on Multi-Window mode
Change-Id: I455d17c0c600eeb05c9dfb7d609d40307de2f855
Kevin Su [Wed, 9 Nov 2016 01:59:19 +0000 (17:59 -0800)]
Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte.
Regenerate api accordingly.
BUG:
32609966
Test: CTS Testing new API
Change-Id: I2603fc0001f31ff23f02f4fdf2a72b33f2750a4c
Sohani Rao [Wed, 9 Nov 2016 19:26:51 +0000 (19:26 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
am:
836e74052e
Change-Id: Ib22ae41f991ce68d47e2f7437984c7fa248dd235
Sohani Rao [Wed, 9 Nov 2016 19:15:43 +0000 (19:15 +0000)]
Merge "Update REQUEST_PEERS message with calling package"
Andreas Huber [Thu, 3 Nov 2016 22:46:04 +0000 (15:46 -0700)]
Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections.
Test: make, hidl_test_java
Bug:
32670143
Change-Id: Ia987a26fceab41cfc18fbae7c83e01dff1d9d11a
liangweikang [Thu, 3 Nov 2016 08:12:08 +0000 (16:12 +0800)]
fixed applyConfigurationToResourcesLocked WeakReference is null
https://code.google.com/p/android/issues/detail?id=226956
Test: compile anr monkey test
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
Randy Pan [Wed, 2 Nov 2016 23:51:01 +0000 (16:51 -0700)]
Wifi Tx/Rx rate computation
Factor in the timestamp when computing the Tx/Rx rates. The
reported rate is a combination of current and previous rates
with a heavier weight from the current rate.
Bug:
30982272
Test: Ran the new image and compared the results against the
old algorithm.
Change-Id: I485b7002416f382993353d9f6240ea63cb08ddae
Steven Moreland [Tue, 8 Nov 2016 21:20:57 +0000 (21:20 +0000)]
Merge "Update for namespaced services in hwservicemanager."
am:
605df82c9e
Change-Id: I38d861ca107665f1f865f19eebd1be368a8c77a4
Treehugger Robot [Tue, 8 Nov 2016 21:10:06 +0000 (21:10 +0000)]
Merge "Update for namespaced services in hwservicemanager."
Sohani Rao [Mon, 19 Sep 2016 20:36:13 +0000 (13:36 -0700)]
Update REQUEST_PEERS message with calling package
The service enforces location permissions on the caller,
verifies the calling package is registered with the uid.
BUG:
30760540
Test: Unit tests, P2p scan to get peer list and
establishing a Wifi Direct connection
Change-Id: Ia0eb466a370a00c0264944871ce348841a17abc3
Merged-In: Ia0eb466a370a00c0264944871ce348841a17abc3
Tyler Gunn [Tue, 8 Nov 2016 18:37:42 +0000 (18:37 +0000)]
Merge "Add voip audio mode configuration for ims call"
am:
4296aa3b2b
Change-Id: I4b0cdaf7864f4db427b0c1736e51d09618f17b06
Tyler Gunn [Tue, 8 Nov 2016 18:27:50 +0000 (18:27 +0000)]
Merge "Add voip audio mode configuration for ims call"
Steven Moreland [Thu, 3 Nov 2016 22:17:04 +0000 (15:17 -0700)]
Update for namespaced services in hwservicemanager.
Test: end to end, hidl_test_java
Bug:
31861268
Change-Id: I3e91cf8a87f9345d4ae0650e521414407c7fc780
Jimmy Wu [Wed, 2 Nov 2016 18:12:19 +0000 (02:12 +0800)]
Add voip audio mode configuration for ims call
Add config_use_voip_mode_for_ims key. Set to false if ims
audio routing is via modem; set to true if it is via rtp
stream.
Change-Id: I539d24d1d666b2d61a4a92d5b1e3fb762a2766dc
Etan Cohen [Mon, 7 Nov 2016 23:35:37 +0000 (23:35 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API"
am:
13c76b77dc
Change-Id: Ie12c01e0d8e29e13e2ebcf1f49c56a1a8f705637
Etan Cohen [Mon, 7 Nov 2016 23:19:01 +0000 (23:19 +0000)]
Merge "[AWARE] Fix visibility of Aware Characteristics API"
Marco Nelissen [Mon, 7 Nov 2016 17:22:36 +0000 (17:22 +0000)]
Merge "Use libaudioclient"
am:
0a05c49248
Change-Id: I134c9c5b95e446fcc18e2b35a3eca2a4a794e8c8
Etan Cohen [Mon, 7 Nov 2016 17:14:46 +0000 (09:14 -0800)]
[AWARE] Fix visibility of Aware Characteristics API
Hide the get characteristics API - since the underlying characteristics
class is (still hidden). Will be opened in a separate phase from the parent
class.
Bug:
31912101
Test: update-api succeeded when opening the parent class
Change-Id: Ibe2f282027cd4b1c03bfb2b1e151551c34314541
Marco Nelissen [Mon, 7 Nov 2016 17:14:24 +0000 (17:14 +0000)]
Merge "Use libaudioclient"
Etan Cohen [Sun, 6 Nov 2016 03:13:31 +0000 (03:13 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
am:
74b1131cc8
Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
Etan Cohen [Sun, 6 Nov 2016 03:05:39 +0000 (03:05 +0000)]
Merge "[NAN-AWARE] Rename NAN to Aware"
Etan Cohen [Wed, 26 Oct 2016 18:22:06 +0000 (11:22 -0700)]
[NAN-AWARE] Rename NAN to Aware
~Rename only (and any reformatting needed to pass lint) - no
functional changes!
Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.
(cherry-pick of commit
a61b9fb569153917a650f1d48efa20ba8846a9f3)
Bug:
32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
Marco Nelissen [Thu, 3 Nov 2016 17:58:33 +0000 (10:58 -0700)]
Use libaudioclient
Test: build/boot
Change-Id: I7c730bfd47297f311e00798b5927888ddc3f5062
Colin Cross [Sat, 5 Nov 2016 00:15:01 +0000 (00:15 +0000)]
Merge "Move one more libandroidfw header"
am:
c5c74f9f49
Change-Id: Ib4d1c81aba13543da2454140548252cf013c95e1
Colin Cross [Sat, 5 Nov 2016 00:05:38 +0000 (00:05 +0000)]
Merge "Move one more libandroidfw header"
Colin Cross [Fri, 4 Nov 2016 22:48:13 +0000 (15:48 -0700)]
Move one more libandroidfw header
The libandroidfw headers were moved into the library directory, move one
more that did not exist in the original patch.
Test: builds
Change-Id: Ic74a41558e1bc3984d98dd766f69d081edd8fc08
John Reck [Fri, 4 Nov 2016 21:47:34 +0000 (21:47 +0000)]
Merge "Re-unite sources with their headers"
am:
e43444a00b
Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
Treehugger Robot [Fri, 4 Nov 2016 21:41:01 +0000 (21:41 +0000)]
Merge "Re-unite sources with their headers"
John Reck [Thu, 3 Nov 2016 23:16:47 +0000 (16:16 -0700)]
Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.
Also fixes -Werror issues that resulted in
no longer being -isystem.
Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit
f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
Andre Eisenbach [Thu, 3 Nov 2016 23:22:07 +0000 (23:22 +0000)]
Merge "BT: Don't switch devices when one of the connected BT headsets disconnects"
am:
0bebfe76fc
Change-Id: Ibd4c4f9defec469bb14a282c53d64932123d4905
Andre Eisenbach [Thu, 3 Nov 2016 23:13:17 +0000 (23:13 +0000)]
Merge "BT: Don't switch devices when one of the connected BT headsets disconnects"
Satish Kodishala [Mon, 18 Jan 2016 08:53:12 +0000 (14:23 +0530)]
BT: Don't switch devices when one of the connected BT headsets disconnects
Usecase:
1. Enable multi-hf.
2. Connect to HS1.
3. Connect to HS2.
4. Make a call on AG. Here call audio is present on HS2.
5. Now disconnect HS1 from AG.
Failure:
When HS1 is disconnected, call audio is routed to handset/speaker.
Root cause:
When hs1 disconnection intent is received, SCO path is cleared
and audio is routed to handset/speaker.
Fix:
Check if the device being disconnected is same as the device
call audio is present before clearing SCO path.
Change-Id: If83325679b70b5893e44e8d844000ee028d0246c
Etan Cohen [Thu, 3 Nov 2016 20:26:29 +0000 (20:26 +0000)]
Merge "Update service test runner to allow test args"
am:
56b92e8191
Change-Id: Ib5f44685228bab61d50dea4c5bd226c4b80c2dd1
Etan Cohen [Thu, 3 Nov 2016 20:18:53 +0000 (20:18 +0000)]
Merge "Update service test runner to allow test args"
Richard Coles [Thu, 3 Nov 2016 14:42:08 +0000 (14:42 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
am:
be19fe5e8a
Change-Id: I85e2e13f395dac085616838670c19ddbedc67e9d
Richard Coles [Thu, 3 Nov 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
Steven Moreland [Wed, 2 Nov 2016 22:23:45 +0000 (22:23 +0000)]
Merge "Update for hidlized hwservicemanager."
am:
8d0c4ed74c
Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa
Treehugger Robot [Wed, 2 Nov 2016 22:17:24 +0000 (22:17 +0000)]
Merge "Update for hidlized hwservicemanager."
neo.chae [Wed, 2 Nov 2016 21:16:33 +0000 (21:16 +0000)]
Merge "Fix idmap leak in zygote process"
am:
f5ad44b60a
Change-Id: Ia9977c8166f797ad716284eda03076e282a9fde7
Treehugger Robot [Wed, 2 Nov 2016 21:09:02 +0000 (21:09 +0000)]
Merge "Fix idmap leak in zygote process"
Brad Ebinger [Wed, 2 Nov 2016 20:51:36 +0000 (20:51 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
am:
f231db7786 -s ours
Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507
Steven Moreland [Mon, 24 Oct 2016 20:44:41 +0000 (13:44 -0700)]
Update for hidlized hwservicemanager.
Bug:
32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28
Brad Ebinger [Wed, 2 Nov 2016 20:39:40 +0000 (20:39 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session"
pengzhicai [Wed, 2 Nov 2016 18:23:26 +0000 (18:23 +0000)]
Merge "Fix String is empty issue"
am:
80af1ba47b
Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
Treehugger Robot [Wed, 2 Nov 2016 18:14:49 +0000 (18:14 +0000)]
Merge "Fix String is empty issue"
Brad Ebinger [Wed, 2 Nov 2016 16:59:30 +0000 (16:59 +0000)]
Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
Brad Ebinger [Fri, 28 Oct 2016 19:29:55 +0000 (12:29 -0700)]
Modify ConnectionServiceAdapter to include Session
Modifies the ConnectionServiceAdapter to include Session Information in
the AIDL interface so that external Sessions can be started in Telecom
from Telephony.
Test: Manual testing and Unit Tests pass
Bug:
26571395
Change-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403
pengzhicai [Wed, 2 Nov 2016 01:27:20 +0000 (09:27 +0800)]
Fix String is empty issue
Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739
Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
Sanket Agarwal [Wed, 2 Nov 2016 01:05:20 +0000 (01:05 +0000)]
Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am:
cf4dc9236e
Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401