Inseob Kim
97b0fe0ac6
Revert "Revert "Schematize vold system properties""
...
This reverts commit 49e81e0eea8346eb5ccc
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
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
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
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
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
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
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
2018-12-11 03:34:42 -08: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
c7a5a2f39a
Merge "Revert "Schematize vold system properties"" am: 94ef16b6e3
...
am: a35a0418c1
2018-12-07 04:38:25 -08: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
cd614a097e
Merge "Schematize vold system properties" am: 8cf17f7234
...
am: 09a7954114
2018-12-06 18:43:16 -08: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
62dc239377
Merge "address API council feedbacks for Telephony.Carriers" am: 71f9fe4dfa
...
am: 1bf36a6a72
2018-12-06 16:39:36 -08: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
4036866211
Merge "Make migrate option menu invisible when src volume is not mounted" am: 6db9f21256
...
am: b084c60686
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
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
2018-11-26 15:48:38 -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
e5e4e4cb76
Merge "Display a toast to notify user that Preset APN setting cannot be viewed" am: a995cb334b
...
am: e29c62ea04
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
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
c2772b777d
Merge "Remove ShadowLibcoreTimeZoneNames" am: 45f8352422
...
am: 918c0c5896
2018-11-21 08:06:22 -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
Fan Zhang
b84867f450
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1 am: eeaff5deeb -s ours am: 622444d488 -s ours
...
am: b232d21e3d
2018-11-20 21:42:26 -08:00
Fan Zhang
1c60e846e6
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 04f1e38dc3 -s ours
...
am: cb560b65f5
2018-11-20 21:41:34 -08:00
Fan Zhang
1c5a636e17
[automerger skipped] Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
...
am: 4c16ad5abf
2018-11-20 21:40:53 -08: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
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
2018-11-20 02:34:38 -08:00
Fan Zhang
eeaff5deeb
Hide quicksetting tile for dev options when it's turned off
...
am: 73469d9de1
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
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
