Nathan Harold
7aacdc2c13
Merge "Fix BandMode Dialog Crash on Open due to Style"
...
am: 7588ef1518
Change-Id: I0dd365652f4deac7b69b181317b0dd86610400a7
2019-01-07 17:16:52 -08:00
Nathan Harold
7588ef1518
Merge "Fix BandMode Dialog Crash on Open due to Style"
2019-01-08 00:18:21 +00:00
Ruchi Kandoi
39845367ab
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
...
am: 6827785e52
Change-Id: I7c71bad831892bf9a853ca5d4777e42c1b3a9171
2019-01-04 13:58:22 -08:00
Treehugger Robot
6827785e52
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
2019-01-04 21:49:14 +00:00
Nathan Harold
63b1ab12f6
Fix BandMode Dialog Crash on Open due to Style
...
This sidesteps an error saying that the radio
BandMode activity must inherit from an AppCompat
style. Instead the window is now full-screen and
matches the theme of the RadioInfo menu.
Bug: 117571514
Test: manual - open the activity without a crash and
verify that the new style change is effective.
Change-Id: I6e49d731e039709db43dfa6531723781e9e48640
2019-01-03 09:51:49 -08:00
Pengquan Meng
9745ec5421
Merge "Add PreferenceChangeListener to ApnSettings"
...
am: 66d28c3e37
Change-Id: Ideef529174f7b8b89f5668f7c9366cea090df68f
2018-12-27 15:51:21 -08:00
Pengquan Meng
66d28c3e37
Merge "Add PreferenceChangeListener to ApnSettings"
2018-12-27 23:36:18 +00:00
Lei Yu
3461bd0644
[automerger skipped] Merge "Update color-check-baseline.xml"
...
am: 81cb8a2612
-s ours
Change-Id: Id047f4c0964dc1f38ebf4c1afc46796c9c793ea1
2018-12-27 13:45:22 -08:00
Lei Yu
81cb8a2612
Merge "Update color-check-baseline.xml"
2018-12-27 21:35:31 +00:00
Pengquan Meng
2f434aa7ca
Add PreferenceChangeListener to ApnSettings
...
The PreferenceChangeListener was removed from aosp/779634, when the
selected apn is changed, the result is not saved to the database.
In this CL, we add the PreferenceChangeListener back.
Bug: 121229775
Test: build & manual test
Change-Id: Ief1a2e05c072e5eff8060731b044c19878d346be
2018-12-27 13:27:26 -08:00
Lei Yu
3cab6d51fb
Update color-check-baseline.xml
...
Since these colors are already fixed in internal master(ag/4164571).
This CL only update the baseline and won't merge down.
Change-Id: I19dbca351fb786b9dbbb84bf7f50ccc0347bd0cf
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 110960820
Test: repohook
2018-12-21 14:20:01 -08:00
Jack Yu
67475a5c66
Merge "Moved data settings to phone"
...
am: bcd6a7db39
Change-Id: I8fde45278c4a5db14f986ea87ab2bfa15b7507ab
2018-12-20 19:01:06 -08:00
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
Change-Id: If8708a4d84fd8dce4c7e66507320cd35369331b2
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
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
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