OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoUpdate color-check-baseline.xml
Lei Yu [Fri, 21 Dec 2018 22:12:26 +0000 (14:12 -0800)]
Update color-check-baseline.xml

Since these colors are already fixed in internal master(ag/4164571).
This CL only update the baseline and won't merge down.

Change-Id: I19dbca351fb786b9dbbb84bf7f50ccc0347bd0cf
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 110960820
Test: repohook

5 years agoMerge "Moved data settings to phone"
Jack Yu [Fri, 21 Dec 2018 02:29:43 +0000 (02:29 +0000)]
Merge "Moved data settings to phone"

5 years agoMerge "Rename SIM_APN_LIST to SIM_APN_URI"
Calvin Pan [Fri, 21 Dec 2018 01:31:44 +0000 (01:31 +0000)]
Merge "Rename SIM_APN_LIST to SIM_APN_URI"

5 years agoMoved data settings to phone
Jack Yu [Thu, 13 Dec 2018 19:51:20 +0000 (11:51 -0800)]
Moved data settings to phone

Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.

Test: Telephony sanity tests + unit tests
Bug: 73659459
Merged-In: If11a6eff057a18b4aa97addbb348537bd3194e1a
Change-Id: If11a6eff057a18b4aa97addbb348537bd3194e1a
(cherry picked from commit 50972ed89e9871d73ee8722bcde458170084ba08)

5 years agoMerge "Remove unused system properties"
Treehugger Robot [Thu, 20 Dec 2018 09:24:39 +0000 (09:24 +0000)]
Merge "Remove unused system properties"

5 years agoRename SIM_APN_LIST to SIM_APN_URI
calvinpan [Thu, 20 Dec 2018 03:35:17 +0000 (11:35 +0800)]
Rename SIM_APN_LIST to SIM_APN_URI

In Telephony SIM_APN_LIST had been rename to SIM_APN_URI.

Bug: 120031619
Test: Build pass.
Change-Id: I203c765c7ba6ee468f76dbfdb84b50c787ac8dbe

5 years agoRemove unused system properties
Inseob Kim [Wed, 19 Dec 2018 03:05:22 +0000 (12:05 +0900)]
Remove unused system properties

Properties ro.config.license_path and ro.config.manual_path are not set
from anywhere but only from a test.

Bug: N/A
Test: mma -j
Change-Id: I651405f3a201f5129bf37059e96e7bcc5efa73bf
Merged-In: I651405f3a201f5129bf37059e96e7bcc5efa73bf

5 years agoMerge "Refine APN fetching logic"
Treehugger Robot [Mon, 17 Dec 2018 08:03:04 +0000 (08:03 +0000)]
Merge "Refine APN fetching logic"

5 years agoRefine APN fetching logic
Josh Hou [Fri, 23 Nov 2018 01:57:20 +0000 (09:57 +0800)]
Refine APN fetching logic

APN fetching logic has been encapsulated in URL_SIM_APN_LIST API in
TelephonyProvider

Bug: 115709816
Test: Live network test
Change-Id: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
Merged-In: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b

5 years agoMerge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
Treehugger Robot [Thu, 13 Dec 2018 05:45:20 +0000 (05:45 +0000)]
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"

5 years agoDO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Xin Li [Tue, 11 Dec 2018 22:19:45 +0000 (14:19 -0800)]
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master

Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1

5 years agoMerge "Revert "Revert "Schematize vold system properties"""
Treehugger Robot [Tue, 11 Dec 2018 11:04:01 +0000 (11:04 +0000)]
Merge "Revert "Revert "Schematize vold system properties"""

5 years agoRevert "Revert "Schematize vold system properties""
Inseob Kim [Mon, 10 Dec 2018 07:05:20 +0000 (07:05 +0000)]
Revert "Revert "Schematize vold system properties""

This reverts commit 49e81e0eeac13b1edcd4c8f51c48dafae6336d11.

Reason for revert: Fixed breakage

Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54

5 years agoMerge "Revert "Schematize vold system properties""
Anthony Stange [Fri, 7 Dec 2018 12:04:56 +0000 (12:04 +0000)]
Merge "Revert "Schematize vold system properties""

5 years agoRevert "Schematize vold system properties"
Anthony Stange [Fri, 7 Dec 2018 11:44:10 +0000 (11:44 +0000)]
Revert "Schematize vold system properties"

This reverts commit e6baedd917e041576c04687cf20d8d56dd2980fc.

Reason for revert: Breaking aosp_master build

Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b

5 years agoMerge "Schematize vold system properties"
Treehugger Robot [Fri, 7 Dec 2018 01:46:45 +0000 (01:46 +0000)]
Merge "Schematize vold system properties"

5 years agoMerge "address API council feedbacks for Telephony.Carriers"
Chen Xu [Thu, 6 Dec 2018 21:45:47 +0000 (21:45 +0000)]
Merge "address API council feedbacks for Telephony.Carriers"

5 years agoMerge "Make migrate option menu invisible when src volume is not mounted"
Fan Zhang [Tue, 4 Dec 2018 17:33:33 +0000 (17:33 +0000)]
Merge "Make migrate option menu invisible when src volume is not mounted"

5 years agoaddress API council feedbacks for Telephony.Carriers
chen xu [Wed, 28 Nov 2018 08:22:42 +0000 (00:22 -0800)]
address API council feedbacks for Telephony.Carriers

Bug: 118296421
Test: telephony unit test
Change-Id: Idf8bcad4fe9d765a73563e9b0c1c659175835447
Merged-in: Idf8bcad4fe9d765a73563e9b0c1c659175835447

5 years agoMerge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Bill Yi [Thu, 29 Nov 2018 02:34:54 +0000 (18:34 -0800)]
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: I120adda515fd4891b6b9b68e93cef5555951bacc

5 years agoMerge "Track move of timezone classes to libcore.timezone"
Neil Fuller [Mon, 26 Nov 2018 23:04:33 +0000 (23:04 +0000)]
Merge "Track move of timezone classes to libcore.timezone"

5 years agoMerge "Display a toast to notify user that Preset APN setting cannot be viewed"
Youming Ye [Mon, 26 Nov 2018 21:14:14 +0000 (21:14 +0000)]
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"

5 years agoTrack move of timezone classes to libcore.timezone
Neil Fuller [Fri, 16 Nov 2018 21:23:33 +0000 (21:23 +0000)]
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 1e1961a5b30dd93560bff2301b95e6a99a603cba)

5 years agoDisplay a toast to notify user that Preset APN setting cannot be viewed
taiki tsutsumi [Fri, 29 Jun 2018 05:21:39 +0000 (14:21 +0900)]
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

5 years agoMerge "Remove ShadowLibcoreTimeZoneNames"
Treehugger Robot [Wed, 21 Nov 2018 15:17:51 +0000 (15:17 +0000)]
Merge "Remove ShadowLibcoreTimeZoneNames"

5 years agoRemove ShadowLibcoreTimeZoneNames
Maurice Lam [Tue, 20 Nov 2018 23:01:22 +0000 (15:01 -0800)]
Remove ShadowLibcoreTimeZoneNames

Bug: 119829838
Test: Treehugger

(cherry picked from commit cc2cf5ba5a8ffa1eb95b71534f256046e429f9ea)

Change-Id: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
Merged-In: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c

5 years agoSchematize vold system properties
Inseob Kim [Thu, 8 Nov 2018 03:44:47 +0000 (12:44 +0900)]
Schematize vold system properties

Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: Id2a696c621015d46015d5de0e7aef987e9e01b54
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54

5 years agoMerge "Allow StubVolume to be browseable in Settings"
Treehugger Robot [Tue, 13 Nov 2018 19:20:38 +0000 (19:20 +0000)]
Merge "Allow StubVolume to be browseable in Settings"

5 years agoMerge "Remove the feature flag and dead code for the old time zone picker"
Neil Fuller [Tue, 13 Nov 2018 09:33:16 +0000 (09:33 +0000)]
Merge "Remove the feature flag and dead code for the old time zone picker"

5 years agoRemove the feature flag and dead code for the old time zone picker
Victor Chang [Thu, 29 Mar 2018 17:52:09 +0000 (18:52 +0100)]
Remove the feature flag and dead code for the old time zone picker

This commit backports commit 6be6c5820639c1f7ed60dd2a03dab80cbb1b5afb
to aosp/master.

Bug: 72376227
Test: build only
Merged-In: I332077a67cc9f9c83b298e25feea71463e1ee98b
Change-Id: I332077a67cc9f9c83b298e25feea71463e1ee98b
(cherry picked from commit 6be6c5820639c1f7ed60dd2a03dab80cbb1b5afb)

5 years agoMerge "Fix issue that read-only apns can be edited"
Youming Ye [Fri, 9 Nov 2018 01:00:35 +0000 (01:00 +0000)]
Merge "Fix issue that read-only apns can be edited"

5 years agoAllow StubVolume to be browseable in Settings
Risan [Sun, 28 Oct 2018 23:59:06 +0000 (08:59 +0900)]
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

5 years agoMerge "Launch WfcActivation with subscription ID"
Clown SHEN [Wed, 7 Nov 2018 07:09:27 +0000 (07:09 +0000)]
Merge "Launch WfcActivation with subscription ID"

5 years agoFix issue that read-only apns can be edited
Yuming Mao [Wed, 15 Aug 2018 07:10:23 +0000 (15:10 +0800)]
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

5 years agoLaunch WfcActivation with subscription ID
clownshen [Wed, 31 Oct 2018 05:28:09 +0000 (13:28 +0800)]
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

5 years agoMerge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 21:47:27 +0000 (14:47 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: Id291dd4e424711a8cb39927b9733214b92b81d78

5 years agoMerge "Fix toast is covered by PIN code screen after wrong pin"
Fan Zhang [Wed, 24 Oct 2018 02:16:57 +0000 (02:16 +0000)]
Merge "Fix toast is covered by PIN code screen after wrong pin"

5 years agoFix toast is covered by PIN code screen after wrong pin
Hao Zhao [Tue, 8 Aug 2017 07:21:49 +0000 (15:21 +0800)]
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

5 years agoMerge pi-dr1-dev to aosp-master
Bill Yi [Fri, 19 Oct 2018 19:20:48 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master

Change-Id: I0cf933755a46ad6071cb085120a4b1b1c5d1976c

5 years agoMerge "Start using CarrierConfig for 4G/LTE icon"
Hall Liu [Thu, 18 Oct 2018 21:56:56 +0000 (14:56 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon"
am: 558535f3f2

Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f

5 years agoMerge "Start using CarrierConfig for 4G/LTE icon"
Hall Liu [Thu, 18 Oct 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Start using CarrierConfig for 4G/LTE icon"

5 years agoresolve merge conflicts of b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp...
Stanley Tng [Wed, 17 Oct 2018 18:07:29 +0000 (11:07 -0700)]
resolve merge conflicts of b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953

5 years agoMerge "Fix Connect State message in Device details for Hearing Aids"
Treehugger Robot [Wed, 17 Oct 2018 04:48:36 +0000 (04:48 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids"

5 years agoresolve merge conflicts of 019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp...
Stanley Tng [Tue, 16 Oct 2018 00:30:02 +0000 (17:30 -0700)]
resolve merge conflicts of 019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None

Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358

5 years agoMerge "Add Feature Flag for Hearing Aid Profile"
Treehugger Robot [Mon, 15 Oct 2018 23:10:41 +0000 (23:10 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"

5 years agoFix Connect State message in Device details for Hearing Aids
Stanley Tng [Mon, 1 Oct 2018 05:47:22 +0000 (22:47 -0700)]
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

5 years agoMerge "Fix error message shown when SIM PIN enable/disable fails"
Youming Ye [Mon, 15 Oct 2018 17:42:52 +0000 (10:42 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
am: f29392303a

Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414

5 years agoMerge "Fix error message shown when SIM PIN enable/disable fails"
Youming Ye [Mon, 15 Oct 2018 17:08:22 +0000 (17:08 +0000)]
Merge "Fix error message shown when SIM PIN enable/disable fails"

5 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 15 Oct 2018 08:55:17 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import

5 years agoAdd Feature Flag for Hearing Aid Profile
Stanley Tng [Wed, 20 Jun 2018 22:32:02 +0000 (15:32 -0700)]
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 068c2547f6f877273b09bf3ace5b4a4b61c7647a)

5 years agoMerge "RadioInfo: Disable ims provisioning switches in USER-build"
Brad Ebinger [Fri, 12 Oct 2018 23:03:02 +0000 (16:03 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am: 61c5a296e6

Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998

5 years agoMerge "RadioInfo: Disable ims provisioning switches in USER-build"
Brad Ebinger [Fri, 12 Oct 2018 22:46:21 +0000 (22:46 +0000)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"

5 years agoMerge "Move content later button doesn't work on Migration Wizard"
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:07:25 +0000 (14:07 -0700)]
Merge "Move content later button doesn't work on Migration Wizard"
am: 1308b56908

Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9

5 years agoMerge "Move content later button doesn't work on Migration Wizard"
Treehugger Robot [Fri, 12 Oct 2018 20:52:31 +0000 (20:52 +0000)]
Merge "Move content later button doesn't work on Migration Wizard"

5 years agoMerge "Remove explicit dependency on bouncycastle"
Neil Fuller [Fri, 12 Oct 2018 10:31:10 +0000 (03:31 -0700)]
Merge "Remove explicit dependency on bouncycastle"
am: ed21203ea3

Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450

5 years agoMerge "Remove explicit dependency on bouncycastle"
Neil Fuller [Fri, 12 Oct 2018 10:18:22 +0000 (10:18 +0000)]
Merge "Remove explicit dependency on bouncycastle"

5 years agoRemove explicit dependency on bouncycastle
Neil Fuller [Tue, 2 Oct 2018 20:37:30 +0000 (21:37 +0100)]
Remove explicit dependency on bouncycastle

The dependency is unnecessary once bouncycastle
is included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a

5 years agoMerge PPR2.181005.003 from pi-release-2 into pi-platform-release.
Bill Rassieur [Wed, 10 Oct 2018 17:25:59 +0000 (17:25 +0000)]
Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.

Change-Id: Ib38d3cdccddfe001600aeccf593b59c0e79505e9
BUG: 117431430

5 years agoRadioInfo: Disable ims provisioning switches in USER-build
Sreekanth Badida [Mon, 5 Feb 2018 16:18:40 +0000 (17:18 +0100)]
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

5 years agoStart using CarrierConfig for 4G/LTE icon
Niklas Lindgren [Fri, 21 Sep 2018 12:23:07 +0000 (14:23 +0200)]
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

5 years agoMerge "Don't set value when developer options disabled"
Chienyuan [Thu, 4 Oct 2018 02:48:47 +0000 (19:48 -0700)]
Merge "Don't set value when developer options disabled"
am: 692f5368d0

Change-Id: Icddab4eb38cade9d111e39a0e2dfee24198aabc0

5 years agoMerge "Don't set value when developer options disabled"
Treehugger Robot [Thu, 4 Oct 2018 02:28:42 +0000 (02:28 +0000)]
Merge "Don't set value when developer options disabled"

5 years agoDon't set value when developer options disabled
Chienyuan [Wed, 3 Oct 2018 13:04:19 +0000 (21:04 +0800)]
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

5 years agoMerge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
Neil Fuller [Wed, 3 Oct 2018 07:26:56 +0000 (00:26 -0700)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
am: a934366a8d

Change-Id: If44a79fde1e2694dc24d09cbf889771facef751f

5 years agoMerge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"
Neil Fuller [Wed, 3 Oct 2018 07:13:37 +0000 (07:13 +0000)]
Merge "Avoid deprecated PrivateKeyInfo.getAlgorithmId()"

5 years agoMake migrate option menu invisible when src volume is not mounted
Takamasa Kuramitsu [Tue, 2 Oct 2018 08:12:06 +0000 (17:12 +0900)]
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

5 years agoMerge "Use ICU APIs not impl types"
Neil Fuller [Tue, 2 Oct 2018 13:16:23 +0000 (06:16 -0700)]
Merge "Use ICU APIs not impl types"
am: 811d817368

Change-Id: I38d6806255619fec3de23945a184455072f34ec0

5 years agoMerge "Use ICU APIs not impl types"
Neil Fuller [Tue, 2 Oct 2018 12:59:47 +0000 (12:59 +0000)]
Merge "Use ICU APIs not impl types"

5 years agoAvoid deprecated PrivateKeyInfo.getAlgorithmId()
Neil Fuller [Tue, 2 Oct 2018 10:55:20 +0000 (11:55 +0100)]
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

5 years agoUse ICU APIs not impl types
Neil Fuller [Tue, 2 Oct 2018 09:15:36 +0000 (10:15 +0100)]
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

5 years agoMove content later button doesn't work on Migration Wizard
Takamasa Kuramitsu [Mon, 1 Oct 2018 13:34:06 +0000 (22:34 +0900)]
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

5 years agoMerge "Rename isConnectable()"
Leon Liao [Wed, 26 Sep 2018 12:59:20 +0000 (05:59 -0700)]
Merge "Rename isConnectable()"
am: ec65174f11

Change-Id: Ibfc536ba78a118bc33890e52efa6650b21bff62e

5 years agoMerge "Rename isConnectable()"
Leon Liao [Tue, 25 Sep 2018 23:06:20 +0000 (23:06 +0000)]
Merge "Rename isConnectable()"

5 years agoMerge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
Youming Ye [Tue, 25 Sep 2018 17:20:06 +0000 (10:20 -0700)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
am: b7e3552b83

Change-Id: I14a7f51ace0637a6248fe13f9a4dc46ee4b9c0a1

5 years agoMerge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"
Youming Ye [Tue, 25 Sep 2018 17:04:10 +0000 (17:04 +0000)]
Merge "Wrong Carrier Config values are used in ApnSettings for Multi SIM device"

5 years agoMerge "ApnEditor: Consider subId when reading carrier config"
Torbjorn Eklund [Mon, 24 Sep 2018 17:48:00 +0000 (10:48 -0700)]
Merge "ApnEditor: Consider subId when reading carrier config"
am: f6f7079709

Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f

5 years agoMerge "ApnEditor: Consider subId when reading carrier config"
Treehugger Robot [Mon, 24 Sep 2018 17:24:03 +0000 (17:24 +0000)]
Merge "ApnEditor: Consider subId when reading carrier config"

5 years agoMerge "Fix incorrect API invoke for BT profiles"
Lei Yu [Fri, 21 Sep 2018 20:13:39 +0000 (13:13 -0700)]
Merge "Fix incorrect API invoke for BT profiles"
am: 625c1eeaa9

Change-Id: I1a7f98b25cae2695d8f5895c8f6e03072ef4600f

5 years agoMerge "Fix incorrect API invoke for BT profiles"
Lei Yu [Fri, 21 Sep 2018 19:50:45 +0000 (19:50 +0000)]
Merge "Fix incorrect API invoke for BT profiles"

5 years agoFix incorrect API invoke for BT profiles
jackqdyulei [Tue, 18 Sep 2018 22:07:49 +0000 (15:07 -0700)]
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

5 years agoApnEditor: Consider subId when reading carrier config
Torbjorn Eklund [Wed, 25 Jul 2018 20:14:30 +0000 (22:14 +0200)]
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

5 years agoRename isConnectable()
Leon Liao [Tue, 18 Sep 2018 04:21:51 +0000 (12:21 +0800)]
Rename isConnectable()

LocalBluetoothProfile.isConnectable() checks whether the user can initiate a connection
for a specific profile, not really whether the profile is connectable.

Change-Id: If6c6cd1554acf35db2460ea6ddb65148a7e86e45
Bug: 79982487
Test: atest tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java

5 years agoFix error message shown when SIM PIN enable/disable fails
Sandeep Gutta [Tue, 18 Sep 2018 06:51:27 +0000 (12:21 +0530)]
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

5 years agoMerge "Clean up: delete unused methods"
Fan Zhang [Thu, 13 Sep 2018 00:12:54 +0000 (17:12 -0700)]
Merge "Clean up: delete unused methods"
am: 41f9566da8

Change-Id: I973b289c688c04c00f70a6c0ba15a5b205d6633a

5 years agoMerge "Clean up: delete unused methods"
Fan Zhang [Wed, 12 Sep 2018 23:46:31 +0000 (23:46 +0000)]
Merge "Clean up: delete unused methods"

5 years agoMerge "Changes on Settings UI for a better user experience"
Fan Zhang [Wed, 12 Sep 2018 23:13:08 +0000 (16:13 -0700)]
Merge "Changes on Settings UI for a better user experience"
am: 7737b64159

Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511

5 years agoMerge "Changes on Settings UI for a better user experience"
Fan Zhang [Wed, 12 Sep 2018 22:44:39 +0000 (22:44 +0000)]
Merge "Changes on Settings UI for a better user experience"

5 years agoClean up: delete unused methods
Fan Zhang [Wed, 12 Sep 2018 20:08:15 +0000 (13:08 -0700)]
Clean up: delete unused methods

Test: rebuild
Change-Id: I144ebbdaf137ee091af949a9e38f68d02941f705

5 years agoChanges on Settings UI for a better user experience
Jin Dong [Fri, 24 Aug 2018 08:24:53 +0000 (16:24 +0800)]
Changes on Settings UI for a better user experience

Oem can change the left padding and right padding of main text
in below screens by overlay the relative dimens:
 - "Network settings reset"
 - "Factory data reset"
 - "Screen pinning"

Bug: 113607004
Test: manual
Change-Id: Ief1afd6ee05b9723874866a06f1748d9d9987333

5 years agoMerge "Fix a crash when launching app detail for bad package name"
Fan Zhang [Wed, 12 Sep 2018 01:28:08 +0000 (18:28 -0700)]
Merge "Fix a crash when launching app detail for bad package name"
am: ada1a39ffb

Change-Id: Ia96ca4a889e9005da4e685b8e04ae2d6b78eff85

5 years agoMerge "Fix a crash when launching app detail for bad package name"
Treehugger Robot [Wed, 12 Sep 2018 00:57:40 +0000 (00:57 +0000)]
Merge "Fix a crash when launching app detail for bad package name"

5 years agoFix a crash when launching app detail for bad package name
Fan Zhang [Tue, 11 Sep 2018 21:52:46 +0000 (14:52 -0700)]
Fix a crash when launching app detail for bad package name

Change-Id: I3bfb5f8e003b810c09d295bc89f4a59af186a121
Fixes: 78779901
Test: robotests

5 years ago[automerger skipped] Merge "Add config to disable app tray preview in display size."
Fan Zhang [Tue, 11 Sep 2018 20:13:33 +0000 (13:13 -0700)]
[automerger skipped] Merge "Add config to disable app tray preview in display size."
am: 98a1ebedcd  -s ours

Change-Id: I36fb69986ab30b14f3040de35cbd9aaa6d7969b1

5 years agoMerge "Add config to disable app tray preview in display size."
Fan Zhang [Tue, 11 Sep 2018 16:27:57 +0000 (16:27 +0000)]
Merge "Add config to disable app tray preview in display size."

5 years agoAdd config to disable app tray preview in display size.
Fan Zhang [Sat, 8 Sep 2018 00:06:07 +0000 (17:06 -0700)]
Add config to disable app tray preview in display size.

Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Merged-In: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests

5 years agoMerge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378...
android-build-team Robot [Mon, 10 Sep 2018 23:21:24 +0000 (23:21 +0000)]
Merge cherrypicks of [498674349867444987539498716849863764986377498637849868894986745498674649867474986748498674949867504986773498716949871704987611498763149876324987633498763449868904987612498765149875984987613498761449876154987599498637949863804987652498765349876914986774] into pi-qpr1-release

Change-Id: I9ffc062718d9e2cd9b06ef489f9a05b44339e500

5 years agoUpdate PBAP info for all pairing dialogs. DO NOT MERGE
jackqdyulei [Tue, 19 Jun 2018 23:52:07 +0000 (16:52 -0700)]
Update PBAP info for all pairing dialogs. DO NOT MERGE

This is a bug from ag/4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.

This CL fix it by updating PBAP for all dialogs.

Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a554fd7f8f7ded7359a5ecc13a82a0464)
(cherry picked from commit 77b62b24c6d386f7913bfe16e1ab121404c3b50a)

5 years ago[automerger skipped] Merge "DO NOT MERGE Import clean up."
Fan Zhang [Mon, 10 Sep 2018 16:27:07 +0000 (09:27 -0700)]
[automerger skipped] Merge "DO NOT MERGE Import clean up."
am: 8a2c9e79b0  -s ours

Change-Id: Id958f79e2c26f0276a02714b5b4d3ec9b8c2327a

5 years agoMerge "DO NOT MERGE Import clean up."
Fan Zhang [Mon, 10 Sep 2018 15:58:34 +0000 (15:58 +0000)]
Merge "DO NOT MERGE Import clean up."

5 years agoMerge cherrypicks of [4963114, 4963471, 4963115, 4962921, 4963491] into pi-qpr1-release
android-build-team Robot [Fri, 7 Sep 2018 01:09:10 +0000 (01:09 +0000)]
Merge cherrypicks of [49631144963471496311549629214963491] into pi-qpr1-release

Change-Id: Icbb8916d8a497c8507844f55bca7677958ee6f81