Automerger Merge Worker
b0ebb47014
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f am: eafda3c724
...
Change-Id: I3e92055ad03cfa4f0bbe80185840f5783559c96f
2020-02-04 10:59:36 +00:00
Automerger Merge Worker
eafda3c724
Merge "[Settings] Avoid rename inactive subscription from NullPointerException" am: 91638e079f
...
Change-Id: I9a488c3d7b6452b64d1cb8b532d0f66f25017773
2020-02-04 10:51:31 +00:00
Bonian Chen
91638e079f
Merge "[Settings] Avoid rename inactive subscription from NullPointerException"
2020-02-04 10:43:01 +00:00
Automerger Merge Worker
b04872c35d
Merge "Use IEC units in app info data usage." am: 1668f18a16 am: d9d463013f
...
Change-Id: Ic3a5bb04189779d0932663b690d37fed095edabc
2020-02-04 04:50:40 +00:00
Automerger Merge Worker
d9d463013f
Merge "Use IEC units in app info data usage." am: 1668f18a16
...
Change-Id: Ief2ba0f1b8338b5b9472bb2837fcb778d2652aba
2020-02-04 04:43:28 +00:00
Treehugger Robot
1668f18a16
Merge "Use IEC units in app info data usage."
2020-02-04 04:33:30 +00:00
Bonian Chen
ab459dc194
[Settings] Avoid rename inactive subscription from NullPointerException
...
1. Init instance before accessing it
2. Re-enable test case
Bug: 147321836
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=RenameMobileNetworkDialogFragmentTest
Change-Id: I2375043f16b5a25372af5c9f413fb8384850316c
Merged-In: Ifc245bec739b4c81d2cee04b091bcdb54d567d4a
2020-02-04 11:43:37 +08:00
Automerger Merge Worker
4d2b61d408
Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a am: 30d7fd79c9
...
Change-Id: Ia279507e094b7b547ea8293465817a53cc305913
2020-02-04 03:08:47 +00:00
Automerger Merge Worker
30d7fd79c9
Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline" am: cc9aef705a
...
Change-Id: I222f5d247438e1a64c0c33123555b97c1b3c5dfd
2020-02-04 02:55:31 +00:00
Betty Chang
cc9aef705a
Merge "[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline"
2020-02-04 02:44:15 +00:00
Automerger Merge Worker
798407a441
Merge "Tidy up libcore.timezone APIs" am: 45834d96a8 am: 35ffa52384
...
Change-Id: I87f4ca96ef592c459c96f12906a86889367bfe7e
2020-01-31 16:30:07 +00:00
Automerger Merge Worker
35ffa52384
Merge "Tidy up libcore.timezone APIs" am: 45834d96a8
...
Change-Id: I3222600a7fa1d37b7d8e16115ec067d415f2bdba
2020-01-31 16:29:11 +00:00
Automerger Merge Worker
bcf3f23b67
Merge "access system resources with android.R package" am: ef77c1d67f am: 49cd1555f3
...
Change-Id: Idcb5041776ed072a871bc037df143450c92d458c
2020-01-31 16:00:33 +00:00
Automerger Merge Worker
49cd1555f3
Merge "access system resources with android.R package" am: ef77c1d67f
...
Change-Id: I663f693f498e3566deb37f6175fc0bb214264118
2020-01-31 15:55:52 +00:00
Automerger Merge Worker
780b99ee08
[automerger skipped] Import translations. DO NOT MERGE am: cc3531906a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I7a318b99ebceff2b42d6f11931fbbfa268049cc3
2020-01-30 19:42:22 +00:00
Neil Fuller
45834d96a8
Merge "Tidy up libcore.timezone APIs"
2020-01-30 11:25:35 +00:00
Bill Yi
cc3531906a
Import translations. DO NOT MERGE
...
Change-Id: Ic4b6852ea330e15526fe32c4ad5de96cdbb8d7a3
Auto-generated-cl: translation import
2020-01-29 12:59:30 -08:00
Sooraj Sasindran
ef77c1d67f
Merge "access system resources with android.R package"
2020-01-29 17:34:53 +00:00
Automerger Merge Worker
9aa72472a5
Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor" am: 0c2cd2a94d am: 1edf46fc74
...
Change-Id: I8e4241bce34b6a2099c116cbe76d6e84896d6331
2020-01-29 16:37:28 +00:00
Sarah Chin
1edf46fc74
Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor"
...
am: 0c2cd2a94d
2020-01-29 08:14:34 -08:00
Sarah Chin
0c2cd2a94d
Merge "[DO NOT MERGE] Update CellIdentityGsm Constructor"
2020-01-29 15:56:09 +00:00
Neil Fuller
7b54a31132
Tidy up libcore.timezone APIs
...
Tidy up the libcore.timezone APIs to make them as close as possible to
android.timezone. In future, these classes should be repackages to be
the actual android.timezone classes, so the APIs need to be in sync.
Bug: 148086409
Test: treehugger
Change-Id: I8d0521467bb3c3c8741ce98f50cde0ee8c1bec1a
2020-01-28 15:08:31 +00:00
Chalard Jean
bbd637d391
Use IEC units in app info data usage.
...
Settings > Apps & notifications > select some app that has done
some internet traffic.
Observe "Mobile data & Wi-Fi" summary data and take note of the
numbers. Then tap on it and observe that the numbers on the
details page don't match the one in the summary. This is because
the details use IEC units while the summary uses SI units.
This fix changes the summary to use IEC units too, removing
the discrepancy.
Bug: 137917003
Test: manually cause some traffic, see that the numbers are now
consistent between the app info and usage details page
Change-Id: I4be5830d4e98a1c4739001c812e59d82415bf24a
2020-01-28 20:22:45 +09:00
Sooraj Sasindran
a30bdaaaf8
access system resources with android.R package
...
Bug: 143289541
Test: make
Merged-In: Idc10955639bce7b8e579c50af78056389d44d492
Change-Id: Idc10955639bce7b8e579c50af78056389d44d492
2020-01-27 22:17:28 -08:00
Automerger Merge Worker
b201a11991
Merge "[Settings] DataUsage crash when no SIM inserted" am: 5c8b22657c am: 798b5816d1
...
Change-Id: I1184f29ae4c4d25584c382c4604bab547c45de00
2020-01-27 06:18:29 +00:00
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
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
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
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
