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
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
2018-01-10 00:07:09 +00:00
Malcolm Chen
5e90d8ea7a
Merge "Rename setDataEnabled to setUserDataEnabled."
...
am: 43b1b97e3e
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
2018-01-08 20:20:47 +00:00
Jack He
e34375b88c
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
...
am: 80c0656ca6
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
2017-12-27 21:45:58 +00:00
Akiya Utsumi
47ba3b400c
Merge "Fix the format of wifi_carrier_content string"
...
am: 985b432fc0
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
2017-12-22 01:22:59 +00:00
Fan Zhang
7e3fdede58
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
...
am: 7c46a79a00
2017-12-22 01:13:32 +00:00
Treehugger Robot
7c46a79a00
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
2017-12-22 01:01:41 +00:00
Fan Zhang
6be8dfc9b7
DO NOT MERGE: Fix test failure in CodeInspectionTest
...
Change-Id: I74fbd30261fa66636c915936270d873e7612cbc6
Fixes: 70496869
Test: robotests
2017-12-21 15:42:41 -08:00
goneil
50f5d8cf66
Merge "Set EDITED column to USER_EDITED when editing APN" am: 90d284cab7
...
am: 1b0c8335e3
2017-12-20 00:41:52 +00:00
goneil
1b0c8335e3
Merge "Set EDITED column to USER_EDITED when editing APN"
...
am: 90d284cab7
2017-12-20 00:39:32 +00:00
Treehugger Robot
90d284cab7
Merge "Set EDITED column to USER_EDITED when editing APN"
2017-12-20 00:36:53 +00:00
Bill Yi
5855abd505
Import translations. DO NOT MERGE am: 596de5e45c -s ours
...
am: 1f229d3710
2017-12-19 18:26:45 +00:00
Bill Yi
1f229d3710
Import translations. DO NOT MERGE
...
am: 596de5e45c
2017-12-19 18:24:44 +00:00
Bill Yi
d704c83a85
Import translations. DO NOT MERGE
...
am: 1e9183e0c0
2017-12-19 18:24:12 +00:00
Bill Yi
596de5e45c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie62b3a6c465b7d0f011cfdc5e51fb3f195ed4306
2017-12-18 20:43:20 -08:00
Bill Yi
1e9183e0c0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ib8ace3f2052b60e0623095c5647b9c9c3b2c199c
2017-12-18 20:37:58 -08:00
rongrong.x.gao
fbc9e954d7
Merge "Launch new Home app when selecting Home app in Settings" am: f05fc290b7
...
am: b0ab6da4e3
2017-12-18 22:19:28 +00:00
rongrong.x.gao
b0ab6da4e3
Merge "Launch new Home app when selecting Home app in Settings"
...
am: f05fc290b7
2017-12-18 22:16:32 +00:00
Treehugger Robot
f05fc290b7
Merge "Launch new Home app when selecting Home app in Settings"
2017-12-18 22:09:25 +00:00
rongrong.x.gao
b573e23b48
Launch new Home app when selecting Home app in Settings
...
Launches the newly selected Home app when it has been selected in
Default Home app settings. This CL makes the change take effect
immediately, instead of when the Home button is pressed.
Bug: 70697830
Test: make RunSettingsRoboTests
Test: Manual - Change default home app in Settings
Change-Id: If7e2956bc6f8ddba0a7e8da48a0d38e3936c57e9
2017-12-16 12:44:01 +09:00
tiansiming
576e159641
Merge "Fix NPE when press ttsEngines settings icon" am: 4b6e1b0758
...
am: 57b9039750
2017-12-15 22:38:29 +00:00
