Dmitry Shmidt
2ac3120a01
Merge "Fix dev settings crash when no OEM unlock service" am: 44cacaa8f1
...
am: f6d960ac31
2018-02-01 00:29:23 +00:00
Dmitry Shmidt
f6d960ac31
Merge "Fix dev settings crash when no OEM unlock service"
...
am: 44cacaa8f1
2018-02-01 00:19:30 +00:00
Dmitry Shmidt
44cacaa8f1
Merge "Fix dev settings crash when no OEM unlock service"
2018-01-31 23:46:54 +00:00
Jason Monk
8337ad3be6
Fix dev settings crash when no OEM unlock service
...
Test: Open dev settings, no crash
Change-Id: I028c52ee58d7262e9fbd015289d7848b397c82e3
2018-01-31 14:55:58 -05:00
Jin Dong
b9af110c03
Merge "Fix memory leak of DataSaverPreference" am: 7a65c7f279
...
am: 64ee868ff3
2018-01-29 19:10:00 +00:00
Jin Dong
64ee868ff3
Merge "Fix memory leak of DataSaverPreference"
...
am: 7a65c7f279
2018-01-29 19:07:25 +00:00
Treehugger Robot
7a65c7f279
Merge "Fix memory leak of DataSaverPreference"
2018-01-29 19:03:33 +00:00
Jin Dong
484087c181
Fix memory leak of DataSaverPreference
...
When DataSaverPreference is shown repeatedly, memory leak happens
since DataSaverBackend.Listener is not removed on onDetached().
TEST: Repeat enter and exit "Data usage" for
several times and check if the count of activity
is not increasing.
Bug: 72581115
Change-Id: Ic4a72de049bb87f1e522fe46dd0fb4bb58ed65a5
2018-01-29 16:32:45 +09:00
Bill Yi
b2db5c0028
Import translations. DO NOT MERGE
...
am: 31abbee452
2018-01-27 17:29:04 +00:00
Bill Yi
31abbee452
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2d8c57680d1d98b74193654e9fe77016304f6ac5
2018-01-26 20:56:24 -08:00
Pavlin Radoslavov
ab399887b9
Merge "Updated the Bluetooth Settings owners list" am: 5a56c31913
...
am: b1230be1b8
2018-01-27 00:08:34 +00:00
Pavlin Radoslavov
47a2c27af1
Merge "Add support for Multi-A2DP state machines per device" am: e61ac8ec02
...
am: a84302f194
2018-01-27 00:02:16 +00:00
Pavlin Radoslavov
b1230be1b8
Merge "Updated the Bluetooth Settings owners list"
...
am: 5a56c31913
2018-01-27 00:00:14 +00:00
Pavlin Radoslavov
a84302f194
Merge "Add support for Multi-A2DP state machines per device"
...
am: e61ac8ec02
2018-01-26 23:53:46 +00:00
Treehugger Robot
5a56c31913
Merge "Updated the Bluetooth Settings owners list"
2018-01-26 23:01:43 +00:00
Pavlin Radoslavov
718af4ba73
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: f9504d8979
...
am: 0859a07a61
2018-01-26 23:01:26 +00:00
Pavlin Radoslavov
0859a07a61
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
...
am: f9504d8979
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
221ba22546
Updated the Bluetooth Settings owners list
...
Test: None
Change-Id: I94a11d51b6c7691f7e84e8afe71c7c8083255ef0
2018-01-26 13:28:29 -08: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
2018-01-24 20:59:25 +00:00
Fan Zhang
a9cb8d776b
Merge "2nd attempt to fix crash when getting unavailable service"
...
am: ec4e0d3008
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
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
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
2018-01-19 01:12:04 +00:00
Jeff Sharkey
6f918104aa
Merge "Add new no-op interface method."
...
am: 78bfc6f55f
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
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
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
2018-01-18 02:25:19 +00:00
tiansiming
abcb069d95
Merge "Fix NPE crash in AppInfoBase"
...
am: e49cc3d659
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
2018-01-17 23:36:05 +00:00
jackqdyulei
2755f3de0a
DO NOT MERGE Add metric log for anomaly.
...
am: adf11594d3
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
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
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
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
