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
Neil Fuller
45834d96a8
Merge "Tidy up libcore.timezone APIs"
2020-01-30 11:25:35 +00: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
Change-Id: Ibce639f419d021ba6abe507381644eb3fd8249ef
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
Change-Id: Iab61f527b75c22eab597eea7ffead91babd72de3
2020-01-26 22:05:07 -08: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
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
Change-Id: I56cb47ccfe8278e722556fb6f9d4d08f0ac35d52
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
Change-Id: I20240365a45eb27bcfed019ac77e4e6bfe09d24d
2020-01-19 20:25:49 -08:00
Treehugger Robot
f82f807e03
Merge "Update api name"
2020-01-20 04:18:14 +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
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
fcfcf4380b
Merge "Remove reference of PhoneConstant." am: 6f82fe83f0 am: 83e2fa8b03
...
Change-Id: I52bd36fa7085f1915bf4be102af24c1269c1d317
2020-01-16 10:19:58 +00:00
Bonian Chen
6f82fe83f0
Merge "Remove reference of PhoneConstant."
2020-01-16 09:17:01 +00: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
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
e9324b48ab
Merge "[Settings] Replacing accessing of PhoneConstants$DataState"
2020-01-15 14:56:36 +00:00
Bonian Chen
58ed9710c7
Remove reference of PhoneConstant.
...
Copy constants to ApnEditor from PhoneConstant
Test: make
Test: m RunSettingsRoboTests
Change-Id: Idb26ded937dd31f08c96323d5064947a6af86156
Merged-In: I22b85799ad547aca1ce4e63af3f39bc7f29618c6
2020-01-15 21:52:43 +08:00
Bonian Chen
368c885b98
[Settings] Remove unused ImsStatusPreferenceController
...
Legacy code clean up.
Bug: 147534443
Test: build pass
Change-Id: I4dd9c1c623296385eab6e14c10956cea27a04f75
2020-01-15 20:50:24 +08:00
Automerger Merge Worker
eff77d28b9
Merge "Add a RTT setting in A11y screen" into qt-qpr1-dev am: fb44d744c3
...
Change-Id: I1716dc3e0b13a430ed4d5ff525b95bb09eb0b90a
2020-01-14 00:49:32 +00:00
Bonian Chen
8845af8a14
[Settings] Replacing accessing of PhoneConstants$DataState
...
1. Replaced by PhoneStateListner#onPreciseDataConnectionStateChanged().
2. Remove usage of hidden API SubscriptionManager#getPhoneId()
Bug: 147080692
Test: manual
Change-Id: I6e7c9910ed63e027fc02c1835853175745b31b66
2020-01-14 01:18:50 +08:00
Automerger Merge Worker
c631bf2ef0
Merge "Modify the code logic of OnLayoutChangeListener in Caption preferences" am: 9c79dfb493 am: 658444b986
...
Change-Id: I969cf4b26db7c36917bb4b8741db8ad5833c8d7c
2020-01-13 08:20:54 +00:00
Kevin Chang
01357b5b73
Modify the code logic of OnLayoutChangeListener in Caption preferences
...
Remove the listener and add statement to refresh the text when the caption turns on.
Bug: 142632389
Test: Manual
Change-Id: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
Merged-In: Ic5711309c5b8af9834e5439d825b4cb2ed55fe01
2020-01-13 10:10:36 +08:00
Sarah Chin
5ce99e22ff
Merge "5G meteredness for telephony framework"
2020-01-10 16:36:48 +00:00
changbetty
4bdbd135fb
[Mainline] Use the @SystemApi setAlwaysAllowMmsData in TelephonyManager for mainline
...
Bug: 146309719
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MmsMessagePreferenceControllerTest
Change-Id: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
Merged-In: Ia591e82e1a55f36c98e7b00965532ff0762e1e77
2020-01-10 17:15:09 +08:00