Commit Graph

46243 Commits

Author SHA1 Message Date
Stanley Tng
0cc7d9a2af resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
2018-10-16 15:31:00 +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
jackqdyulei
820e22d324 Add entitlement check for usb tethering
Before this CL, usb tethering in detail page doesn't have entitlement
check. This CL fix it by using the correct API

Also polish it by updating the UI before entitlement check to align
hotspot page. So in UI it will first check "usb tethering". If
entitlement check fail, it will revoke and go back to previous selection.

Bug: 115707279
Test: RunSettingsRoboTests
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
Change-Id: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-15 16:58:21 -07:00
Bill Yi
dce00f9ae2 [automerger skipped] Import translations. DO NOT MERGE
am: 2a1a5cba81  -s ours

Change-Id: I79a8495fa76bbcb9dcee9e66a48ff4c3875f454d
2018-10-15 16:27:31 -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
Bill Yi
2a1a5cba81 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
2018-10-15 12:34:57 -07:00
Youming Ye
6293483fce Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
am: 8bac59265e

Change-Id: If28ef5f32183918404896ed395a49c9c2d87067a
2018-10-15 10:59:04 -07: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
31398ce165 [automerger skipped] Import translations. DO NOT MERGE
am: ebb0bbe3f7  -s ours

Change-Id: I0b288ed9e17d6598d7b20cc724ea88a42309d984
2018-10-15 03:42:41 -07: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
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
android-build-team Robot
c9356aef01 Snap for 5066295 from c9e2d80ade to pi-qpr2-release
Change-Id: Idfcf53aec8c884fbbb624e6f2c72338748c1669b
2018-10-12 22:46:06 +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
Neil Fuller
92982f7167 Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3
am: 6767ce9d24

Change-Id: Ia431a5b7ca139209425825616f698f69bfb781c5
2018-10-12 03:36:17 -07: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
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
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
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
TreeHugger Robot
ce939610ba Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev-plus-aosp 2018-10-03 00:04:45 +00:00
Stanley Tng
0eb58d6f55 [automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev
am: 31703ca227  -s ours

Change-Id: Icaa20e177b9037291b4c9fc03466b692618e95e8
2018-10-02 16:46:58 -07: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
android-build-team Robot
291655b4f2 Snap for 5044688 from 31703ca227 to pi-qpr2-release
Change-Id: I64f8414f3c25bb9ab23d2c6ee0c8e3e2f7847886
2018-10-02 22:03:28 +00: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
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
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