Commit Graph

22504 Commits

Author SHA1 Message Date
Stanley Tng
a4fc23140a Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116725094
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit 068c2547f6)
2018-10-13 16:21:15 -07:00
Brad Ebinger
be94f07e8d Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6
am: 59eb9e9d90

Change-Id: Ia0f24f55c529b166cfcd2bba4ca7af85d2e70759
2018-10-12 16:07:09 -07:00
Brad Ebinger
59eb9e9d90 Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am: 61c5a296e6

Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998
2018-10-12 16:03:02 -07:00
Brad Ebinger
61c5a296e6 Merge "RadioInfo: Disable ims provisioning switches in USER-build" 2018-10-12 22:46:21 +00:00
Takamasa Kuramitsu
7cb8223ce2 Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908
am: d77dfa200e

Change-Id: I88e0b556594e5bdadf3c12d0c1fd0483f928261a
2018-10-12 14:14:33 -07:00
Takamasa Kuramitsu
d77dfa200e Merge "Move content later button doesn't work on Migration Wizard"
am: 1308b56908

Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
2018-10-12 14:07:25 -07:00
Treehugger Robot
1308b56908 Merge "Move content later button doesn't work on Migration Wizard" 2018-10-12 20:52:31 +00:00
Rick Yiu
31e062e640 Merge "Add null check for vrManager" into pi-dev
am: c9e2d80ade

Change-Id: Ifb1f2da7e3493e91f26735e7609c4480b1f0f346
2018-10-10 11:07:11 -07:00
TreeHugger Robot
c9e2d80ade Merge "Add null check for vrManager" into pi-dev 2018-10-10 17:46:55 +00:00
Sreekanth Badida
c888e19c87 RadioInfo: Disable ims provisioning switches in USER-build
Disables provisioning switches for Ims-related features in the RadioInfo
dialog when using USER-build. This prevents the user from circumventing
ims provisioning checks.

Bug: 78372174
Test: Manual
Change-Id: If538d7ed56ca53ae6a8be31ddf374d9a15a8fdec
2018-10-10 17:18:06 +02:00
Niklas Lindgren
8fdf33d50a Start using CarrierConfig for 4G/LTE icon
Icon will be updated on sim swap or in case
the default data SIM changes.

Test: Add configs in vendor xml and swap between sim cards.
Tested on both single sim and dual sim.
Bug: 113309356
Change-Id: I1847bcb4e6c1b6dcef7b14bce14f91bd3e4734a5
2018-10-04 09:42:27 +02:00
Chienyuan
4f7895f08b Merge "Don't set value when developer options disabled" am: 692f5368d0
am: 5ef8843845

Change-Id: Idb3c130e31571111911b4e17d989b1199ff7619a
2018-10-03 19:57:57 -07:00
Chienyuan
5ef8843845 Merge "Don't set value when developer options disabled"
am: 692f5368d0

Change-Id: Icddab4eb38cade9d111e39a0e2dfee24198aabc0
2018-10-03 19:48:47 -07:00
Treehugger Robot
692f5368d0 Merge "Don't set value when developer options disabled" 2018-10-04 02:28:42 +00:00
Chienyuan
84f2ee6eff Don't set value when developer options disabled
We shouldn't change property when developer options disabled.
Change A2DP HW offload property without reboot, A2DP will not work.

Bug: 109717129
Test: manual
Change-Id: I96103b04922b28995be198badbed324de40624f0
2018-10-03 21:04:19 +08:00
Neil Fuller
eae7538909 Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" am: a934366a8d
am: 8caeafdf92

Change-Id: I9dcfcf4414837d32a42abc152a49fb4544ddac80
2018-10-03 00:32:10 -07:00
Neil Fuller
8caeafdf92 Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
am: a934366a8d

Change-Id: If44a79fde1e2694dc24d09cbf889771facef751f
2018-10-03 00:26:56 -07:00
Neil Fuller
a934366a8d Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()" 2018-10-03 07:13:37 +00:00
xian
f32a8a955a Fix issue that user can't edit WFC mode for SIM2
User can't edit WFC mode for SIM2 even if KEY_EDITABLE_WFC_MODE_BOOL for
SIM2 is true. Because WifiCallingSettingsForSub uses subId from
PhoneStateListener. But subId of PhoneStateListener is always default
subId. So, it gets wrong carrier config values.

To fix the problem, WifiCallingSettingsForSub uses its subId.

Bug: 117193148
Test: manual - Checked that WFC preference enable/disable state change
according to the current SIM
Change-Id: I6c8f5c1009c118ae9ca9b6e690d18e11600705eb
2018-10-03 04:57:42 +00:00
Takamasa Kuramitsu
a88ed48cb8 Make migrate option menu invisible when src volume is not mounted
When the adopted media storage is ejected, migrate operation from
adopted storage to internal storage always fails.

This CL makes the migrate option menu invisible when the source
volume of migration is not mounted and not accessible.

Bug: 117178027
Test: Settings robotests & manual
Change-Id: I8bfc9de552a8daf861315a5e46ee520ede14dd81
2018-10-03 10:16:54 +09:00
Stanley Tng
7b91f0dd3e Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Bug: 116725094
Bug: 117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.

Change-Id: I5c9af9ec6a2a17668597a537fd1f7b70368b7ed8
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-02 15:10:43 -07:00
TreeHugger Robot
31703ca227 Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev 2018-10-02 20:30:17 +00:00
Hansong Zhang
78ab907aa6 Fix build
Test: compile
Change-Id: I3d236ea1b1f5ee5b4b5b2aa118416383b5b4bb6d
2018-10-02 16:30:39 +00:00
Neil Fuller
ccef9d9dc2 Merge "Use ICU APIs not impl types" am: 811d817368
am: 09dcb87982

Change-Id: Ic2f3ab527774f4d2d4464e8d879cdd4408afcb44
2018-10-02 06:24:33 -07:00
Neil Fuller
09dcb87982 Merge "Use ICU APIs not impl types"
am: 811d817368

Change-Id: I38d6806255619fec3de23945a184455072f34ec0
2018-10-02 06:16:23 -07:00
Neil Fuller
28fe954075 Avoid deprecated PrivateKeyInfo.getAlgorithmId()
Switch from using the PrivateKeyInfo.getAlgorithmId() method to
using the functionally identical PrivateKeyInfo.getPrivateKeyAlgorithm()
method instead.

Bug: 113148576
Test: build only / inspection
Merged-In: Iab2d3b23ad969f683d716cb981e32fd554c67a81
Change-Id: I9ed5c96a20d6749bf75212c0fd820d71ca0a6053
2018-10-02 12:29:06 +00:00
Stanley Tng
8b05337e6a Merge changes from topic "hearing-aid" into pi-dev
am: f9658e13bb

Change-Id: Ibdf40cc0a1712292fd41c1e38bbf879cfe3c4a65
2018-10-02 03:54:35 -07:00
timhypeng
6443247f8f To show hearing aids device in the available devices group
am: 79d7fdc4f3

Change-Id: Ie4e4014c98701d69e20f0f9244e57b5293e07f15
2018-10-02 03:53:36 -07:00
Neil Fuller
11be3acfe0 Use ICU APIs not impl types
It's possible to use BasicTimeZone in place of OlsonTimeZone.
Although neither are currently public SDK APIs the BasicTimeZone
is preferable.

Bug: 113148576
Test: build
Change-Id: I745b17feee678ecd053fadc6c447107fa80918e8
2018-10-02 10:15:36 +01:00
Stanley Tng
69e1bb1cf3 Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.

Bug: 116725094
Bug: 117074814
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.

Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-02 00:55:19 +00:00
TreeHugger Robot
f9658e13bb Merge changes from topic "hearing-aid" into pi-dev
* changes:
  Add Feature Flag for Hearing Aid Profile
  To show hearing aids device in the available devices group
2018-10-02 00:53:40 +00:00
Takamasa Kuramitsu
9019343728 Move content later button doesn't work on Migration Wizard
"Move content later" button doesn't work on StorageWizardMigrateConfirm
screen which is shown when end-user try to migrate data from adopted
SD Card to internal storage.

The cause is "Move content later" button triggers to StorageWizardReady
screen but cannot launch because the mDisk is null when the destination
of migration is internal storage.

This CL fixes to just exit StorageWizardMigrateConfirm screen when mDisk
is null.

Bug: 117082495
Test: manual
Change-Id: Iccdccf4dda126d77458b9db35e4ec6ae6a263cb7
2018-10-01 13:57:47 +00:00
Stanley Tng
020b0b0476 Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.

Bug: 116725094
Bug: 116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit 068c2547f6)
2018-09-26 14:12:29 -07:00
timhypeng
79d7fdc4f3 To show hearing aids device in the available devices group
Bug: 116725094
Bug: 116044083
Bug: 79553082
Test: make -j50 RunSettingsRoboTests
Change-Id: I8fe5eb653d332ef5ac4a566146f150774581167c
Merged-In: I8fe5eb653d332ef5ac4a566146f150774581167c
(cherry picked from commit 1c21bff103)
2018-09-26 14:12:00 -07:00
Youming Ye
d976002dea Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" am: b7e3552b83
am: 31576aae7c

Change-Id: Ib37954bccacb44b670ee6c1af6e7188fdd91a46a
2018-09-25 10:27:22 -07:00
Youming Ye
31576aae7c Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am: b7e3552b83

Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1
2018-09-25 10:20:06 -07:00
Youming Ye
b7e3552b83 Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device" 2018-09-25 17:04:10 +00:00
Torbjorn Eklund
bfe80e39f2 Merge "ApnEditor: Consider subId when reading carrier config" am: f6f7079709
am: db353e2c4a

Change-Id: Ie2ad2655b5fc399610acdcfd8327e99c60b7e2a8
2018-09-24 10:57:37 -07:00
Torbjorn Eklund
db353e2c4a Merge "ApnEditor: Consider subId when reading carrier config"
am: f6f7079709

Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f
2018-09-24 10:48:00 -07:00
Treehugger Robot
f6f7079709 Merge "ApnEditor: Consider subId when reading carrier config" 2018-09-24 17:24:03 +00:00
Rick Yiu
0732628bf7 Add null check for vrManager
If VrManagerService is not started, vrManager will be null. Need
add check for it.

Test: robotests
Bug: 116427118
Change-Id: I899337bb5a996efffe82970fa690f2c5d59c1bb5
Merged-In: I899337bb5a996efffe82970fa690f2c5d59c1bb5
2018-09-24 04:45:59 +00:00
Lei Yu
6ef05a6c23 Merge "Fix incorrect API invoke for BT profiles" am: 625c1eeaa9
am: dbc26b576c

Change-Id: Ic6b7a4b7541310b3a635b94a799e3476cf5cc684
2018-09-21 13:20:16 -07:00
Lei Yu
dbc26b576c Merge "Fix incorrect API invoke for BT profiles"
am: 625c1eeaa9

Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f
2018-09-21 13:13:39 -07:00
jackqdyulei
c7a83b2552 Fix incorrect API invoke for BT profiles
When hearing aid device has been set active, we shouldn't invoke
1. a2dpProfile.setActiveDevice()
2. hfpProfile.setActiveDevice()

Change-Id: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Merged-In: Ie13dea041dd98d0cb9d913e1f28574b300095db9
Fixes: 113625278
Test: RunSettingsRoboTests
2018-09-20 12:38:26 -07:00
Torbjorn Eklund
ae8e62f4d0 ApnEditor: Consider subId when reading carrier config
Considers subId when reading carrier config values
KEY_READ_ONLY_APN_TYPES_STRING_ARRAY and
KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY.

This ensures that the APN will be editable or non-editable correctly
when using dual sim.

Bug: 112929355
Test: Manual
Change-Id: I2186dd5e1f71ca5361309a7314f84cf4fa2d3937
2018-09-20 13:12:54 +00:00
Sandeep Gutta
fe6ddaec99 Fix error message shown when SIM PIN enable/disable fails
Current code fails to pass the 3GPP spec test case 27.14.3
'Disabling the PIN'.

An Incorrect toast error message is displayed, when enable/disable
SIM PIN operation fails without checking the error code.

Fix: Display appropriate toast error message based on the SIM PIN
enable/disable error code.

Bug: 73080305
Change-Id: I4219c68c7ebcf450a2f779b2d1f1ce881440753b
2018-09-18 12:21:51 +05:30
Fan Zhang
88cbe51f27 Merge "Clean up: delete unused methods" am: 41f9566da8
am: b371dea0cb

Change-Id: I0545f7f9914337d64d8d91eb152005e4858b6869
2018-09-12 17:39:21 -07:00
Fan Zhang
b371dea0cb Merge "Clean up: delete unused methods"
am: 41f9566da8

Change-Id: I973b289c688c04c00f70a6c0ba15a5b205d6633a
2018-09-12 17:12:54 -07:00
Fan Zhang
41f9566da8 Merge "Clean up: delete unused methods" 2018-09-12 23:46:31 +00:00
Fan Zhang
409a5f8c98 Clean up: delete unused methods
Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705
2018-09-12 13:08:15 -07:00