Jack Yu
bcd6a7db39
Merge "Moved data settings to phone"
2018-12-21 02:29:43 +00:00
Calvin Pan
a49da46d96
Merge "Rename SIM_APN_LIST to SIM_APN_URI"
...
am: d594716359
2018-12-20 17:48:19 -08: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
Inseob Kim
c3eb0887b0
Merge "Remove unused system properties"
...
am: fd0426d438
2018-12-20 01:37:03 -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
Ruchi Kandoi
b7251fa693
Add support for FEATURE_NFC_ANDROID_BEAM
...
Test: Check if app shows the Toggle switch
Bug: 117519147
Change-Id: I395653dd977dc9b149fc343b533d15df71affaf1
2018-12-18 16:08:43 -08:00
Josh Hou
74069bc022
Merge "Refine APN fetching logic"
...
am: 765621670b
2018-12-17 00:16:01 -08: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
Inseob Kim
97b0fe0ac6
Revert "Revert "Schematize vold system properties""
...
This reverts commit 49e81e0eea8346eb5ccc
2018-12-13 15:36:39 -08:00
Xin Li
a817ea5e80
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
...
am: 889a8a3757
2018-12-13 13:09:45 -08:00
Xin Li
7768155274
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 419086d8b3
2018-12-13 11:24:06 -08: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
2d744bd9e1
Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
2018-12-11 21:49:26 +00:00
Inseob Kim
95a1128814
[automerger skipped] Merge "Revert "Revert "Schematize vold system properties"""
...
am: cc24a22da9
2018-12-11 03:26:07 -08:00
Treehugger Robot
cc24a22da9
Merge "Revert "Revert "Schematize vold system properties"""
2018-12-11 11:04:01 +00:00
Xin Li
5134815af5
DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
Bug: 120502534
Change-Id: I4993ed4cbd133e995e950298c65ad57c73c9a5f3
2018-12-10 15:12:59 -08:00
Inseob Kim
8346eb5ccc
Revert "Revert "Schematize vold system properties""
...
This reverts commit 49e81e0eea
2018-12-10 13:03:37 +00:00
Anthony Stange
a35a0418c1
Merge "Revert "Schematize vold system properties""
...
am: 94ef16b6e3
2018-12-07 04:30:15 -08: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
2018-12-07 11:44:10 +00:00
Inseob Kim
09a7954114
Merge "Schematize vold system properties"
...
am: 8cf17f7234
2018-12-06 18:14:00 -08:00
Treehugger Robot
8cf17f7234
Merge "Schematize vold system properties"
2018-12-07 01:46:45 +00:00
Chen Xu
1bf36a6a72
Merge "address API council feedbacks for Telephony.Carriers"
...
am: 71f9fe4dfa
2018-12-06 16:19:11 -08:00
Chen Xu
71f9fe4dfa
Merge "address API council feedbacks for Telephony.Carriers"
2018-12-06 21:45:47 +00:00
Fan Zhang
b084c60686
Merge "Make migrate option menu invisible when src volume is not mounted"
...
am: 6db9f21256
2018-12-04 10:01:10 -08: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
de0bd5321f
Merge "Track move of timezone classes to libcore.timezone"
...
am: 3ddcb6a90a
2018-11-26 15:27:52 -08:00
Neil Fuller
3ddcb6a90a
Merge "Track move of timezone classes to libcore.timezone"
2018-11-26 23:04:33 +00:00
Youming Ye
e29c62ea04
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"
...
am: a995cb334b
2018-11-26 13:38:30 -08: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
Maurice Lam
918c0c5896
Merge "Remove ShadowLibcoreTimeZoneNames"
...
am: 45f8352422
2018-11-21 07:44:39 -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
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
Risan
e613923d66
Merge "Allow StubVolume to be browseable in Settings"
...
am: 8f516adef7
2018-11-13 11:45:08 -08:00
Treehugger Robot
8f516adef7
Merge "Allow StubVolume to be browseable in Settings"
2018-11-13 19:20:38 +00:00
Neil Fuller
78e132773a
Merge "Remove the feature flag and dead code for the old time zone picker"
...
am: 6bb4b5ca43
2018-11-13 01:50:08 -08: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 6be6c582066be6c58206
2018-11-13 07:49:32 +00:00
Youming Ye
6b0237ebfb
Merge "Fix issue that read-only apns can be edited"
...
am: e871464053
2018-11-08 17:20:26 -08:00
Youming Ye
e871464053
Merge "Fix issue that read-only apns can be edited"
2018-11-09 01:00:35 +00:00
