Commit Graph

40078 Commits

Author SHA1 Message Date
Chen Xu
eb664426c5 Merge "rename emergency tone settings"
am: 2054a4d6d4

Change-Id: I106fc98ae0dab79e5e8bc9b5ec10c3810a440aaa
2018-02-28 02:38:23 +00:00
Chen Xu
2054a4d6d4 Merge "rename emergency tone settings" 2018-02-28 02:17:26 +00:00
fionaxu
192f75c3b2 rename emergency tone settings
Bug: 67470733
Test: Manual
Change-Id: I67e223c2db662f518fa306221190d4646668c4d3
2018-02-27 15:19:29 -08:00
Andreas Gampe
8d0a8ed985 Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
am: ffec1a0c68

Change-Id: Ibac8d021d8d65fdab91f682b9fbfc0231a61a93f
2018-02-26 22:08:50 +00:00
Andreas Gampe
6b24cc5769 Merge changes I67dbf04a,I032f6741
am: 727ec42d8d

Change-Id: I4c8ce0fa68ae3fbf2a3e835d165a766b6e6aad5c
2018-02-26 22:01:25 +00:00
Treehugger Robot
ffec1a0c68 Merge changes I8dcc30b0,I85292ad2,Ie0ab3534
* changes:
  Settings: Disable failing test
  Settings: Disable failing test
  Settings: Fix assertThat in tests
2018-02-26 22:00:19 +00:00
Treehugger Robot
727ec42d8d Merge changes I67dbf04a,I032f6741
* changes:
  Settings: Disable failing assert
  Settings: Fix assertThat in test
2018-02-26 21:36:15 +00:00
Andreas Gampe
8f4716c401 Settings: Disable failing assert
Temporarily disable.

Bug: 73892004
Test: m RunSettingsRoboTests
Change-Id: I67dbf04ae59e54632155c3eda67c70335147fd19
2018-02-26 12:35:13 -08:00
Andreas Gampe
8123135388 Settings: Disable failing test
Disable temporarily.

Bug: 73892683
Test: m RunSettingsRoboTests
Change-Id: I8dcc30b0b090fef1f2fd8fa3c6de7bf69e8b97a9
2018-02-26 12:31:05 -08:00
Andreas Gampe
d20728e4ef Settings: Disable failing test
Disable temporarily.

Bug: 73892555
Test: m RunSettingsRoboTests
Change-Id: I85292ad20de2cb169825eccb19dff1eb82e6fbe1
2018-02-26 12:31:05 -08:00
Andreas Gampe
72eb284ae7 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
2018-02-26 12:26:36 -08:00
Andreas Gampe
025ec2ba58 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
2018-02-26 12:13:00 -08:00
Yoshinori Hirano
942249a2dd Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE"
am: 8378efc6af  -s ours

Change-Id: Ic3274cd389282ac819d41830fa907d7fcf9ddb61
2018-02-24 23:48:50 +00:00
Treehugger Robot
8378efc6af Merge "Add SettingsMultiSelectListPreference style DO NOT MERGE" 2018-02-24 23:28:45 +00:00
Yoshinori Hirano
d3bb6c6459 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
2018-02-24 16:00:05 +00:00
Hansong Zhang
d2040309ca Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports"
am: ad84c9552d  -s ours

Change-Id: Icb23ebb9baaf02ac0f9469e9d4601c67d22ba5ad
2018-02-24 00:19:01 +00:00
Treehugger Robot
ad84c9552d Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" 2018-02-23 23:07:26 +00:00
hansson
aa0812f42b Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible."
am: f5b75dd74d

Change-Id: Ie9aa31d9a2d89a330b682c8602320ad58cbc8ae1
2018-02-23 07:24:45 +00:00
hansson
f5b75dd74d Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible." 2018-02-23 07:15:36 +00:00
Hansong Zhang
4dcc8cfaff 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
2018-02-23 02:12:30 +00:00
Anton Hansson
861554a2d9 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
2018-02-22 16:12:29 +00:00
Fan Zhang
e1c58570d6 Merge "Wifi: Restore hidden flag for hidden networks on update network"
am: 0138575b8d

Change-Id: Ifda4b13017d4fc74f6fabfa5f91b3bda9177fb47
2018-02-21 17:47:12 +00:00
Fan Zhang
0138575b8d Merge "Wifi: Restore hidden flag for hidden networks on update network" 2018-02-21 17:36:06 +00:00
Anurag Das
f44da638bd 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
2018-02-20 06:56:09 +00:00
Hemant Gupta
def626bea0 Merge "OPP: Prevent sending intent while orientation change"
am: f32fa0b5f6

Change-Id: Id576b0cda560d565d86d6369b7552801cac7b0cd
2018-02-13 22:10:34 +00:00
Treehugger Robot
f32fa0b5f6 Merge "OPP: Prevent sending intent while orientation change" 2018-02-13 20:43:24 +00:00
Hemant Gupta
3483fc3638 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
2018-02-13 18:53:34 +00:00
Pavlin Radoslavov
8018f82e5a Merge "Use proper string formatting for the "Active device" string"
am: f5848d0f4d

Change-Id: Ic34959c5ca44ad6d0ac06dfb76b3b07cd4bee819
2018-02-10 09:12:16 +00:00
Treehugger Robot
f5848d0f4d Merge "Use proper string formatting for the "Active device" string" 2018-02-10 02:05:12 +00:00
Pavlin Radoslavov
576d4448a9 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 b58b006e44)
2018-02-09 14:53:14 -08:00
tiansiming [田思明]
0bc6b461be Merge "Fix NPE in AutoSyncWorkDataPreferenceController"
am: cdd628e6e4

Change-Id: Ic10709693acbf3f04704ed76a7474291af509cf5
2018-02-07 22:13:14 +00:00
Treehugger Robot
cdd628e6e4 Merge "Fix NPE in AutoSyncWorkDataPreferenceController" 2018-02-07 22:01:51 +00:00
tiansiming [田思明]
6cdb07862a 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>
2018-02-07 08:58:58 +08:00
Jin Dong
6d55e0633e Merge "Fix memory leak of page "Languages & input""
am: f94ff6ce6f

Change-Id: Ie22f77eff353807e5a24cb6a2317b688f9b70193
2018-02-02 03:55:08 +00:00
Treehugger Robot
f94ff6ce6f Merge "Fix memory leak of page "Languages & input"" 2018-02-01 23:41:43 +00:00
Dmitry Shmidt
f6d960ac31 Merge "Fix dev settings crash when no OEM unlock service"
am: 44cacaa8f1

Change-Id: Ica60f5411908a8edb34b9263ee8d6d6b4617587b
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
d39c52f99e 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
2018-01-30 10:54:00 +00:00
Jin Dong
64ee868ff3 Merge "Fix memory leak of DataSaverPreference"
am: 7a65c7f279

Change-Id: If0cc15cc83afde74a2cd694924fe5af8cf124c8b
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
Pavlin Radoslavov
b1230be1b8 Merge "Updated the Bluetooth Settings owners list"
am: 5a56c31913

Change-Id: I6c3c34d3c074f8d4cd928fb874035350d9f4e33d
2018-01-27 00:00:14 +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
Treehugger Robot
5a56c31913 Merge "Updated the Bluetooth Settings owners list" 2018-01-26 23:01:43 +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
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