Commit Graph

40250 Commits

Author SHA1 Message Date
Pavlin Radoslavov
47a2c27af1 Merge "Add support for Multi-A2DP state machines per device" am: e61ac8ec02
am: a84302f194

Change-Id: I873b29a7c05454ed464fe0f242f0b334115d5f03
2018-01-27 00:02:16 +00:00
Pavlin Radoslavov
a84302f194 Merge "Add support for Multi-A2DP state machines per device"
am: e61ac8ec02

Change-Id: If1b5c0d5655ec7e2c465ef8b1633543ceba7181e
2018-01-26 23:53:46 +00:00
Pavlin Radoslavov
718af4ba73 Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: f9504d8979
am: 0859a07a61

Change-Id: I4307481f6df9b2ef9d07eb6066e8fda025bcd4e8
2018-01-26 23:01:26 +00:00
Pavlin Radoslavov
0859a07a61 Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
am: f9504d8979

Change-Id: I4293debea1998c8d20542c29134a036361fdd6a0
2018-01-26 22:53:49 +00:00
Treehugger Robot
e61ac8ec02 Merge "Add support for Multi-A2DP state machines per device" 2018-01-26 22:43:53 +00:00
Pavlin Radoslavov
e25f2e7768 Add support for Multi-A2DP state machines per device
Update usage of A2dpService API calls that take BluetoothDevice
as an additional argument. If the BluetoothDevice argument is null,
the API applies to the device that is currently the Active A2DP device.

Bug: 69269748
Test: Manual
Change-Id: I8031fa4b4256890dcb486228185baf93debb102d
Merged-In: I7417b7b0741f706df475cb2b27fbe6525f744269
2018-01-26 12:51:15 -08:00
Treehugger Robot
f9504d8979 Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" 2018-01-26 20:46:45 +00:00
Pavlin Radoslavov
ddf48e3962 Add Settings support for Bluetooth Multi-A2DP and Multi-HFP
Test: Code compilation
Bug: 64767509

[NOTE: The cherry-pick removed changes to non-existent code and log
message description that doesn't apply here.]

Change-Id: Iee76286110ed87703d6a968f50273c22cd7c7086
Merged-In: Iee76286110ed87703d6a968f50273c22cd7c7086
(cherry picked from commit 4b796e5d2e)
2018-01-26 11:16:23 -08:00
Fan Zhang
c1968ab9a0 Merge "2nd attempt to fix crash when getting unavailable service" am: ec4e0d3008
am: a9cb8d776b

Change-Id: Id944bc516fa093ce1421f40c2c6b05e277e94660
2018-01-24 20:59:25 +00:00
Fan Zhang
a9cb8d776b Merge "2nd attempt to fix crash when getting unavailable service"
am: ec4e0d3008

Change-Id: I05ace64e5d8979611df37a8618812910a6e905fa
2018-01-24 20:54:49 +00:00
Fan Zhang
ec4e0d3008 Merge "2nd attempt to fix crash when getting unavailable service" 2018-01-24 19:08:46 +00:00
Fan Zhang
54291e10ce 2nd attempt to fix crash when getting unavailable service
Change-Id: I6abb16e1c84b82021ce2dd54097fe68857e69129
Fixes: 68013053
Test: robotests
2018-01-23 13:53:06 -08:00
xiyuan.wang
6407162f01 Merge "The text on toast should be changed when remains 1 time for SIM lock input" am: 6e6b1e2079
am: 15691a74b5  -s ours

Change-Id: Ied52d7a7c8080177e4d45b35280ca13222c175d0
2018-01-23 21:07:52 +00:00
xiyuan.wang
15691a74b5 Merge "The text on toast should be changed when remains 1 time for SIM lock input"
am: 6e6b1e2079

Change-Id: Ic7f5ccda3111ebe6dc7934a2f50d7c2b76c2e70c
2018-01-23 20:31:59 +00:00
Treehugger Robot
6e6b1e2079 Merge "The text on toast should be changed when remains 1 time for SIM lock input" 2018-01-23 20:25:23 +00:00
xiyuan.wang
b63de874fa The text on toast should be changed when remains 1 time for SIM lock input
The behavior of getQuantityString() is different according to language, it gets
both "other" and "one" string if English is system language. But it always gets
"other" string if non-English, then the "other" string of wrong_pin_code is
shown even if remains 1 time of SIM lock input.

In order to change the string in any language, we add new string for
remains 1 time.

Bug: 71783850
Change-Id: I5de35eb71905b77028bf25226381e1ba79a37e92
2018-01-23 22:38:49 +09:00
Jeff Sharkey
cd08de069a Merge "Add new no-op interface method." am: 78bfc6f55f
am: 6f918104aa

Change-Id: I4c6643c124838a6dd3d69d58be358f824461a632
2018-01-19 01:12:04 +00:00
Jeff Sharkey
6f918104aa Merge "Add new no-op interface method."
am: 78bfc6f55f

Change-Id: I9dd3e64ad11886d852ed0db15830aa93f4f63dfc
2018-01-19 01:04:49 +00:00
Jeff Sharkey
78bfc6f55f Merge "Add new no-op interface method." 2018-01-18 23:58:30 +00:00
Jeff Sharkey
2d71185d31 Add new no-op interface method.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: bit FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DataConnectionTest
Change-Id: I46ab8fab705a6467f72b13b7dbc7f8af5f76fecf
Exempt-From-Owner-Approval: trivial no-op overload
Bug: 64133169
2018-01-18 14:51:21 -07:00
Bolun Shan
b50162415a Merge "DO NOT MERGE: Keep access point list updated once in short time" am: d7682e6d3c -s ours
am: bc00e361d5

Change-Id: Ie4be52fa2e0d304aa268a4610ba03cb52997dd5d
2018-01-18 02:59:45 +00:00
Bolun Shan
bc00e361d5 Merge "DO NOT MERGE: Keep access point list updated once in short time"
am: d7682e6d3c  -s ours

Change-Id: I134755ec0ec77dea80649440b969f9bcee8eab17
2018-01-18 02:57:28 +00:00
Treehugger Robot
d7682e6d3c Merge "DO NOT MERGE: Keep access point list updated once in short time" 2018-01-18 02:48:31 +00:00
tiansiming
b5697b2d45 Merge "Fix NPE crash in AppInfoBase" am: e49cc3d659
am: abcb069d95

Change-Id: Id60245ba109dc977ee1078e8d3f50288e5bdbcc7
2018-01-18 02:25:19 +00:00
tiansiming
abcb069d95 Merge "Fix NPE crash in AppInfoBase"
am: e49cc3d659

Change-Id: I719b50356e890e57a8d6574aae23a2d5d0fd989b
2018-01-18 02:15:29 +00:00
Bolun Shan
92cf21583d DO NOT MERGE: Keep access point list updated once in short time
The function onAccessPointsChanged will be called many times
and access points will be updated many times in 300ms. So check
if the same event exists before calling postDelayed.

Bug: 68230819
Test: Manual test
Change-Id: Id098e1b77c28b62a5495c3369ed950531e59dba2
2018-01-18 01:29:21 +00:00
Lei Yu
00322c0f83 Revert "DO NOT MERGE Add metric log for anomaly."
This reverts commit adf11594d3.

Merged-In: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0
Change-Id: I015d8c0d05c7ae9abfd4939f7a95e1f0daecc1fc
2018-01-17 23:36:05 +00:00
jackqdyulei
2755f3de0a DO NOT MERGE Add metric log for anomaly.
am: adf11594d3

Change-Id: I2b55df61278b9c64d80cd9ba43b8d9b1686ff6e4
2018-01-17 21:22:12 +00:00
Treehugger Robot
e49cc3d659 Merge "Fix NPE crash in AppInfoBase" 2018-01-17 19:44:16 +00:00
tiansiming
81469702f3 Fix NPE crash in AppInfoBase
This crash can hardly happen under the normal operation of the user,
but it may have a chance to appear in monkey test. To enhance the 
robustness of the program, intent.getData() here should not be null 
in any situations.

Bug: N/A
Test: adb shell am start -n
'com.android.settings/.Settings\$AppDrawOverlaySettingsActivity'

Change-Id: I732b564056e3e585405f146d99efe3b410edbc41
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2018-01-17 18:13:47 +00:00
Hansong Zhang
43c58ddfe6 Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices" am: ea5243e28d -s ours
am: b4ed2b2005

Change-Id: I0b80d8c673b680ab530f34420bb330665ab904b8
2018-01-16 18:13:44 +00:00
Hansong Zhang
b4ed2b2005 Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices"
am: ea5243e28d  -s ours

Change-Id: I57c326c97f19597bd2865c328e024de4da889e77
2018-01-16 18:04:48 +00:00
Treehugger Robot
ea5243e28d Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices" 2018-01-16 17:48:53 +00:00
jackqdyulei
adf11594d3 DO NOT MERGE Add metric log for anomaly.
This cl creates metric log when anomaly surfaces in battery page or
anomaly dialog.

Each anomaly action contains two fields:
1. FIELD_CONTEXT(int): determine which fragment start this action.
2. FIELD_ANOMALY_ACTION_TYPE(int): determine action type for this
anomaly.

**Cherry-picked from ag/3120176. Fix merge conflict in import part
in AdvancedPowerUsageDetail**

Bug: 68215016
Test: RunSettingsRoboTests
Change-Id: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0
2018-01-11 14:52:48 -08:00
jackqdyulei
9bf0e057c8 Add metric id for anomaly fragments.
am: 2fd1c9839c

Change-Id: Iff6c41c8549cdc102e954d6a429a9ab56d4e10c6
2018-01-11 01:53:47 +00:00
Hansong Zhang
4b367aba78 DO NOT MERGE Add developer menu to select max number of connected audio devices
The new developer option modifies the system property
"persist.bluetooth.maxconnectedaudiodevices"; it allows testing
multiple connected devices for A2DP, AVRCP, HFP.

Bug: 71603731
Test: Robolectric test
Change-Id: If8c2c26ad4c9a2b7458a2d16a0c29d5f9b4df5c7
2018-01-10 15:42:56 -08:00
jackqdyulei
2fd1c9839c Add metric id for anomaly fragments.
1. PowerUsageAnomalyDetails
2. AnomalyDialogFragment

Bug: 37681923
Test: Build

Change-Id: Ia82fde0fa3e61b6284dc18db3018dd223a0e435b
(cherry picked from commit 725562c748)
2018-01-10 03:10:28 +00:00
Malcolm Chen
e99f20cd95 Merge "Rename setDataEnabled to setUserDataEnabled." am: 43b1b97e3e
am: 5e90d8ea7a

Change-Id: I62b5c85e1737ef5ca23b2037b221a70e58121fe3
2018-01-10 00:07:09 +00:00
Malcolm Chen
5e90d8ea7a Merge "Rename setDataEnabled to setUserDataEnabled."
am: 43b1b97e3e

Change-Id: Ib11eca12b1331494972c86a18670c348abae3d2c
2018-01-09 23:56:14 +00:00
Treehugger Robot
43b1b97e3e Merge "Rename setDataEnabled to setUserDataEnabled." 2018-01-09 23:46:55 +00:00
Malcolm Chen
3aaf94b518 Rename setDataEnabled to setUserDataEnabled.
Test: unittest
Bug: 69814555
Change-Id: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
Merged-In: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
2018-01-08 18:08:01 -08:00
Jack He
dc9b879ef9 Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am: 80c0656ca6
am: e34375b88c

Change-Id: Ie9a167aa6310643465238510831eee8cfab34965
2018-01-08 20:20:47 +00:00
Jack He
e34375b88c Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
am: 80c0656ca6

Change-Id: Ifab1cde7af9421ce140c298df295c75e5e9055ed
2018-01-06 17:33:02 +00:00
Treehugger Robot
80c0656ca6 Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" 2018-01-05 20:41:01 +00:00
Jack He
7d563bd1de Bluetooth: Use "Disable" in-band ringing instead of "Enable"
* Given that in-band ringing is enabled by default on supported devices,
  the corresponding development settings should be rephrased from
  "Enable in-band ringing" to "Disable in-band ringing" to hint that it
  is enabled by default
* This also gets rid of special logic to check that option in
  initialization
* Add strings to reflect this change as well

Bug: 65383086
Test: make, try toggling the preference and verify whether in-band
ringing works or not

Change-Id: I29f91c7d12c725b12452ec163b75051ff28f500d
Merged-In: I29f91c7d12c725b12452ec163b75051ff28f500d
2018-01-04 17:23:57 -08:00
Akiya Utsumi
9dffb28afd Merge "Fix the format of wifi_carrier_content string" am: 985b432fc0
am: 47ba3b400c

Change-Id: I39a694ec83185fa6eb5d13cffa6d0390fe7d568a
2017-12-27 21:45:58 +00:00
Akiya Utsumi
47ba3b400c Merge "Fix the format of wifi_carrier_content string"
am: 985b432fc0

Change-Id: Ic77ff6da5081cae7a3b7fba31bc4902645188763
2017-12-27 21:43:20 +00:00
Treehugger Robot
985b432fc0 Merge "Fix the format of wifi_carrier_content string" 2017-12-27 21:36:40 +00:00
Akiya Utsumi
28fcc97d1b Fix the format of wifi_carrier_content string
Carrier name is not displayed on the dialog due to the
incorrect format "%1%s". This should be "%1$s".

Test: String change, manually verified
Bug: 70814622
Change-Id: Ie30b8d1eb85d390e4023e0a251e1f1c7fa6deec0
2017-12-22 05:38:12 +00:00
Fan Zhang
c1ecf35052 Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" am: 7c46a79a00 -s ours
am: 7e3fdede58

Change-Id: I650211969d19051a5ba69ff86c1c3f087fcaa453
2017-12-22 01:22:59 +00:00