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
Change-Id: Ib0a1dd0b3f944d5a98b71555a48aadacfb228543
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 49e81e0eea
.
Reason for revert: Fixed breakage
Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: I5f75b15ab792329cdb9bf2dd2e4b42bccb6eb0f3
(cherry picked from commit 8346eb5ccc
)
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
-s ours
Change-Id: Ide998fc70c7beb72b1bcf878783a5429268d1aeb
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
-s ours
Change-Id: I620bd09f7331acdb7a6a8377cb02d4ccea4293f8
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
-s ours
Change-Id: I19f28ff740c8cf3bb0ec1d68cef80563998154f2
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
.
Reason for revert: Fixed breakage
Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
2018-12-10 13:03:37 +00:00
Anthony Stange
a35a0418c1
Merge "Revert "Schematize vold system properties""
...
am: 94ef16b6e3
Change-Id: If9a59cfa4939e3ef2cdc7c50e0151c33c58b24aa
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
.
Reason for revert: Breaking aosp_master build
Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b
2018-12-07 11:44:10 +00:00
Inseob Kim
09a7954114
Merge "Schematize vold system properties"
...
am: 8cf17f7234
Change-Id: I6d9782dfc2cd54f6620c226d37ca3e81dc19647f
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
Change-Id: I834e4f1fe9457af586a0fe7856c4ab351a4b26a3
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
android-build-team Robot
c103b546d2
Merge cherrypicks of [5704859, 5705300, 5704034, 5704195, 5705082, 5704058, 5704059, 5704932, 5705340, 5705341, 5705342, 5705343, 5705344, 5705361, 5705362, 5705363, 5705364, 5704870, 5704196, 5705083, 5701785, 5701786, 5701787, 5704035, 5705261, 5705281, 5704036, 5704037, 5704038, 5704871, 5704933, 5704872, 5705347, 5705262, 5704934] into pi-qpr2-release
...
Change-Id: I0eba927762c07cdb664a62d65637e9dbd7e79dc1
2018-12-05 05:16:47 +00:00
Fan Zhang
bd363f4925
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
(cherry picked from commit 4220b1e50c
)
2018-12-05 05:14:17 +00:00
Fan Zhang
b084c60686
Merge "Make migrate option menu invisible when src volume is not mounted"
...
am: 6db9f21256
Change-Id: Ie4ca0c854de854172a0eccf4e56ec86a8e18d71c
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
Change-Id: Id7db6339cf9c5f886be9c8ba80b47e15783a4ea3
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
Change-Id: If2bb27e7e9452ebcaab1d421adc07259b4b3b31c
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
android-build-team Robot
f8d659af6c
Snap for 5140444 from a31c2ec237
to pi-qpr2-release
...
Change-Id: I51e2f0730950c181af8670b76357bbd9f379b015
2018-11-26 18:45:11 +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
Change-Id: I65b07e67025ad0dfaa85fc1c873e695d69ff0a9c
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
)
Change-Id: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
Merged-In: I756265945dcf7c3b7a78a627c4dc32cff3c8e55c
2018-11-21 11:07:11 +00:00
android-build-team Robot
9b65905c31
Snap for 5143169 from b232d21e3d
to pi-qpr2-release
...
Change-Id: Ic72f92cf2b191d7f19c92d6c8a1ae0730dfac5bc
2018-11-21 04:06:46 +00:00
Fan Zhang
b232d21e3d
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1
am: eeaff5deeb
-s ours
...
am: 622444d488
-s ours
Change-Id: I48cc472fb0d99b88f3affb69708f7107fe3ea2dc
2018-11-20 02:43:38 -08:00
Fan Zhang
622444d488
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1
...
am: eeaff5deeb
-s ours
Change-Id: I1da9e0c3e5a170eb16a11a616d8a76fe6424d420
2018-11-20 02:34:38 -08:00
Fan Zhang
eeaff5deeb
Hide quicksetting tile for dev options when it's turned off
...
am: 73469d9de1
Change-Id: Ibd19748e11218a958a00eaf501d9d8ab7cfc96e0
2018-11-20 02:28:15 -08:00
Fan Zhang
cb560b65f5
[automerger skipped] Hide quicksetting tile for dev options when it's turned off
...
am: 04f1e38dc3
-s ours
Change-Id: I3dfc8d889fb440846e4b70193350c665389f9b89
2018-11-19 22:38:50 -08:00
TreeHugger Robot
4c16ad5abf
Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
2018-11-20 05:00:03 +00:00
android-build-team Robot
a31c2ec237
Snap for 5130385 from 1ba1a70dfb
to pi-qpr2-release
...
Change-Id: I641ad1361cf9c09aeb9e04afde2a203d20b7664b
2018-11-14 04:09:54 +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
1ba1a70dfb
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-11-14 00:49:33 +00:00
Bill Yi
0301470757
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic00cbf2b25c019d77c85c93203e58f4a1cf102c1
2018-11-13 14:42:50 -08:00