Zoey Chen
7b8e8255cd
Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1" am: 864bd01efe
...
Change-Id: I951346d955f2223fce1b4c88e72cd44a5e33e1a5
2020-02-14 07:01:49 +00:00
Zoey Chen
864bd01efe
Merge "[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager Bug: 145788881 Test: make Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1 Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1"
2020-02-14 06:49:45 +00:00
Automerger Merge Worker
707aeaca7d
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 226ef3d100
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id2f88bf0aa3ce2da5a1666798d1a71e1e20ff62a
2020-02-12 01:22:22 +00:00
Treehugger Robot
226ef3d100
Merge "Import translations. DO NOT MERGE"
2020-02-12 01:12:50 +00:00
Automerger Merge Worker
66864cb891
Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS" am: bc80ff1630
...
Change-Id: I71c32a98356d268d90b8c99345041fedd023b06e
2020-02-11 02:37:24 +00:00
Paul Hu
bc80ff1630
Merge "Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS"
2020-02-11 02:27:00 +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
Automerger Merge Worker
cd27b5b901
Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9
...
Change-Id: I58a086074b45bedb194752973412dc4c1e6cd1ab
2020-02-08 01:48:45 +00:00
Automerger Merge Worker
abf86230e4
DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f
...
Change-Id: I6aca2687101666e27b3a20d0dc54bad50739cfb1
2020-02-08 01:38:43 +00:00
Treehugger Robot
af463b86c9
Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master"
2020-02-08 01:29:23 +00:00
paulhu
08efd36bf2
Launch TetherSettings via Settings.ACTION_TETHER_SETTINGS
...
Bug: 149068177
Test: Build, Flash, manual test.
Change-Id: If01bdeb7f6ea021cc28c462360a969985882348b
2020-02-07 14:42:08 +08:00
zoey chen
9d49a395c3
[Settings] Add permission for #getCdmaRoamingMode and use value from TelephonyManager
...
Bug: 145788881
Test: make
Change-Id: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
Merged-In: Idf237f008af2ab6cab07689f1f2a602f6a98c4f1
2020-02-07 14:31:08 +08:00
Automerger Merge Worker
7425059fc9
Merge "Update profile api" am: 4f4c05addb
...
Change-Id: I8d3010852f55959ea7247b6487e197cd7c67a997
2020-02-07 02:57:38 +00:00
Automerger Merge Worker
f227708d08
Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce
...
Change-Id: I3fdabb38a0056f1b596ba4e1924e2116ba600f74
2020-02-07 02:55:05 +00:00
Treehugger Robot
4f4c05addb
Merge "Update profile api"
2020-02-07 02:46:12 +00:00
Bonian Chen
c2823ab2ce
Merge "[Settings] fix failure test case - ConditionContextualCardController"
2020-02-07 02:40:17 +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
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
Zoey Chen
814b7c40cb
Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace"
2020-02-06 06:11:50 +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
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
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
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
Bonian Chen
ac55b2ca49
[Settings] fix failure test case - ConditionContextualCardController
...
Setup parameters required by CellularDataConditionController
Bug: 148834975
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=ConditionContextualCardControllerTest
Change-Id: I8e0c7435cf18cfdafa39f58697b6d29db34b1867
Merged-In: I974df385d956dbff10aac874487d07d626992e4b
2020-02-04 18:59:53 +08: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
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
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
Bill Yi
be651d3874
Import translations. DO NOT MERGE
...
Change-Id: I5afe4b717cfa2d20b5e78caaf3417b0a161eb62b
Auto-generated-cl: translation import
2020-02-01 15:30:04 -08: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
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
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
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