Bonian Chen
798b5816d1
Merge "[Settings] DataUsage crash when no SIM inserted"
...
am: 5c8b22657c
2020-01-26 22:05:07 -08:00
Bonian Chen
5c8b22657c
Merge "[Settings] DataUsage crash when no SIM inserted"
2020-01-27 05:21:35 +00:00
Bonian Chen
f550fc2181
[Settings] DataUsage crash when no SIM inserted
...
Check for null pointer when looking up subcription id.
Bug: 148175728
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=DataUsageUtilsTest
Change-Id: Icc1314d262f1af686134dcf6a0b187adfc3eb4df
Merged-In: I4e893fc7de4a3292b3949860ebb59fbe52ac1a8f
2020-01-25 09:37:00 +00:00
Automerger Merge Worker
b9df8248fa
Merge "Add IKEv2/IPsec VPN options" am: b189ffb318 am: 9d5397ab42
...
Change-Id: Ia26abaa384163d241dbc59e69e6f705f95663752
2020-01-23 06:18:15 +00:00
Benedict Wong
9d5397ab42
Merge "Add IKEv2/IPsec VPN options"
...
am: b189ffb318
2020-01-22 22:09:59 -08:00
Benedict Wong
b189ffb318
Merge "Add IKEv2/IPsec VPN options"
2020-01-23 05:11:47 +00:00
android-build-team Robot
4122b36089
Snap for 6154456 from 397a1fb9ad to qt-qpr3-release
...
Change-Id: I36198bd8cc9ab64b22bbc56bfd4ad97fd958fea6
2020-01-23 02:10:10 +00:00
Automerger Merge Worker
fd9a6b9913
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 397a1fb9ad -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1fc3bd95c227182adac0961d414ee4c9ddc093c0
2020-01-22 17:15:37 +00:00
TreeHugger Robot
397a1fb9ad
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-01-22 17:07:57 +00:00
Bill Yi
d6692442b2
Import translations. DO NOT MERGE
...
Change-Id: Ia3b9a49938047ae00c39d810f8a8b33f4290a901
Auto-generated-cl: translation import
2020-01-21 22:33:06 -08:00
Nathan Harold
993ed46715
[DO NOT MERGE] Update CellIdentityGsm Constructor
...
Add a dummy parameter to the CellIdentityGsm constructor
for backwards compatibility.
As this code doesn't exist in goog/master, add a shim but
don't merge it.
Bug: 135921133
Test: compilation
Change-Id: I707bb4d2b90bfecd5825c25f9a1f92dbd9ccf41b
2020-01-20 22:07:20 -08:00
Automerger Merge Worker
ad5fbe4177
Merge "Fix strings in PlatformCompatDashboard" am: a9f0446ce8 am: e89b34a366
...
Change-Id: I9ac23dd4d5bce7da2841e529ea7be65260ce987c
2020-01-20 13:35:08 +00:00
Andrei-Valentin Onea
e89b34a366
Merge "Fix strings in PlatformCompatDashboard"
...
am: a9f0446ce8
2020-01-20 05:25:45 -08:00
Andrei-Valentin Onea
a9f0446ce8
Merge "Fix strings in PlatformCompatDashboard"
2020-01-20 13:18:06 +00:00
Automerger Merge Worker
1cb6b91c7f
Merge "Update api name" am: f82f807e03 am: c36a071238
...
Change-Id: I4f69bebb7f926588dd326061d030982d324b9b9b
2020-01-20 04:41:30 +00:00
hughchen
c36a071238
Merge "Update api name"
...
am: f82f807e03
2020-01-19 20:25:49 -08:00
Treehugger Robot
f82f807e03
Merge "Update api name"
2020-01-20 04:18:14 +00:00
android-build-team Robot
c5615edad0
Snap for 6146496 from 4ea25da221 to qt-qpr3-release
...
Change-Id: I2758cb3accffb972385537aef14f95169dd5e68a
2020-01-20 00:12:52 +00:00
Automerger Merge Worker
dc9b7833ae
[automerger skipped] Import translations. DO NOT MERGE am: 4ea25da221 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie54c3d06873db3619f65f6e804554d587f367d92
2020-01-19 05:14:51 +00:00
android-build-team Robot
b511c78b6b
Snap for 6146007 from 13a5924c8d to qt-qpr3-release
...
Change-Id: If4e81dfd0eee940f894f1b9a140aaaf94e3053e1
2020-01-19 00:13:18 +00:00
Bill Yi
4ea25da221
Import translations. DO NOT MERGE
...
Bug: 143905457
Change-Id: I14e7311ac25f37bbf8bc846a79963d0c560d98c8
Auto-generated-cl: translation import
2020-01-18 04:51:41 +00:00
Automerger Merge Worker
6471715f51
Update L2U string for face unlock in settings am: 13a5924c8d
...
Change-Id: I72bec002da39a9ac86a8bb242d59e1a98d9e1369
2020-01-18 01:04:42 +00:00
Curtis Belmonte
13a5924c8d
Update L2U string for face unlock in settings
...
Test: Checked in Settings for flame-userdebug build
Bug: 143905457
Change-Id: I2705b6bf9ae0a140f69ffaa5490a91500745f1e0
Merged-In: I1e98b95e81dea355c66e8c0f30664db21632d05c
2020-01-17 14:14:49 -08:00
Automerger Merge Worker
10a451b563
[automerger skipped] Merge "Merge "Move the app to /system_ext" am: c8e4d7953e" into stage-aosp-master am: 38b21bca73 -s ours
...
am skip reason: Change-Id Icd2f7fc7021e84fad9980d58688dc640ca4245f8 with SHA-1 13aaa6ab4e
2020-01-17 22:00:32 +00:00
Automerger Merge Worker
41c2ff7b7a
[automerger skipped] Merge "Move the app to /system_ext" am: c8e4d7953e am: 3aa8d52dd6 -s ours
...
am skip reason: Change-Id Icd2f7fc7021e84fad9980d58688dc640ca4245f8 with SHA-1 13aaa6ab4e
2020-01-17 21:59:58 +00:00
Automerger Merge Worker
6efee9f387
Merge "Move the app to /system_ext" am: c8e4d7953e am: 495d861928
...
Change-Id: If9903907b9b81a9d98920ffd3f11b11e6af0d5db
2020-01-17 21:49:07 +00:00
Android Build Merger (Role)
38b21bca73
Merge "Merge "Move the app to /system_ext" am: c8e4d7953e" into stage-aosp-master
2020-01-17 20:17:59 +00:00
Jeongik Cha
3aa8d52dd6
Merge "Move the app to /system_ext"
...
am: c8e4d7953e
2020-01-17 12:14:41 -08:00
Automerger Merge Worker
495d861928
Merge "Move the app to /system_ext" am: c8e4d7953e
...
Change-Id: I515919946b7438ca0e7971127a394545c1e61ea0
2020-01-17 20:13:16 +00:00
Andrei Onea
e2f4619602
Fix strings in PlatformCompatDashboard
...
Be more specific, by referring to 'target SDK', instead of just 'SDK'.
Test: atest PlatformCompatDashboardTest
Bug: 138280620
Change-Id: Ied8dd5d682ed20962040bf81e9b3b3b45166ea46
2020-01-17 16:41:46 +00:00
Treehugger Robot
c8e4d7953e
Merge "Move the app to /system_ext"
2020-01-17 11:44:42 +00:00
android-build-team Robot
bb0a6e3087
Snap for 6141805 from 250b9e7012 to qt-qpr3-release
...
Change-Id: Iac34cbed93ab7297c2d99bfbafce9a4d70192634
2020-01-17 02:07:00 +00:00
Automerger Merge Worker
b3bc4cf8f6
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: db6915778e
...
Change-Id: I83b8e2a547b91bbc577f7827f778f4d06ee07847
2020-01-16 18:54:45 +00:00
Automerger Merge Worker
0ad2bf17b6
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: ccbee6a795
...
Change-Id: Ie97ffd800d66e21d10d47a9b4a89683f71fb1816
2020-01-16 18:34:46 +00:00
TreeHugger Robot
db6915778e
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master
2020-01-16 18:29:15 +00:00
Automerger Merge Worker
90cb40e80c
[automerger skipped] Import translations. DO NOT MERGE am: 250b9e7012 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id9a1fd209c07f005d5d325a54fb159e7cd282b1e
2020-01-16 11:33:44 +00:00
Automerger Merge Worker
fcfcf4380b
Merge "Remove reference of PhoneConstant." am: 6f82fe83f0 am: 83e2fa8b03
...
Change-Id: I52bd36fa7085f1915bf4be102af24c1269c1d317
2020-01-16 10:19:58 +00:00
Bonian Chen
83e2fa8b03
Merge "Remove reference of PhoneConstant."
...
am: 6f82fe83f0
2020-01-16 02:08:17 -08:00
Bonian Chen
6f82fe83f0
Merge "Remove reference of PhoneConstant."
2020-01-16 09:17:01 +00:00
Jeongik Cha
13aaa6ab4e
Move the app to /system_ext
...
As mentioned in go/partitions-in-r, we plan to forbid hidden API in
product partition.
So this app should be moved to /system_ext because it uses hidden API.
It is not permanent, so they can be moved back to /product due to
needs if there isn't hidden usage anymore.
Bug: 137908189
Test: m
Test: check whether device boots successfully
Exempt-From-Owner-Approval: cherry-pick from internal
Change-Id: Icd2f7fc7021e84fad9980d58688dc640ca4245f8
Merged-In: Icd2f7fc7021e84fad9980d58688dc640ca4245f8
2020-01-16 06:45:18 +00:00
Bill Yi
250b9e7012
Import translations. DO NOT MERGE
...
Change-Id: If28324d88c5dabf515e6ce440d4816b185a39a00
Auto-generated-cl: translation import
2020-01-15 20:22:42 -08:00
zoey chen
31240418ac
[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager
...
Bug: 146983487
Test: manual
Change-Id: I4bf1341f972639829cd9fc64370018127460a65f
Merged-In: I4bf1341f972639829cd9fc64370018127460a65f
2020-01-16 11:42:30 +08:00
hughchen
50c064d502
Update api name
...
Use CachedBluetoothDevice.connect() instead of
CachedBluetoothDevice.connect(boolean) to connect
Bluetooth device.
Fixes: 141582844
Test: manually
Change-Id: I8c50678bdfd6de89fb8d56122bfa38bdd5ac5c9d
Merged-In: I8c50678bdfd6de89fb8d56122bfa38bdd5ac5c9d
2020-01-16 10:33:30 +08:00
Xin Li
ccbee6a795
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: I77344517b74a2192af49a3f8956d8756b81741d9
2020-01-15 15:57:20 -08:00
Automerger Merge Worker
40bd05a1b9
Merge "[Settings] Remove unused ImsStatusPreferenceController" am: b36f57ae5a am: 4a16d794e8
...
Change-Id: I2f2a31f5dff7b3b22794152d774e664569b2a2d8
2020-01-15 23:22:36 +00:00
Bonian Chen
4a16d794e8
Merge "[Settings] Remove unused ImsStatusPreferenceController"
...
am: b36f57ae5a
2020-01-15 15:08:44 -08:00
Bonian Chen
b36f57ae5a
Merge "[Settings] Remove unused ImsStatusPreferenceController"
2020-01-15 22:46:00 +00:00
Automerger Merge Worker
dc5b5a0000
Merge "[Settings] Replacing accessing of PhoneConstants$DataState" am: e9324b48ab am: 96e43012a1
...
Change-Id: I82f77b82685111e05235e8b4bdc03efe469c23bc
2020-01-15 15:13:09 +00:00
Bonian Chen
96e43012a1
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
...
am: e9324b48ab
2020-01-15 07:02:18 -08:00
Bonian Chen
e9324b48ab
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
2020-01-15 14:56:36 +00:00
