Commit Graph

45800 Commits

Author SHA1 Message Date
Wenting Xiong
82aa55bcda Fix issue that the wifi calling text cannot be customized based on sim
Some carriers have requirements that the wifi calling text should be
customizable. However, the resources for the wifi calling text are
not obtained based on sim. So it cannot be customized per sim for multi
sim device. To solve this issue, obtain the resources with specified
sim.

Test: manual - Checked that the wifi calling text could be customized
based on sim.
Bug: 117257109

Change-Id: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
Merged-In: I6b3f6b06c9cc984ee6a68a19ae317b5d1d4e48e2
2019-02-22 01:57:44 +00:00
Neil Fuller
3ddcb6a90a Merge "Track move of timezone classes to libcore.timezone" 2018-11-26 23:04:33 +00:00
Youming Ye
a995cb334b Merge "Display a toast to notify user that Preset APN setting cannot be viewed" 2018-11-26 21:14:14 +00:00
Neil Fuller
17f04b66b2 Track move of timezone classes to libcore.timezone
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Merged-In: I920411dfa7e000a0da9678826a035e0461211619
Change-Id: I920411dfa7e000a0da9678826a035e0461211619
(cherry picked from commit 1e1961a5b3)
2018-11-22 10:05:12 +00:00
taiki tsutsumi
4d044ced6d Display a toast to notify user that Preset APN setting cannot be viewed
When KEY_HIDE_PRESET_APN_DETAILS_BOOL is set to true, Preset APN setting
is hidden. When user taps Preset APN, a toast should be shown to inform
that user cannot view the APN.

Test: manual - check Preset APN setting details are hidden
Bug: 115453290
Depends-On: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b
Change-Id: I0078b3492ae87a4297f24871b8bea1579e6a79af
2018-11-21 15:40:58 -08:00
Treehugger Robot
45f8352422 Merge "Remove ShadowLibcoreTimeZoneNames" 2018-11-21 15:17:51 +00:00
Maurice Lam
3cf13adf9b Remove ShadowLibcoreTimeZoneNames
Bug: 119829838
Test: Treehugger

(cherry picked from commit cc2cf5ba5a)

Change-Id: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
Merged-In: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
2018-11-21 11:07:11 +00:00
Treehugger Robot
8f516adef7 Merge "Allow StubVolume to be browseable in Settings" 2018-11-13 19:20:38 +00:00
Neil Fuller
6bb4b5ca43 Merge "Remove the feature flag and dead code for the old time zone picker" 2018-11-13 09:33:16 +00:00
Victor Chang
fe627a5901 Remove the feature flag and dead code for the old time zone picker
This commit backports commit 6be6c58206
to aosp/master.

Bug: 72376227
Test: build only
Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
(cherry picked from commit 6be6c58206)
2018-11-13 07:49:32 +00:00
Youming Ye
e871464053 Merge "Fix issue that read-only apns can be edited" 2018-11-09 01:00:35 +00:00
Risan
9deece9086 Allow StubVolume to be browseable in Settings
Test: Unit test + manual test: Mount and unmount stubvolume in ARC++,
check settings show the device correctly and could browse it using
DocumentsUI.
Bug: 110380403

Change-Id: I96fc82e731225776ac7070ef035687f83da94245
2018-11-08 21:47:22 +00:00
Clown SHEN
bd57f94a4c Merge "Launch WfcActivation with subscription ID" 2018-11-07 07:09:27 +00:00
Yuming Mao
8d1eee08f7 Fix issue that read-only apns can be edited
When entering to ApnEditor with ApnSettings#onPreferenceTreeClick(),
subId is not passed.
So invalid subId is used and it gets wrong carrier config values.

To resolve this issue, remove unnecessary ApnSettings click event.
The only click event for launching ApnEditor is ApnPreference click
event.

Test: manual - Check that the read-only APN can't be edited when tap
the edge of the APN settings screen
Bug: 117302653
Change-Id: I0a61b409539d6e4f6aa9860235e61c43c76640fa
2018-11-02 19:56:11 +09:00
clownshen
95f8c6e96a Launch WfcActivation with subscription ID
For multi SIM project, need to have subscription ID information in the
intent for launching WFC activation activity.

Bug: 112826472
Test: manual test
Change-Id: I9f470c014054efa612c87ff16e574fc9fd286b3d
2018-10-31 13:28:09 +08:00
Bill Yi
8b16aba0dd Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78
2018-10-24 14:47:27 -07:00
Fan Zhang
d5abc0eb44 Merge "Fix toast is covered by PIN code screen after wrong pin" 2018-10-24 02:16:57 +00:00
Hao Zhao
754930bc50 Fix toast is covered by PIN code screen after wrong pin
The error toast is displayed when user input wrong PIN
code three times, but at that moment the SIM PUK code input
page in SystemUI pop up and covers the toast, so the user
can't seen the error message.

Adjust the toast window layer, let the the toast pop up
over the SIM pin code input page.

Bug: 74056527
Change-Id: I569a2fc2adac15c4713b4c95e9720335bd4df88a
2018-10-24 06:39:45 +09:00
Bill Yi
c1fe9e6ac2 Merge pi-dr1-dev to aosp-master
Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c
2018-10-19 12:20:48 -07:00
Hall Liu
e419904aa0 Merge "Start using CarrierConfig for 4G/LTE icon"
am: 558535f3f2

Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
2018-10-18 14:56:56 -07:00
Hall Liu
558535f3f2 Merge "Start using CarrierConfig for 4G/LTE icon" 2018-10-18 20:36:06 +00:00
Stanley Tng
81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-17 18:14:27 +00:00
Treehugger Robot
b0e99e1472 Merge "Fix Connect State message in Device details for Hearing Aids" 2018-10-17 04:48:36 +00:00
Stanley Tng
a8af2d3664 resolve merge conflicts of 019a771d2d to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
Treehugger Robot
019a771d2d Merge "Add Feature Flag for Hearing Aid Profile" 2018-10-15 23:10:41 +00:00
Stanley Tng
a6c927b51a 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.

Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug: 117074814
Bug: 116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
2018-10-15 22:51:02 +00:00
Youming Ye
8bac59265e Merge "Fix error message shown when SIM PIN enable/disable fails"
am: f29392303a

Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414
2018-10-15 10:42:52 -07:00
Youming Ye
f29392303a Merge "Fix error message shown when SIM PIN enable/disable fails" 2018-10-15 17:08:22 +00:00
Bill Yi
ebb0bbe3f7 Import translations. DO NOT MERGE
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
2018-10-15 01:55:17 -07:00
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
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
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
Neil Fuller
6767ce9d24 Merge "Remove explicit dependency on bouncycastle"
am: ed21203ea3

Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450
2018-10-12 03:31:10 -07:00
Neil Fuller
ed21203ea3 Merge "Remove explicit dependency on bouncycastle" 2018-10-12 10:18:22 +00:00
Neil Fuller
d0821ca8c7 Remove explicit dependency on bouncycastle
The dependency is unnecessary once bouncycastle
is included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a
2018-10-11 17:02:36 +01:00
Bill Rassieur
a3d106204d Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
Change-Id: Ib38d3cdccddfe001600aeccf593b59c0e79505e9
BUG: 117431430
2018-10-10 17:25:59 +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
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
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
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
811d817368 Merge "Use ICU APIs not impl types" 2018-10-02 12:59:47 +00: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
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
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