Commit Graph

46029 Commits

Author SHA1 Message Date
Bill Yi
89e733ee2c Merge pi-dr1-dev to aosp-master
am: c1fe9e6ac2

Change-Id: I6a6eafb34b31bc343dfe4117f17ccba771a7f111
2018-10-19 15:00:40 -07: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
Bill Yi
f896493c70 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
2018-10-17 04:32:19 +00:00
android-build-team Robot
63fc0e97d4 Snap for 5073521 from 2a1a5cba81 to pi-qpr2-release
Change-Id: I7676645f9b82d782fda8fb59cdb3ab2e032576a5
2018-10-17 03:15:05 +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
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
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
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
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
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
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
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
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
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
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
0b7858e7d9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I6d821fb3a3ccf99fa8f11e165773772ded38b608
2018-09-29 14:09:31 -07:00
TreeHugger Robot
c07bb01f75 Merge "Refresh subscription info when subid changes" into pi-dev 2018-09-28 19:00:35 +00:00
Yanjia Li
910457e37a Add LOCAL_RESOURCE_DIR in Settings makefile
Include local Settings resources in build - a result of adding
SettingsLib without defining a LOCAL_RESOURCE_DIR. See comment in:

 frameworks/base/packages/SettingsLib/common.mk

Bug: 116821732
Test: build & manual
Change-Id: I98712af7c568a70ee5c4bcc7bb1c19de4f30ff05
2018-09-28 15:03:37 +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
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