OSDN Git Service
Yoshinori Hirano [Sat, 24 Feb 2018 23:54:26 +0000 (23:54 +0000)]
Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" am:
8378efc6af -s ours
am:
942249a2dd -s ours
Change-Id: I23af2770255199348eaa8c69d990ff2907ff90de
Yoshinori Hirano [Sat, 24 Feb 2018 23:48:50 +0000 (23:48 +0000)]
Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE"
am:
8378efc6af -s ours
Change-Id: Ic3274cd389282ac819d41830fa907d7fcf9ddb61
Treehugger Robot [Sat, 24 Feb 2018 23:28:45 +0000 (23:28 +0000)]
Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE"
Yoshinori Hirano [Mon, 30 Oct 2017 05:38:57 +0000 (14:38 +0900)]
Add SettingsMultiSelectListPreference style DO NOT MERGE
There is no OK and CANCEL button when changing APN Bearer.
To fix this issue, OK and CANCEL button should be added to
SettingsMultiSelectListPreference style.
Fixes:
66928311
Test: manual - Add a new APN and tap Bearer
Change-Id: I2b5719a7c1fdb721b15308e0eef7db3e6398e097
Hansong Zhang [Sat, 24 Feb 2018 00:26:09 +0000 (00:26 +0000)]
Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" am:
ad84c9552d -s ours
am:
d2040309ca
Change-Id: I93238df1e9d889817f0d025203ac437c12cfa2d8
Hansong Zhang [Sat, 24 Feb 2018 00:19:01 +0000 (00:19 +0000)]
Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports"
am:
ad84c9552d -s ours
Change-Id: Icb23ebb9baaf02ac0f9469e9d4601c67d22ba5ad
Treehugger Robot [Fri, 23 Feb 2018 23:07:26 +0000 (23:07 +0000)]
Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports"
hansson [Fri, 23 Feb 2018 07:30:14 +0000 (07:30 +0000)]
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible." am:
f5b75dd74d
am:
aa0812f42b
Change-Id: I6ef97b4506cf656194090bcf9b0df543190f1e79
hansson [Fri, 23 Feb 2018 07:24:45 +0000 (07:24 +0000)]
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible."
am:
f5b75dd74d
Change-Id: Ie9aa31d9a2d89a330b682c8602320ad58cbc8ae1
hansson [Fri, 23 Feb 2018 07:15:36 +0000 (07:15 +0000)]
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible."
Hansong Zhang [Thu, 4 Jan 2018 00:26:19 +0000 (16:26 -0800)]
Add developer menu entry to enable Bluetooth AVDTP delay reports
Bug:
32755225
Test: Manual test with a device that supports delay reporting
Change-Id: Ib84eb6a67c15634818efd98f6e454b323e16a8ff
Merged-In: I8f121dd7f94bce3a07deb9cb23c698829cbecd96
Anton Hansson [Thu, 22 Feb 2018 16:12:29 +0000 (16:12 +0000)]
packages/apps/Settings: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug:
73535841
Change-Id: Ic906adbd670c4dbfe2cdf0b71cdbeaf9ac08a27e
Fan Zhang [Wed, 21 Feb 2018 17:55:50 +0000 (17:55 +0000)]
Merge "Wifi: Restore hidden flag for hidden networks on update network" am:
0138575b8d
am:
e1c58570d6
Change-Id: Ice03d80eedf64fb08a12471b22bfdff53b4f934b
Fan Zhang [Wed, 21 Feb 2018 17:47:12 +0000 (17:47 +0000)]
Merge "Wifi: Restore hidden flag for hidden networks on update network"
am:
0138575b8d
Change-Id: Ifda4b13017d4fc74f6fabfa5f91b3bda9177fb47
Fan Zhang [Wed, 21 Feb 2018 17:36:06 +0000 (17:36 +0000)]
Merge "Wifi: Restore hidden flag for hidden networks on update network"
Bill Yi [Tue, 20 Feb 2018 18:09:10 +0000 (18:09 +0000)]
Import translations. DO NOT MERGE
am:
3b4a3e0a0f -s ours
Change-Id: I68a6f27af09691e2a27712ecab8c876f5eb26283
Bill Yi [Tue, 20 Feb 2018 08:57:01 +0000 (00:57 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1e41ebfa49aad56d5fad9889dcea6f487457400d
Anurag Das [Mon, 18 Dec 2017 09:17:01 +0000 (14:47 +0530)]
Wifi: Restore hidden flag for hidden networks on update network
Currently when user modifies any of the network parameter for hidden
networks, hidden flag is not updated. As a result this network is no
longer part of hidden networks, we are unable to reconnect when user
triggers wifi off and on.
This commit sets the value of hiddenSSID flag of config at the Settings
side on network update.
Test: manual test with hidden access point
Bug:
73256783
Change-Id: Ic20f03345645d8bf3bc9c3ff44910dd3f2797fec
Bill Yi [Sun, 18 Feb 2018 17:32:29 +0000 (17:32 +0000)]
Import translations. DO NOT MERGE
am:
27f30d2f46 -s ours
Change-Id: I02d655e5e18147b0cc6a95069db935ed39b1719d
Bill Yi [Sat, 17 Feb 2018 07:15:09 +0000 (23:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia171cb822fd79c5828a9042873f4b52b6e9c6541
Hemant Gupta [Tue, 13 Feb 2018 22:22:23 +0000 (22:22 +0000)]
Merge "OPP: Prevent sending intent while orientation change" am:
f32fa0b5f6
am:
def626bea0
Change-Id: I811e1801a145e9bb010359fdb8c74fb8ca968e7d
Hemant Gupta [Tue, 13 Feb 2018 22:10:34 +0000 (22:10 +0000)]
Merge "OPP: Prevent sending intent while orientation change"
am:
f32fa0b5f6
Change-Id: Id576b0cda560d565d86d6369b7552801cac7b0cd
Treehugger Robot [Tue, 13 Feb 2018 20:43:24 +0000 (20:43 +0000)]
Merge "OPP: Prevent sending intent while orientation change"
Hemant Gupta [Thu, 1 Feb 2018 13:50:29 +0000 (19:20 +0530)]
OPP: Prevent sending intent while orientation change
Steps:
1. Take any photo/picture and share it via Bluetooth
2. Before choosing remote device in Device Picker Activity, rotate
the device.
Expected result:
File transfer should complete after selecting the device.
Actual result:
The dialog "Bluetooth share: File Unknown file not sent" is shown and
file sharing fails.
Fix:
Add configuration related check in manifest to avoid activity restart during
orientation change.
Test: File transferred successfully after step 2
Fixes:
72715713
Change-Id: I045c2940d3788059c9313e5501a7957608d8879c
Pavlin Radoslavov [Sat, 10 Feb 2018 09:22:38 +0000 (09:22 +0000)]
Merge "Use proper string formatting for the "Active device" string" am:
f5848d0f4d
am:
8018f82e5a
Change-Id: Iaf745544ca349cb5a0193b4dd0e46bcc89ff4e0c
Pavlin Radoslavov [Sat, 10 Feb 2018 09:12:16 +0000 (09:12 +0000)]
Merge "Use proper string formatting for the "Active device" string"
am:
f5848d0f4d
Change-Id: Ic34959c5ca44ad6d0ac06dfb76b3b07cd4bee819
Treehugger Robot [Sat, 10 Feb 2018 02:05:12 +0000 (02:05 +0000)]
Merge "Use proper string formatting for the "Active device" string"
Pavlin Radoslavov [Thu, 8 Feb 2018 01:23:12 +0000 (17:23 -0800)]
Use proper string formatting for the "Active device" string
Updated testContextMock() how it checks the bluetooth_connected string.
Bug:
72317067
Test: Unit test updated:
make ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest \
RunSettingsRoboTests
Manual: two headsets and switching the active device
Change-Id: I3db178d71543e4dfa437544350c58241860ae703
Merged-In: I3db178d71543e4dfa437544350c58241860ae703
(cherry picked from commit
b58b006e44ecf73ad31f79bade8149df7d903dc3)
tiansiming [田思明] [Wed, 7 Feb 2018 22:16:46 +0000 (22:16 +0000)]
Merge "Fix NPE in AutoSyncWorkDataPreferenceController" am:
cdd628e6e4
am:
0bc6b461be
Change-Id: I78899aef7b43c067f7c4094d7de63b95c4ee3f11
tiansiming [田思明] [Wed, 7 Feb 2018 22:13:14 +0000 (22:13 +0000)]
Merge "Fix NPE in AutoSyncWorkDataPreferenceController"
am:
cdd628e6e4
Change-Id: Ic10709693acbf3f04704ed76a7474291af509cf5
Treehugger Robot [Wed, 7 Feb 2018 22:01:51 +0000 (22:01 +0000)]
Merge "Fix NPE in AutoSyncWorkDataPreferenceController"
tiansiming [田思明] [Sun, 4 Feb 2018 12:45:42 +0000 (20:45 +0800)]
Fix NPE in AutoSyncWorkDataPreferenceController
AutoSyncWorkDataPreferenceController gets mUserHandle from
Utils.getManagedProfileWithDisabled which may return null,
crash will happend when updateState called.
So a judgement here seems helpful to make the program more robust.
Bug: https://partnerissuetracker.corp.google.com/u/1/issues/
72908879
Test: make ROBOTEST_FILTER="(AutoSyncWorkDataPreferenceControllerTest)"
RunSettingsRoboTests
Change-Id: I53ca027a2f2dd79655cc2eee67db236cfa03f656
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Jin Dong [Fri, 2 Feb 2018 07:09:00 +0000 (07:09 +0000)]
Merge "Fix memory leak of page "Languages & input"" am:
f94ff6ce6f
am:
6d55e0633e
Change-Id: I841c0d095c15849c409b1c1ebb9d47b79b438788
Jin Dong [Fri, 2 Feb 2018 03:55:08 +0000 (03:55 +0000)]
Merge "Fix memory leak of page "Languages & input""
am:
f94ff6ce6f
Change-Id: Ie22f77eff353807e5a24cb6a2317b688f9b70193
Treehugger Robot [Thu, 1 Feb 2018 23:41:43 +0000 (23:41 +0000)]
Merge "Fix memory leak of page "Languages & input""
Dmitry Shmidt [Thu, 1 Feb 2018 00:29:23 +0000 (00:29 +0000)]
Merge "Fix dev settings crash when no OEM unlock service" am:
44cacaa8f1
am:
f6d960ac31
Change-Id: I536daa3948be136524e35e35448df09eaa6ad9da
Dmitry Shmidt [Thu, 1 Feb 2018 00:19:30 +0000 (00:19 +0000)]
Merge "Fix dev settings crash when no OEM unlock service"
am:
44cacaa8f1
Change-Id: Ica60f5411908a8edb34b9263ee8d6d6b4617587b
Dmitry Shmidt [Wed, 31 Jan 2018 23:46:54 +0000 (23:46 +0000)]
Merge "Fix dev settings crash when no OEM unlock service"
Jason Monk [Wed, 31 Jan 2018 19:55:58 +0000 (14:55 -0500)]
Fix dev settings crash when no OEM unlock service
Test: Open dev settings, no crash
Change-Id: I028c52ee58d7262e9fbd015289d7848b397c82e3
Jin Dong [Fri, 22 Dec 2017 10:25:03 +0000 (18:25 +0800)]
Fix memory leak of page "Languages & input"
When enter/exit from "Languages & input" screen repeatedly, memory
leak happens since InputDeviceListener is not unregistered.
Listener registration is called in onPause() when exiting from the
screen, but new activity is created when enter the screen and the
listener registered by previous activity is not unregistered in
onResume().
Bug:
72675680
Test: Manual - Repeat enter and exit "Language & input" page for
several times and check if the count of activity doesn't increase.
Change-Id: I8e0be0ab4b1d13d53c3868b10f409d1e06387c2f
Jin Dong [Mon, 29 Jan 2018 19:10:00 +0000 (19:10 +0000)]
Merge "Fix memory leak of DataSaverPreference" am:
7a65c7f279
am:
64ee868ff3
Change-Id: Ieda87ec6f8958d11b36cc48fab83233c687a254f
Jin Dong [Mon, 29 Jan 2018 19:07:25 +0000 (19:07 +0000)]
Merge "Fix memory leak of DataSaverPreference"
am:
7a65c7f279
Change-Id: If0cc15cc83afde74a2cd694924fe5af8cf124c8b
Treehugger Robot [Mon, 29 Jan 2018 19:03:33 +0000 (19:03 +0000)]
Merge "Fix memory leak of DataSaverPreference"
Jin Dong [Fri, 22 Dec 2017 09:49:23 +0000 (17:49 +0800)]
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
Bill Yi [Sat, 27 Jan 2018 17:29:04 +0000 (17:29 +0000)]
Import translations. DO NOT MERGE
am:
31abbee452 -s ours
Change-Id: Ieefa67e07289212f8201836b1cdc0bc774c45a9b
Bill Yi [Sat, 27 Jan 2018 04:56:24 +0000 (20:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2d8c57680d1d98b74193654e9fe77016304f6ac5
Pavlin Radoslavov [Sat, 27 Jan 2018 00:08:34 +0000 (00:08 +0000)]
Merge "Updated the Bluetooth Settings owners list" am:
5a56c31913
am:
b1230be1b8
Change-Id: Idc872dced34147a2a55a8734f22e9d6131bf9142
Pavlin Radoslavov [Sat, 27 Jan 2018 00:02:16 +0000 (00:02 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am:
e61ac8ec02
am:
a84302f194
Change-Id: I873b29a7c05454ed464fe0f242f0b334115d5f03
Pavlin Radoslavov [Sat, 27 Jan 2018 00:00:14 +0000 (00:00 +0000)]
Merge "Updated the Bluetooth Settings owners list"
am:
5a56c31913
Change-Id: I6c3c34d3c074f8d4cd928fb874035350d9f4e33d
Pavlin Radoslavov [Fri, 26 Jan 2018 23:53:46 +0000 (23:53 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
am:
e61ac8ec02
Change-Id: If1b5c0d5655ec7e2c465ef8b1633543ceba7181e
Treehugger Robot [Fri, 26 Jan 2018 23:01:43 +0000 (23:01 +0000)]
Merge "Updated the Bluetooth Settings owners list"
Pavlin Radoslavov [Fri, 26 Jan 2018 23:01:26 +0000 (23:01 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am:
f9504d8979
am:
0859a07a61
Change-Id: I4307481f6df9b2ef9d07eb6066e8fda025bcd4e8
Pavlin Radoslavov [Fri, 26 Jan 2018 22:53:49 +0000 (22:53 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
am:
f9504d8979
Change-Id: I4293debea1998c8d20542c29134a036361fdd6a0
Treehugger Robot [Fri, 26 Jan 2018 22:43:53 +0000 (22:43 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
Pavlin Radoslavov [Fri, 26 Jan 2018 21:27:26 +0000 (13:27 -0800)]
Updated the Bluetooth Settings owners list
Test: None
Change-Id: I94a11d51b6c7691f7e84e8afe71c7c8083255ef0
Pavlin Radoslavov [Fri, 26 Jan 2018 20:37:33 +0000 (12:37 -0800)]
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
Treehugger Robot [Fri, 26 Jan 2018 20:46:45 +0000 (20:46 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
Pavlin Radoslavov [Sun, 21 Jan 2018 10:04:45 +0000 (02:04 -0800)]
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
4b796e5d2ea23d45f67bd46590eddcac8b3148b4)
Fan Zhang [Wed, 24 Jan 2018 20:59:25 +0000 (20:59 +0000)]
Merge "2nd attempt to fix crash when getting unavailable service" am:
ec4e0d3008
am:
a9cb8d776b
Change-Id: Id944bc516fa093ce1421f40c2c6b05e277e94660
Fan Zhang [Wed, 24 Jan 2018 20:54:49 +0000 (20:54 +0000)]
Merge "2nd attempt to fix crash when getting unavailable service"
am:
ec4e0d3008
Change-Id: I05ace64e5d8979611df37a8618812910a6e905fa
Fan Zhang [Wed, 24 Jan 2018 19:08:46 +0000 (19:08 +0000)]
Merge "2nd attempt to fix crash when getting unavailable service"
Fan Zhang [Tue, 23 Jan 2018 21:48:27 +0000 (13:48 -0800)]
2nd attempt to fix crash when getting unavailable service
Change-Id: I6abb16e1c84b82021ce2dd54097fe68857e69129
Fixes:
68013053
Test: robotests
xiyuan.wang [Tue, 23 Jan 2018 21:07:52 +0000 (21:07 +0000)]
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
xiyuan.wang [Tue, 23 Jan 2018 20:31:59 +0000 (20:31 +0000)]
Merge "The text on toast should be changed when remains 1 time for SIM lock input"
am:
6e6b1e2079
Change-Id: Ic7f5ccda3111ebe6dc7934a2f50d7c2b76c2e70c
Treehugger Robot [Tue, 23 Jan 2018 20:25:23 +0000 (20:25 +0000)]
Merge "The text on toast should be changed when remains 1 time for SIM lock input"
xiyuan.wang [Thu, 28 Dec 2017 03:24:40 +0000 (11:24 +0800)]
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
Jeff Sharkey [Fri, 19 Jan 2018 01:12:04 +0000 (01:12 +0000)]
Merge "Add new no-op interface method." am:
78bfc6f55f
am:
6f918104aa
Change-Id: I4c6643c124838a6dd3d69d58be358f824461a632
Jeff Sharkey [Fri, 19 Jan 2018 01:04:49 +0000 (01:04 +0000)]
Merge "Add new no-op interface method."
am:
78bfc6f55f
Change-Id: I9dd3e64ad11886d852ed0db15830aa93f4f63dfc
Jeff Sharkey [Thu, 18 Jan 2018 23:58:30 +0000 (23:58 +0000)]
Merge "Add new no-op interface method."
Jeff Sharkey [Thu, 18 Jan 2018 21:51:21 +0000 (14:51 -0700)]
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
Bolun Shan [Thu, 18 Jan 2018 02:59:45 +0000 (02:59 +0000)]
Merge "DO NOT MERGE: Keep access point list updated once in short time" am:
d7682e6d3c -s ours
am:
bc00e361d5
Change-Id: Ie4be52fa2e0d304aa268a4610ba03cb52997dd5d
Bolun Shan [Thu, 18 Jan 2018 02:57:28 +0000 (02:57 +0000)]
Merge "DO NOT MERGE: Keep access point list updated once in short time"
am:
d7682e6d3c -s ours
Change-Id: I134755ec0ec77dea80649440b969f9bcee8eab17
Treehugger Robot [Thu, 18 Jan 2018 02:48:31 +0000 (02:48 +0000)]
Merge "DO NOT MERGE: Keep access point list updated once in short time"
tiansiming [Thu, 18 Jan 2018 02:25:19 +0000 (02:25 +0000)]
Merge "Fix NPE crash in AppInfoBase" am:
e49cc3d659
am:
abcb069d95
Change-Id: Id60245ba109dc977ee1078e8d3f50288e5bdbcc7
tiansiming [Thu, 18 Jan 2018 02:15:29 +0000 (02:15 +0000)]
Merge "Fix NPE crash in AppInfoBase"
am:
e49cc3d659
Change-Id: I719b50356e890e57a8d6574aae23a2d5d0fd989b
Bolun Shan [Thu, 12 Oct 2017 07:17:08 +0000 (15:17 +0800)]
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
Lei Yu [Wed, 17 Jan 2018 23:22:47 +0000 (23:22 +0000)]
Revert "DO NOT MERGE Add metric log for anomaly."
This reverts commit
adf11594d3510cd947e186ce4dec254223f1da10.
Merged-In: I83761e2a9c206ea7a04f7d031a6961fdab7ca9a0
Change-Id: I015d8c0d05c7ae9abfd4939f7a95e1f0daecc1fc
jackqdyulei [Wed, 17 Jan 2018 21:22:12 +0000 (21:22 +0000)]
DO NOT MERGE Add metric log for anomaly.
am:
adf11594d3
Change-Id: I2b55df61278b9c64d80cd9ba43b8d9b1686ff6e4
Treehugger Robot [Wed, 17 Jan 2018 19:44:16 +0000 (19:44 +0000)]
Merge "Fix NPE crash in AppInfoBase"
tiansiming [Sun, 14 Jan 2018 08:46:05 +0000 (16:46 +0800)]
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>
Hansong Zhang [Tue, 16 Jan 2018 18:13:44 +0000 (18:13 +0000)]
Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices" am:
ea5243e28d -s ours
am:
b4ed2b2005
Change-Id: I0b80d8c673b680ab530f34420bb330665ab904b8
Hansong Zhang [Tue, 16 Jan 2018 18:04:48 +0000 (18:04 +0000)]
Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices"
am:
ea5243e28d -s ours
Change-Id: I57c326c97f19597bd2865c328e024de4da889e77
Treehugger Robot [Tue, 16 Jan 2018 17:48:53 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Add developer menu to select max number of connected audio devices"
jackqdyulei [Wed, 25 Oct 2017 17:41:30 +0000 (10:41 -0700)]
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
jackqdyulei [Thu, 11 Jan 2018 01:53:47 +0000 (01:53 +0000)]
Add metric id for anomaly fragments.
am:
2fd1c9839c
Change-Id: Iff6c41c8549cdc102e954d6a429a9ab56d4e10c6
Hansong Zhang [Wed, 10 Jan 2018 23:42:56 +0000 (15:42 -0800)]
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
jackqdyulei [Tue, 24 Oct 2017 01:21:33 +0000 (18:21 -0700)]
Add metric id for anomaly fragments.
1. PowerUsageAnomalyDetails
2. AnomalyDialogFragment
Bug:
37681923
Test: Build
Change-Id: Ia82fde0fa3e61b6284dc18db3018dd223a0e435b
(cherry picked from commit
725562c7484439172dece19c72b5c76943144638)
Malcolm Chen [Wed, 10 Jan 2018 00:07:09 +0000 (00:07 +0000)]
Merge "Rename setDataEnabled to setUserDataEnabled." am:
43b1b97e3e
am:
5e90d8ea7a
Change-Id: I62b5c85e1737ef5ca23b2037b221a70e58121fe3
Malcolm Chen [Tue, 9 Jan 2018 23:56:14 +0000 (23:56 +0000)]
Merge "Rename setDataEnabled to setUserDataEnabled."
am:
43b1b97e3e
Change-Id: Ib11eca12b1331494972c86a18670c348abae3d2c
Treehugger Robot [Tue, 9 Jan 2018 23:46:55 +0000 (23:46 +0000)]
Merge "Rename setDataEnabled to setUserDataEnabled."
Malcolm Chen [Thu, 30 Nov 2017 02:01:25 +0000 (18:01 -0800)]
Rename setDataEnabled to setUserDataEnabled.
Test: unittest
Bug:
69814555
Change-Id: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
Merged-In: I1d43dc1d2f720383a2f0be18560fc0fd4ff349fd
Jack He [Mon, 8 Jan 2018 20:20:47 +0000 (20:20 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" am:
80c0656ca6
am:
e34375b88c
Change-Id: Ie9a167aa6310643465238510831eee8cfab34965
Jack He [Sat, 6 Jan 2018 17:33:02 +0000 (17:33 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
am:
80c0656ca6
Change-Id: Ifab1cde7af9421ce140c298df295c75e5e9055ed
Treehugger Robot [Fri, 5 Jan 2018 20:41:01 +0000 (20:41 +0000)]
Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""
Jack He [Thu, 7 Dec 2017 23:09:07 +0000 (15:09 -0800)]
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
Akiya Utsumi [Wed, 27 Dec 2017 21:45:58 +0000 (21:45 +0000)]
Merge "Fix the format of wifi_carrier_content string" am:
985b432fc0
am:
47ba3b400c
Change-Id: I39a694ec83185fa6eb5d13cffa6d0390fe7d568a
Akiya Utsumi [Wed, 27 Dec 2017 21:43:20 +0000 (21:43 +0000)]
Merge "Fix the format of wifi_carrier_content string"
am:
985b432fc0
Change-Id: Ic77ff6da5081cae7a3b7fba31bc4902645188763
Treehugger Robot [Wed, 27 Dec 2017 21:36:40 +0000 (21:36 +0000)]
Merge "Fix the format of wifi_carrier_content string"
Akiya Utsumi [Tue, 31 Oct 2017 02:11:15 +0000 (11:11 +0900)]
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
Fan Zhang [Fri, 22 Dec 2017 01:22:59 +0000 (01:22 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" am:
7c46a79a00 -s ours
am:
7e3fdede58
Change-Id: I650211969d19051a5ba69ff86c1c3f087fcaa453