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
2759bebf32
[automerger skipped] Import translations. DO NOT MERGE am: d41b716f6c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I1c94527f6a741b5e036635c0b89c9e86148c0b1d
2020-02-09 03:24:35 +00:00
Bill Yi
d41b716f6c
Import translations. DO NOT MERGE
...
Change-Id: I802d73dcc63414bed8b9b5bba8ff87ad38c22ebc
Auto-generated-cl: translation import
2020-02-08 01:07:28 -08:00
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
Automerger Merge Worker
c8e044de48
Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: af463b86c9
am: cd27b5b901
...
Change-Id: I07988bb74d92486adfddb88142c0b3f92d2110ba
2020-02-08 01:57:10 +00:00
Automerger Merge Worker
b946cbd92c
DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8c472e240f
am: abf86230e4
...
Change-Id: Id79f92e9ea099ca850428be4748f24cd28ea30e0
2020-02-08 01:55:27 +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
Rafael Matias de Lima
9ddd3445f0
Fix for User edit info dialog during rotation
...
[issue]
1. Go to Settings > System > Multiple users;
2. Edit user info;
3. Take a picture in portrait mode;
4. Turn the device to landscape mode;
Observe selected image is not retained;
[rootcause]
Fragments no longer need to check if the dialog
is showing up during onSaveInstanceState.
[test]
1. Edit user info;
2. Select a picture;
3. Turn the device to landscape mode;
2020-02-07 11:35:48 -03:00
Automerger Merge Worker
b29e64ace1
Bug:PreferredNetworkModePreferenceController.java not being refreshed am: b5dcd35969
...
Change-Id: Ib2e8c6b3249a1137559fa9259348dcf26b7d8a0e
2020-02-07 12:54:50 +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
9e876f6919
Merge "Update profile api" am: 4f4c05addb
am: 7425059fc9
...
Change-Id: I40d4b126bda90a0bc5725325f84b15c99823dcdc
2020-02-07 03:11:42 +00:00
Automerger Merge Worker
42d5890a96
Merge "[Settings] fix failure test case - ConditionContextualCardController" am: c2823ab2ce
am: f227708d08
...
Change-Id: I3dc450cb4a91c496e6a7c8306e4cd4a6b4a19a5b
2020-02-07 03:11:15 +00: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
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
Zoey Chen
814b7c40cb
Merge "[Settings] Cannot use UnsupportedAppUsage API, use #hasIccCard() to replace"
2020-02-06 06:11:50 +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
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
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
Christopher Tate
4a89abe279
DO NOT MERGE - Track framework changes to crashApplication API
...
Bug: 128649910
Bug: 140108616
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Change-Id: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
2020-02-04 17:48:06 -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
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
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