OSDN Git Service
Treehugger Robot [Fri, 20 Jul 2018 18:57:09 +0000 (18:57 +0000)]
Merge "Use the SSID of the network in the no internet dialog"
Brad Ebinger [Mon, 16 Jul 2018 19:57:31 +0000 (19:57 +0000)]
Merge "IMS: Use the slot based ImsManager factory reset API."
Treehugger Robot [Wed, 11 Jul 2018 20:23:29 +0000 (20:23 +0000)]
Merge "new password shouldn't be empty string"
xiamin [Tue, 10 Jul 2018 02:48:56 +0000 (10:48 +0800)]
new password shouldn't be empty string
enter "Home screen backup password" in "Developer Settings",
do nothings and then click "Set backup password", There will
be a toast display "New backup password set".
The new password field cannot be empty.
Bug: https://partnerissuetracker.corp.google.com/u/2/issues/
111261338
Test: empty string can not be set as a password
Signed-off-by: xiamin <xiamin@xiaomi.com>
Treehugger Robot [Tue, 19 Jun 2018 21:55:17 +0000 (21:55 +0000)]
Merge "Show Wifi 'Off' status properly just after boot"
Daichi Ueura [Tue, 19 Jun 2018 06:44:21 +0000 (15:44 +0900)]
Show Wifi 'Off' status properly just after boot
If Wifi is not enabled at boot, WIFI_STATE_CHANGED_ACTION
sticky intent is not present. This results in Wifi 'Off'
status is not shown. This patch handles such case by calling
notifyChangeIfNeeded at register to refresh status.
Bug:
110373099
Test: manual - Check status after device boot with wifi off
Change-Id: I009386b03ef3269b00ce403b86087664b295f397
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge "Remove internal ApnSetting."
yuemingw [Wed, 13 Jun 2018 12:33:59 +0000 (13:33 +0100)]
Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.
Bug:
77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
Chalard Jean [Mon, 16 Apr 2018 04:09:03 +0000 (13:09 +0900)]
Use the SSID of the network in the no internet dialog
Bug:
77865258
Test: manual & roboelectric
Change-Id: I72f1f74bf004f30a2c38b4c3af977ff09360d1e8
nharold [Fri, 18 May 2018 01:15:48 +0000 (01:15 +0000)]
Merge changes from topic "telephony-debug-pi-tweaks"
* changes:
[Telephony Debug Menu] Redo Layout
[Telephony Debug Menu] Remove DcRtInfo
[Telephony Debug Menu] Remove NeighboringCellInfo
[Telephony Debug Menu] Add Link Capacity Estimate
[Telephony Debug Menu] Add Physical Channel Config
[Telephony Debug Menu] LTE BW and Serving CellInfo
Nathan Harold [Tue, 24 Apr 2018 20:21:19 +0000 (13:21 -0700)]
[Telephony Debug Menu] Redo Layout
Changes to the layout to better group
related fields, add more definite
boundaries, fix some alignment issues,
and put more-often-used fields closer
to the top.
Bug:
78791811
Test: manual
Change-Id: I492abe16a25d1880e4385a78247925805fe5b590
Nathan Harold [Wed, 18 Apr 2018 00:13:30 +0000 (17:13 -0700)]
[Telephony Debug Menu] Remove DcRtInfo
Remove the obsolete and unsupported DcRtInfo
field from the Debug menu. Since it doesn't
do anything and hasn't for a few releases,
we should make space for things that are
supported and minimize clutter.
Bug:
78791811
Test: manual
Change-Id: Id4cc808bf5c7671408cd5297965d93140aeefe97
Nathan Harold [Wed, 18 Apr 2018 00:09:42 +0000 (17:09 -0700)]
[Telephony Debug Menu] Remove NeighboringCellInfo
This CL removes the long-obsolete NeighboringCellInfo.
From a debug perspective, this info is a subset of the
other info already present, so it just adds clutter
without adding any value.
Bug:
78791811
Test: manual
Change-Id: Iaf275f81e276f63bdd9651ac60a5485bf5bdf160
Nathan Harold [Tue, 24 Apr 2018 20:31:07 +0000 (13:31 -0700)]
[Telephony Debug Menu] Add Link Capacity Estimate
Register for the Link capacity estimate for the
cellular default data connection and report it
in the debug menu.
Bug:
78791811
Test: manual
Merged-In: I73d945dfa192873936107902e0de6d58fc69059b
Change-Id: I73d945dfa192873936107902e0de6d58fc69059b
(cherry picked from commit
f10ea32d5572e3e65057532ddb1b3687f5a9f77e)
Nathan Harold [Tue, 24 Apr 2018 01:20:43 +0000 (18:20 -0700)]
[Telephony Debug Menu] Add Physical Channel Config
Add a field to display the PhyChanConfig and register
for this event as part of the PhoneStateListener.
Bug:
78791811
Test: manual
Merged-In: Ic038aa65655f8efa98bf1d6388e7c61761d2eb4a
Change-Id: Ic038aa65655f8efa98bf1d6388e7c61761d2eb4a
(cherry picked from commit
433ca4427ca8d3b349b9997f3dca03f96c5739cf)
Nathan Harold [Wed, 18 Apr 2018 00:01:32 +0000 (17:01 -0700)]
[Telephony Debug Menu] LTE BW and Serving CellInfo
Add debug menu support for the serving cell status
indication and the LTE bandwidth in the CellInfo
display.
Bug:
78791811
Test: manual
Merged-In: Ic51858131af671317431e0970bdcaeebcb460931
Change-Id: Ic51858131af671317431e0970bdcaeebcb460931
(cherry picked from commit
6e16fdf39907f6edaeb9fb431ed1cf20a8091b05)
Treehugger Robot [Thu, 17 May 2018 01:28:02 +0000 (01:28 +0000)]
Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak"
Nitin Shivpure [Fri, 11 May 2018 07:56:58 +0000 (13:26 +0530)]
Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak
Usecase:
1.) Make sure BT is turned off.
2.) Go to Settings -> Network & Internet
3.) Press back from Network & Internet.
4.) Repeat above step 2000 times
Expected Result:
No ANR/Crashed should be seen.
Observed Result:
ServiceConnection leak is happening & android setting app get crashed.
Root cause: TetherPreferenceController tries to get
pan Proxy object, when BT is oFF, which is leaking one
service connection each time
Fix: getProfileProxy for Pan must only be called, when BT is
turned on.
Test: lifeCycle_onCreate_shouldNotInitBluetoothPanWhenBluetoothOff
Bug:
79561076
Change-Id: I85208f48ce4dded94020cb156fcdb98b2cc873f9
Merged-In: I85208f48ce4dded94020cb156fcdb98b2cc873f9
Anton Hansson [Wed, 18 Apr 2018 12:02:10 +0000 (12:02 +0000)]
Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
Anton Hansson [Thu, 12 Apr 2018 17:54:37 +0000 (18:54 +0100)]
SettingsRoboTests: Remove direct dep on sdk_vcurrent module.
Doesn't appear to be needed. If it was needed, the right way to depend on
this module is to specify LOCAL_SDK_VERSION. This particular module is
getting deleted soon.
RunSettingsRoboTests hangs with and without this change, so I can't really
test the runtime effects of this change, but I don't think there are any
(local_java_libraries only affects compilation).
Test: Can't test - RunSettingsRoboTests hangs with and without this change.
Bug:
77525052
Change-Id: I116cd8e9676823b6670c162aa3bbdafa516001c5
Merged-In: I9df619c3d68f0af2ee2ae944a15998275129f7c2
Treehugger Robot [Wed, 28 Mar 2018 19:51:28 +0000 (19:51 +0000)]
Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
Kousuke Kitahara [Wed, 2 Aug 2017 08:48:00 +0000 (17:48 +0900)]
DO NOT MERGE Move IMS registration state to SIM status screen
To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: auto - Passed SimStatusTest.
Bug:
66063299
Change-Id: I3aff03ebdc9dc165db66c5007a2fa987ab8cd822
Treehugger Robot [Fri, 9 Mar 2018 20:56:50 +0000 (20:56 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default."
Suresh Koleti [Tue, 1 Aug 2017 05:09:06 +0000 (22:09 -0700)]
IMS: Use the slot based ImsManager factory reset API.
Use the slot based factory reset API of ImsManager
to reset the IMS settings values for appropriate sub.
Test: Manual
Bug:
74412226
Change-Id: Iceabb225764ac01f0172142ef95e874ca93c061d
Brad Ebinger [Thu, 8 Mar 2018 18:32:56 +0000 (18:32 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."
Ajay Panicker [Wed, 7 Mar 2018 23:42:58 +0000 (15:42 -0800)]
Bluetooth: Enable AVDTP Delay reports by default.
Bug:
32755225
Test: See that delay reports are enabled when connecting to device
Change-Id: I03bd216eb1725ee3e2e5da4e0baae61007ba2dcf
Merged-In: Icba9be6fc8ba455d37df39d283e36129f6acb536
Anton Hansson [Wed, 7 Mar 2018 11:27:19 +0000 (11:27 +0000)]
Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE"
Treehugger Robot [Tue, 6 Mar 2018 18:55:54 +0000 (18:55 +0000)]
Merge "DO NOT MERGE: Change encryption preference's summary accordingly"
Alex Cruz [Fri, 20 Oct 2017 23:26:58 +0000 (19:26 -0400)]
DO NOT MERGE: Change encryption preference's summary accordingly
With this change a summary to the encryption preference was added.
https://android.googlesource.com/platform/packages/apps/Settings/+/
415ce9a77d44732966fbab641d1ecaa8e8688381
The problem is that even if you're not encrypted, it says that your phone is.
Is very misleading to the user that don't bother to enter the actual preference
and want to see if they are. This fixes that.
Test: Go into Settings/Security & Location
Change-Id: Iaeaffd340f2e248748f244a947aa71eb8ad4ab94
Treehugger Robot [Thu, 1 Mar 2018 19:34:20 +0000 (19:34 +0000)]
Merge "Bluetooth: Use config value for default max connected audio devices"
Anton Hansson [Wed, 28 Feb 2018 11:28:53 +0000 (11:28 +0000)]
packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE
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: I139d2652b5a81d381bb06a2beadc053c9bfaf5aa
Jack He [Tue, 27 Feb 2018 06:58:56 +0000 (22:58 -0800)]
Bluetooth: Use config value for default max connected audio devices
* The first option in Bluetooth max connected audio devices preference
should be using system default
* Added template based string array to show system default in the list
preference and in preference summary when default is chosen
* Reset max connected audio devices property to empty string when
development setting is disabled or when system default is chosen
* Fix a bug by saving selected value to list preference so that it
persists when user re-opens development settings
Bug:
64767509
Test: Enable and disable multi-device mode in development settings
Change-Id: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
Merged-In: I4915f12df0ac0e6f715e44e0df4a3707dde8d1a4
Treehugger Robot [Wed, 28 Feb 2018 03:34:13 +0000 (03:34 +0000)]
Merge changes I06df032d,Ib923de28
* changes:
Settings: Disable failing tests.
Settings: Fix assertThat in tests
Andreas Gampe [Mon, 26 Feb 2018 20:22:29 +0000 (12:22 -0800)]
Settings: Disable failing tests.
Temporarily disable.
(cherry picked from commit
b506fb9b1918fe4b2144339567862ff03b3942cc)
Bug:
73892008
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherrypick
Merged-In: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Change-Id: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Chen Xu [Wed, 28 Feb 2018 02:17:26 +0000 (02:17 +0000)]
Merge "rename emergency tone settings"
Andreas Gampe [Mon, 26 Feb 2018 19:28:21 +0000 (11:28 -0800)]
Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.
Found by errorprone.
(cherry picked from commit
22bad556a1863bff80c4ec517ada315f7b01890e)
Bug:
73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Exempt-From-Owner-Approval: Cherrypick
Merged-In: Ib923de28ce5dcf79b9dec718306877e31e58e024
Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024
fionaxu [Tue, 27 Feb 2018 23:14:57 +0000 (15:14 -0800)]
rename emergency tone settings
Bug:
67470733
Test: Manual
Change-Id: I67e223c2db662f518fa306221190d4646668c4d3
Treehugger Robot [Mon, 26 Feb 2018 22:00:19 +0000 (22:00 +0000)]
Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
* changes:
Settings: Disable failing test
Settings: Disable failing test
Settings: Fix assertThat in tests
Treehugger Robot [Mon, 26 Feb 2018 21:36:15 +0000 (21:36 +0000)]
Merge changes I67dbf04a,I032f6741
* changes:
Settings: Disable failing assert
Settings: Fix assertThat in test
Andreas Gampe [Mon, 26 Feb 2018 20:14:05 +0000 (12:14 -0800)]
Settings: Disable failing assert
Temporarily disable.
Bug:
73892004
Test: m RunSettingsRoboTests
Change-Id: I67dbf04ae59e54632155c3eda67c70335147fd19
Andreas Gampe [Mon, 26 Feb 2018 20:28:42 +0000 (12:28 -0800)]
Settings: Disable failing test
Disable temporarily.
Bug:
73892683
Test: m RunSettingsRoboTests
Change-Id: I8dcc30b0b090fef1f2fd8fa3c6de7bf69e8b97a9
Andreas Gampe [Mon, 26 Feb 2018 20:27:56 +0000 (12:27 -0800)]
Settings: Disable failing test
Disable temporarily.
Bug:
73892555
Test: m RunSettingsRoboTests
Change-Id: I85292ad20de2cb169825eccb19dff1eb82e6fbe1
Andreas Gampe [Mon, 26 Feb 2018 19:28:21 +0000 (11:28 -0800)]
Settings: Fix assertThat in tests
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.
Found by errorprone.
Bug:
73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie0ab35348fa56c73e6257477a50ff130450e74e7
Andreas Gampe [Mon, 26 Feb 2018 19:28:21 +0000 (11:28 -0800)]
Settings: Fix assertThat in test
Truth.assertThat is a fluent-style API. Fix the tests to actually
do something.
Found by errorprone.
Bug:
73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: I032f6741ac0c728781a9d22ab6158e7b74a30167
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
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: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:36:06 +0000 (17:36 +0000)]
Merge "Wifi: Restore hidden flag for hidden networks on update network"
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
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
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)
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>
Treehugger Robot [Thu, 1 Feb 2018 23:41:43 +0000 (23:41 +0000)]
Merge "Fix memory leak of page "Languages & input""
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
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
Treehugger Robot [Fri, 26 Jan 2018 23:01:43 +0000 (23:01 +0000)]
Merge "Updated the Bluetooth Settings owners list"
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 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
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 [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
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"
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
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>
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"
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
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
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
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
Treehugger Robot [Fri, 22 Dec 2017 01:01:41 +0000 (01:01 +0000)]
Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"
Fan Zhang [Fri, 15 Dec 2017 19:58:56 +0000 (11:58 -0800)]
DO NOT MERGE: Fix test failure in CodeInspectionTest
Change-Id: I74fbd30261fa66636c915936270d873e7612cbc6
Fixes:
70496869
Test: robotests
Treehugger Robot [Wed, 20 Dec 2017 00:36:53 +0000 (00:36 +0000)]
Merge "Set EDITED column to USER_EDITED when editing APN"
Treehugger Robot [Mon, 18 Dec 2017 22:09:25 +0000 (22:09 +0000)]
Merge "Launch new Home app when selecting Home app in Settings"
rongrong.x.gao [Thu, 2 Mar 2017 09:29:34 +0000 (17:29 +0800)]
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
Treehugger Robot [Fri, 15 Dec 2017 22:30:04 +0000 (22:30 +0000)]
Merge "Fix NPE when press ttsEngines settings icon"
goneil [Tue, 12 Dec 2017 00:25:16 +0000 (16:25 -0800)]
Set EDITED column to USER_EDITED when editing APN
TelephonyProvider switched from defaulting EDITED to USER_EDITED and now
defaults to CARRIER_EDITED in https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/570244.
Therefore, when the user edits the APN, we can no longer rely on the
default implementation
Bug:
67750905
Test: None
Change-Id: I4996b24da94f7c1883c3c802b8edd5e23db580b2
Treehugger Robot [Fri, 15 Dec 2017 10:33:13 +0000 (10:33 +0000)]
Merge "Switch to modern ArgumentMatchers"
Philip P. Moltmann [Thu, 23 Nov 2017 00:07:48 +0000 (16:07 -0800)]
Switch to modern ArgumentMatchers
Test: adb shell am instrument -w -e class com.android.settings.vpn2.PreferenceListTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: Id2e4684f6d3048cfb60fee1f747d0796c157a3da
Treehugger Robot [Wed, 13 Dec 2017 17:16:38 +0000 (17:16 +0000)]
Merge "Handle getActiveAdmins() == null safely."
Treehugger Robot [Wed, 13 Dec 2017 00:30:42 +0000 (00:30 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
Treehugger Robot [Tue, 12 Dec 2017 23:59:23 +0000 (23:59 +0000)]
Merge "Fix screen freeze when changing display size in Multi-Window mode"