Commit Graph

45680 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Bill Yi
9369f59131 [automerger skipped] Import translations. DO NOT MERGE
am: 0b7858e7d9  -s ours

Change-Id: Ia903bff0e22b013664c0086dc11fdd5e3d8d8b50
2018-09-29 16:23:42 -07:00
Bill Yi
0b7858e7d9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6d821fb3a3ccf99fa8f11e165773772ded38b608
2018-09-29 14:09:31 -07:00
Jordan Liu
ff1e05840f Merge "Refresh subscription info when subid changes" into pi-dev
am: c07bb01f75

Change-Id: I955728bbde5ea462ebce0dc2099ccfd965862727
2018-09-28 12:17:49 -07:00
TreeHugger Robot
c07bb01f75 Merge "Refresh subscription info when subid changes" into pi-dev 2018-09-28 19:00:35 +00:00
Fan Zhang
eb43cc70c8 Clean up task affinity.
am: ff3652e0a3

Change-Id: I6727cae2ce9330860ad40104b20e00e8ecf58556
2018-09-26 15:23:11 -07: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
Fan Zhang
ff3652e0a3 Clean up task affinity.
If activity is launched through external intent, back button should just
go back to previous screen.

Change-Id: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Merged-In: I5b2e57d2751f5ed7c17140d3eb8d54736b78053c
Bug: 112254258
Fixes: 111864355
Test: manual
2018-09-26 17:53:05 +00:00
Leon Liao
af7aed6d79 Merge "Rename isConnectable()" am: ec65174f11
am: 09385137e3

Change-Id: Iffe650dd574633cacc6197c6f6f69316b528fb0a
2018-09-26 06:14:55 -07:00
Leon Liao
09385137e3 Merge "Rename isConnectable()"
am: ec65174f11

Change-Id: Ibfc536ba78a118bc33890e52efa6650b21bff62e
2018-09-26 05:59:20 -07:00
Leon Liao
ec65174f11 Merge "Rename isConnectable()" 2018-09-25 23:06:20 +00: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