Automerger Merge Worker
07f9393486
Add whitelist in ResetAppsHelper am: 74ded43527
...
Change-Id: I8d784426362d6e9d523b262c25ef2d3c663f3373
2020-02-06 06:03:18 +00:00
Automerger Merge Worker
d4a5fc58c6
Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de
am: 374153a5cc
...
Change-Id: Ibc8da453623946b48b0b0cb8b9ad05295a1ad80c
2020-02-05 12:47:00 +00:00
Automerger Merge Worker
374153a5cc
Merge "Add TEST_MAPPING to schedule auto test" am: 5c262a92de
...
Change-Id: I39ce2533de78c0529c8a705f173303e713b51cb6
2020-02-05 12:37:30 +00:00
Treehugger Robot
5c262a92de
Merge "Add TEST_MAPPING to schedule auto test"
2020-02-05 12:22:33 +00:00
Raff Tsai
55422c7517
Add TEST_MAPPING to schedule auto test
...
Test: atest :postsubmit
Change-Id: Ied8e241ef223ea5e87ca6ee0f04f4128c51ddb87
Merged-In: I0847d1dea352d0e3b87b1bb95d5c2600a80a7438
2020-02-05 10:40:01 +00:00
Automerger Merge Worker
8ef20ea9c5
Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e
am: 5437a80536
...
Change-Id: I82d301a58cb8ea8234f2d4924123a07a3f02b784
2020-02-05 00:24:12 +00:00
Automerger Merge Worker
00e44f608c
Add Platform VPNs to VPN list am: bcd6b8cbca
am: 846de91c30
...
Change-Id: Ice85a8a0c5b526f67a56e004e3b2d3092076c658
2020-02-05 00:24:10 +00:00
Automerger Merge Worker
5437a80536
Merge changes from topic "platform-vpn-user-consent" am: e9b3f3303e
...
Change-Id: Ia6cd10ee5a8d78f6002874f69d08ed53a3013572
2020-02-05 00:07:43 +00:00
Automerger Merge Worker
846de91c30
Add Platform VPNs to VPN list am: bcd6b8cbca
...
Change-Id: Ic6e288d2e4b9634ad7a050361b309fab212e6520
2020-02-05 00:07:40 +00:00
Benedict Wong
e9b3f3303e
Merge changes from topic "platform-vpn-user-consent"
...
* changes:
Update setVpnPackageAuthorization call with VPN type
Add Platform VPNs to VPN list
2020-02-04 23:56:16 +00:00
Benedict Wong
62e55361a8
Update setVpnPackageAuthorization call with VPN type
...
This commit updates the Settings to also pass the additional
VPN type for app-based VPNs.
Bug: 144246835
Test: Compiles, manually tested to be working
Change-Id: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
Merged-In: I10cf17419636c3c30e1ec06bb3e6751cb5c65d9b
2020-02-04 21:06:07 +00:00
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
Sunny Shao
74ded43527
Add whitelist in ResetAppsHelper
...
- Add "com.android.systemui" and "com.android.vending" into the whitelist.
- Add "com.android.providers.downloads" and "android" into the whitelist.
- Do not data clear in the whitelist.
Fixes: 147124412
Test: manual test
Change-Id: Ie2f527309f9159babe79636a69ff13fe3ceb64d9
Merged-In: Ie2f527309f9159babe79636a69ff13fe3ceb64d9
(cherry picked from commit b54d2f90f2
)
2020-01-30 22:19:05 +08:00
Neil Fuller
45834d96a8
Merge "Tidy up libcore.timezone APIs"
2020-01-30 11:25:35 +00:00
Benedict Wong
bcd6b8cbca
Add Platform VPNs to VPN list
...
This change allows the Settings VPN pages to pull the apps providing a
new Platform VPN.
Bug: 144246835
Test: Compiles, manual testing
Change-Id: Ibb7e79ccde754724c9fc00c88da98e975f325ba7
2020-01-30 01:46:19 -08: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
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
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
Change-Id: I865a04f4453fc0304ddc3daf9be47ebf2e8a1c3c
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
Change-Id: I56cb47ccfe8278e722556fb6f9d4d08f0ac35d52
2020-01-20 05:25:45 -08:00