Commit Graph

45883 Commits

Author SHA1 Message Date
Jack Yu
bcd6a7db39 Merge "Moved data settings to phone" 2018-12-21 02:29:43 +00:00
Calvin Pan
d594716359 Merge "Rename SIM_APN_LIST to SIM_APN_URI" 2018-12-21 01:31:44 +00:00
Jack Yu
e5accf70fb 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 50972ed89e)
2018-12-20 15:23:11 -08:00
Treehugger Robot
fd0426d438 Merge "Remove unused system properties" 2018-12-20 09:24:39 +00:00
calvinpan
9b56a8b278 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
2018-12-20 07:09:42 +00:00
Inseob Kim
1119bb9399 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
2018-12-20 00:33:24 +00:00
Treehugger Robot
765621670b Merge "Refine APN fetching logic" 2018-12-17 08:03:04 +00:00
Josh Hou
e519cd6e68 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
2018-12-17 07:16:50 +00:00
Treehugger Robot
889a8a3757 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" 2018-12-13 05:45:20 +00:00
Xin Li
419086d8b3 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1
2018-12-11 15:24:05 -08:00
Treehugger Robot
cc24a22da9 Merge "Revert "Revert "Schematize vold system properties""" 2018-12-11 11:04:01 +00:00
Inseob Kim
8346eb5ccc Revert "Revert "Schematize vold system properties""
This reverts commit 49e81e0eea.

Reason for revert: Fixed breakage

Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
2018-12-10 13:03:37 +00:00
Anthony Stange
94ef16b6e3 Merge "Revert "Schematize vold system properties"" 2018-12-07 12:04:56 +00:00
Anthony Stange
49e81e0eea Revert "Schematize vold system properties"
This reverts commit e6baedd917.

Reason for revert: Breaking aosp_master build

Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b
2018-12-07 11:44:10 +00:00
Treehugger Robot
8cf17f7234 Merge "Schematize vold system properties" 2018-12-07 01:46:45 +00:00
Chen Xu
71f9fe4dfa Merge "address API council feedbacks for Telephony.Carriers" 2018-12-06 21:45:47 +00:00
Fan Zhang
6db9f21256 Merge "Make migrate option menu invisible when src volume is not mounted" 2018-12-04 17:33:33 +00:00
chen xu
54d5a727c1 address API council feedbacks for Telephony.Carriers
Bug: 118296421
Test: telephony unit test
Change-Id: Idf8bcad4fe9d765a73563e9b0c1c659175835447
Merged-in: Idf8bcad4fe9d765a73563e9b0c1c659175835447
2018-11-29 23:20:13 -08:00
Bill Yi
03812c93d1 Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: I120adda515fd4891b6b9b68e93cef5555951bacc
2018-11-28 18:34:54 -08: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
Inseob Kim
e6baedd917 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
2018-11-14 12:05:28 +09: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