Commit Graph

46272 Commits

Author SHA1 Message Date
Inseob Kim
9d78bf6557 Merge "Remove unused system properties" am: fd0426d438
am: c3eb0887b0

Change-Id: If0837ac203b720b57868c1e6bbb64b05f7f8ffbf
2018-12-20 01:42:16 -08:00
Inseob Kim
c3eb0887b0 Merge "Remove unused system properties"
am: fd0426d438

Change-Id: I6f33268a640fb14ec8e9cd2fc5acec94ac25697d
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
ff5d0b0ac6 Merge "Refine APN fetching logic" am: 765621670b
am: 74069bc022

Change-Id: I372d73a75a7dd2077e39dfc29c66b29b1a3ace65
2018-12-17 00:25:12 -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
744a9d1316 Revert "Revert "Schematize vold system properties""
am: 97b0fe0ac6

Change-Id: I8b6e78df6e31500df448addb82bed9d2c11c8fec
2018-12-13 16:14:41 -08: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
e92deab316 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 889a8a3757 -s ours
am: a817ea5e80  -s ours

Change-Id: Ie235529d9065bdc9f258f91ba8206cda6d96379e
2018-12-13 13:13:47 -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
e21ca76caf [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 419086d8b3 -s ours
am: 7768155274  -s ours

Change-Id: I91475b01f6a1fa9f64f384ee6351e237c3e79c85
2018-12-13 12:19:49 -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
2c2f179630 [automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
am: 2d744bd9e1  -s ours

Change-Id: Ia5bc1d228449c6f78d54f25c392b3ea33c80ddef
2018-12-11 15:54:17 -08: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
Xin Li
dfd5b86302 [automerger skipped] DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
am: 5134815af5  -s ours

Change-Id: I2bb19a2cb832111ee29ef3762c3b13808dde3b11
2018-12-11 15:07:53 -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
fe9f5c42f6 [automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am: cc24a22da9 -s ours
am: 95a1128814  -s ours

Change-Id: Id55802e6e5395a0f748f5b125d551b64c22473f1
2018-12-11 03:34:42 -08: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
c7a5a2f39a Merge "Revert "Schematize vold system properties"" am: 94ef16b6e3
am: a35a0418c1

Change-Id: I7ca5d4d85897ac4d2d851c05b9f69c986f6a662a
2018-12-07 04:38:25 -08: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
cd614a097e Merge "Schematize vold system properties" am: 8cf17f7234
am: 09a7954114

Change-Id: I1a42e00ad024b471bcc51d8e0ef0f50fea34fcbe
2018-12-06 18:43:16 -08: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
62dc239377 Merge "address API council feedbacks for Telephony.Carriers" am: 71f9fe4dfa
am: 1bf36a6a72

Change-Id: I9775826417d2df6284bf0273b48c3a9814a01cf4
2018-12-06 16:39:36 -08: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
4036866211 Merge "Make migrate option menu invisible when src volume is not mounted" am: 6db9f21256
am: b084c60686

Change-Id: Ia3990dc8fa2c73079b997bda0e1656d173c65212
2018-12-04 10:10:50 -08: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
18a275efc3 Merge "Track move of timezone classes to libcore.timezone" am: 3ddcb6a90a
am: de0bd5321f

Change-Id: I69516fa31c07a67621e8740ca14c19c40d5dd126
2018-11-26 15:48:38 -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
e5e4e4cb76 Merge "Display a toast to notify user that Preset APN setting cannot be viewed" am: a995cb334b
am: e29c62ea04

Change-Id: If37a038a2a226d0165293d7c40f133002bcd2991
2018-11-26 13:51:57 -08: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