Automerger Merge Worker
36bc7f92b1
Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e am: 4a121f066c
...
Change-Id: Ie77bbc3fe379e11bb87b5af9ff8fdf424f503008
2020-02-08 05:07:12 +00:00
Automerger Merge Worker
4a121f066c
Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea9e
...
Change-Id: I90ba1b6e6f530b069d504a045d7832a8cf9e5833
2020-02-08 04:46:59 +00:00
Zoey Chen
5503c8ea9e
Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager"
2020-02-08 04:25:32 +00:00
Treehugger Robot
af463b86c9
Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master"
2020-02-08 01:29:23 +00:00
Automerger Merge Worker
b29e64ace1
Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969
...
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
2020-02-07 12:54:50 +00:00
Automerger Merge Worker
9e876f6919
Merge "Update profile api" am: 4f4c05addb am: 7425059fc9
...
Change-Id: I40d4b126bda90a0bc5725325f84b15c99823dcdc
2020-02-07 03:11:42 +00:00
Automerger Merge Worker
7425059fc9
Merge "Update profile api" am: 4f4c05addb
...
Change-Id: I8d3010852f55959ea7247b6487e197cd7c67a997
2020-02-07 02:57:38 +00:00
Treehugger Robot
4f4c05addb
Merge "Update profile api"
2020-02-07 02:46:12 +00:00
Automerger Merge Worker
403ab5da4d
Merge "Refactored cell broadcast area info support" am: c36cc4e120 am: 62480277ed
...
Change-Id: Ibb2f1dd5e007a78ab77dab21f086749df3a5a9cf
2020-02-06 17:40:08 +00:00
Automerger Merge Worker
62480277ed
Merge "Refactored cell broadcast area info support" am: c36cc4e120
...
Change-Id: Ib1648fc64bc12d11b889468cd6a6c5c4ff09f0c2
2020-02-06 17:26:15 +00:00
Jack Yu
c36cc4e120
Merge "Refactored cell broadcast area info support"
2020-02-06 17:17:49 +00:00
SongFerngWang
b5dcd35969
Bug:PreferredNetworkModePreferenceController.java not being refreshed
...
Bug: 146594872
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
Change-Id: Ic3579e630c1d9422d7105a2d8fb619409a5823d6
Merged-In: Ib5cc06cdbfd2fa70cd115d70337b21500e362da6
2020-02-06 17:11:48 +08:00
Automerger Merge Worker
139c108a03
Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb am: 23fab9be21
...
Change-Id: I7fa1fa40e29f0eccdc05fff69ef4b0c17da3b3e1
2020-02-06 06:33:53 +00:00
Automerger Merge Worker
23fab9be21
Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace" am: 814b7c40cb
...
Change-Id: I42233960cd715d506fc899f845ba7818a56e6886
2020-02-06 06:19:24 +00:00
Automerger Merge Worker
07f9393486
Add whitelist in ResetAppsHelper am: 74ded43527
...
Change-Id: I8d784426362d6e9d523b262c25ef2d3c663f3373
2020-02-06 06:03:18 +00:00
hughchen
4d94a32482
Update profile api
...
The profile will auto connect / disconnect when set enable / disable
profile. This CL remove connect / disconnect method.
Bug: 141582844
Test: make -j42 RunSettingsRoboTests
Change-Id: Ib875d126be0d8483fb539e7ba950242a4f38cf81
Merged-In: Ib875d126be0d8483fb539e7ba950242a4f38cf81
2020-02-06 11:20:09 +08:00
Xin Li
8c472e240f
DO NOT MERGE - Merge QQ1A.200205.002 into master
...
Bug: 147428392
Change-Id: I37f2fe376d2feaf5e6e3e640c3eef6bb42f14c52
2020-02-05 10:45:13 -08:00
Jack Yu
98973e3ba1
Refactored cell broadcast area info support
...
Area info cell broadcast messages are not handled
by cell broadcast receiver anymore. Instead, they will
be processed in cell broadcast service. Privileged apps
that are interested in getting the information will need
to get it directly from cell broadcast service.
Note this is only enabled for certain countries and carriers.
Test: Manual
Bug: 141318859
Merged-In: If6a0a0c6a76e8b90a8feaea1e2771993e2d0edfe
Change-Id: If6a0a0c6a76e8b90a8feaea1e2771993e2d0edfe
(cherry picked from commit c4da22a2ce )
2020-02-04 20:42:43 -08:00
zoey chen
d54004f45e
[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace
...
Bug: 145967955
Test: make
Change-Id: I8b948d1d416e1eb79e34be073b8ad81645d5ebb1
Merged-In: I8b948d1d416e1eb79e34be073b8ad81645d5ebb1
2020-02-05 12:04:22 +08: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
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
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