Commit Graph

40107 Commits

Author SHA1 Message Date
Nitin Shivpure
606f1d02eb Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak"
am: 2d523f4e99

Change-Id: I792ff3b090d59851c459066dd00d6fdbcb6e3a26
2018-05-16 19:44:41 -07:00
Treehugger Robot
2d523f4e99 Merge "Bluetooth: Fix to avoid BluetoothPan ServiceConnection leak" 2018-05-17 01:28:02 +00:00
Nitin Shivpure
5ba33d1fd3 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
2018-05-16 15:25:36 -07:00
Anton Hansson
cb64305ad3 Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
am: ea74edc9c5

Change-Id: I79d97720c6b4e5f773644d686b06acc9f3e8840d
2018-04-18 05:24:47 -07:00
Anton Hansson
ea74edc9c5 Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module." 2018-04-18 12:02:10 +00:00
Anton Hansson
97acc68065 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
2018-04-13 15:29:49 +01:00
Anton Hansson
47e671e148 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
2018-04-04 15:49:17 +01:00
Kousuke Kitahara
7d906895e8 [automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
am: e8b70d7422  -s ours

Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e
2018-03-28 20:49:50 +00:00
Treehugger Robot
e8b70d7422 Merge "DO NOT MERGE Move IMS registration state to SIM status screen" 2018-03-28 19:51:28 +00:00
Kousuke Kitahara
d42af71001 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
2018-03-28 09:48:53 +00:00
Ajay Panicker
76e5237e92 Merge "Bluetooth: Enable AVDTP Delay reports by default."
am: f8ad32823c  -s ours

Change-Id: If7d482f107e0ce4924748c8b08334cfbbef491e8
2018-03-10 00:08:20 +00:00
Treehugger Robot
f8ad32823c Merge "Bluetooth: Enable AVDTP Delay reports by default." 2018-03-09 20:56:50 +00:00
Brad Ebinger
9b282e231f Merge "Donot disable Wi-Fi Calling when getting "registration error" intent."
am: 4ec0e8e865

Change-Id: I04c42bb5786b37f6d9aa124a663eef6d69b930a2
2018-03-08 19:13:20 +00:00
Brad Ebinger
4ec0e8e865 Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." 2018-03-08 18:32:56 +00:00
Ajay Panicker
e5ed810753 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
2018-03-08 00:00:13 +00:00
Anton Hansson
57dc4a18c2 Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE"
am: 02e3229580  -s ours

Change-Id: I24575750c99fe081f28ea7a5f73307e3bfd8c950
2018-03-07 11:51:48 +00:00
Anton Hansson
02e3229580 Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE" 2018-03-07 11:27:19 +00:00
Alex Cruz
8704b90878 Merge "DO NOT MERGE: Change encryption preference's summary accordingly"
am: ab5a3898f5  -s ours

Change-Id: Ie07848592baa2ee12806a1aa106e75c9f1cd4a92
2018-03-06 20:44:19 +00:00
Treehugger Robot
ab5a3898f5 Merge "DO NOT MERGE: Change encryption preference's summary accordingly" 2018-03-06 18:55:54 +00:00
Alex Cruz
f2fb449430 DO NOT MERGE: Change encryption preference's summary accordingly
With this change a summary to the encryption preference was added.

415ce9a77d

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
2018-03-06 04:21:39 +00:00
Jack He
786fa66b6d Merge "Bluetooth: Use config value for default max connected audio devices"
am: 57f8e717c7  -s ours

Change-Id: I9b6e16237723c8a5903d011d2ee6a948c4f3ed47
2018-03-01 21:40:20 +00:00
Treehugger Robot
57f8e717c7 Merge "Bluetooth: Use config value for default max connected audio devices" 2018-03-01 19:34:20 +00:00
Anton Hansson
b89d96894f 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
2018-03-01 14:34:01 +00:00
Jack He
77ee7ea00d 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
2018-02-28 18:34:52 -08:00
Andreas Gampe
34f43b50ce Merge changes I06df032d,Ib923de28
am: 59a548b940

Change-Id: I4d1314379ba77c07b64c3ca5c77a61f9a54d4c1d
2018-02-28 04:37:06 +00:00
Treehugger Robot
59a548b940 Merge changes I06df032d,Ib923de28
* changes:
  Settings: Disable failing tests.
  Settings: Fix assertThat in tests
2018-02-28 03:34:13 +00:00
Chen Xu
eb664426c5 Merge "rename emergency tone settings"
am: 2054a4d6d4

Change-Id: I106fc98ae0dab79e5e8bc9b5ec10c3810a440aaa
2018-02-28 02:38:23 +00:00
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
Chen Xu
2054a4d6d4 Merge "rename emergency tone settings" 2018-02-28 02:17:26 +00: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
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