Commit Graph

40043 Commits

Author SHA1 Message Date
Andreas Gampe
20146916e2 Settings: Disable failing tests.
Temporarily disable.

(cherry picked from commit b506fb9b19)

Bug: 73892008
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval: Cherrypick
Merged-In: I06df032d4a4de84c2f9f46e5086d97f688b0c989
Change-Id: I06df032d4a4de84c2f9f46e5086d97f688b0c989
2018-02-27 18:19:10 -08:00
Andreas Gampe
d70c4a0036 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 22bad556a1)

Bug: 73513670
Test: m RunSettingsRoboTests
Test: m javac-check RUN_ERROR_PRONE=true
Exempt-From-Owner-Approval: Cherrypick
Merged-In: Ib923de28ce5dcf79b9dec718306877e31e58e024
Change-Id: Ib923de28ce5dcf79b9dec718306877e31e58e024
2018-02-27 18:15:53 -08: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
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
Treehugger Robot
ad84c9552d Merge "Add developer menu entry to enable Bluetooth AVDTP delay reports" 2018-02-23 23:07:26 +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
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
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
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
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
Treehugger Robot
f94ff6ce6f Merge "Fix memory leak of page "Languages & input"" 2018-02-01 23:41:43 +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
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
Treehugger Robot
5a56c31913 Merge "Updated the Bluetooth Settings owners list" 2018-01-26 23:01:43 +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
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
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
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
Treehugger Robot
d7682e6d3c Merge "DO NOT MERGE: Keep access point list updated once in short time" 2018-01-18 02:48:31 +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
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
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
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
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
Treehugger Robot
80c0656ca6 Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable"" 2018-01-05 20:41:01 +00:00