Commit Graph

71433 Commits

Author SHA1 Message Date
Chiachang Wang
195a75e47e Update getMobileProvisioningUrl to telephony surface
ConnectivityService is going to become mainline and can not
access hidden APIs. The mobile provisioning url is used by
telephony and it will use the hidden xml parsing APIs. It also
would make more sense to have the parsing inside telephony code.
Thus, move getMobileProvisioningUrl parsing to telephony surface
from ConnectivitySerivce and update the corresponding callers.

Bug: 175177794
Test: m and verify the url could be read successfully from the
      telephony surface
Change-Id: Ie8b46bc9b652f926277b10e36a86adba4dbd0121
2020-12-23 02:06:24 +00:00
Diego Vela
a2e406ed85 Merge "Revert^2 "Add <uses-library> information."" 2020-12-14 22:09:58 +00:00
Diego Vela
1ef19adf52 Revert^2 "Add <uses-library> information."
7f1950928f

Change-Id: I8d3d6fee8e5a2b6eb337abb53f21b9b909b007c9
2020-12-14 22:05:04 +00:00
Diego Vela
54b741096b Merge "Revert "Add <uses-library> information."" 2020-12-14 21:49:14 +00:00
Diego Vela
7f1950928f Revert "Add <uses-library> information."
Revert submission 1427961-uses-libs-23

Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.

Change-Id: If1ca723c357ba3e8d9343fbb0f5d980d1e7ca1fb
2020-12-14 21:14:24 +00:00
Ulyana Trafimovich
4bb99a788a Merge "Add <uses-library> information." 2020-12-10 10:19:15 +00:00
Xin Li
6e252c4cd5 Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:22 +00:00
Xin Li
540fd7333f DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: Id2d9c4f56beae280e6299b6695185577a1521345
Change-Id: Ice3069b89e1a47121d1920aa3e45fbddbed5678e
2020-12-08 23:49:38 -08:00
Ulya Trafimovich
202ca49dfe Add <uses-library> information.
The required <uses-library> "org.apache.http.legacy" is in the manifest
for Settings. It is necessary to explicitly add it to `uses_libs`
because it is not among the app dependencies (so Soong does not add it
automatically to the manifest_fixer). It also doesn't add it as a
compatibility library because the target API level for the app is not
below 28.

Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Test: m out/soong/.intermediates/packages/apps/Settings/Settings/android_common/manifest_check/AndroidManifest.xml
Test: m out/soong/.intermediates/packages/apps/Settings/tests/robotests/SettingsRoboTestStub/android_common/manifest_check/AndroidManifest.xm
Change-Id: Id5d5fe1dff68cf6fce667a00e35710cf0e667d02
2020-12-08 12:09:53 +00:00
Xin Li
07ccb42665 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
Change-Id: Id2d9c4f56beae280e6299b6695185577a1521345
2020-12-07 00:39:43 -08:00
Xin Li
835215964f DO NOT MERGE - Mark RQ1A.201004.001 as merged
Bug: 172690556
Change-Id: I32dff08f7cea0c4e645c653d1b63945b775b1078
2020-12-06 14:43:21 -08:00
Treehugger Robot
11b0105b98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1518870

Change-Id: Iafacdf7b241ac8c7f4aa65861f885868bc4578dc
2020-12-06 16:38:51 +00:00
TreeHugger Robot
e5350c9e20 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-06 16:22:59 +00:00
Treehugger Robot
4d181cc04f Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 16:05:53 +00:00
Treehugger Robot
7c2ed6be16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229

Change-Id: I215cb3c7612b323dd67437d31dfee850b8a12227
2020-12-06 15:48:44 +00:00
Treehugger Robot
97bc1fcff7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-06 15:36:04 +00:00
Bill Yi
10caa304c0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6e8d356f279ba834c5493badcb5a0f8e7b916c6c
2020-12-06 12:37:23 +00:00
Bill Yi
b9a5248b95 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I518f13a32c239dfc98b053ad002d31577cd41a9a
2020-12-06 12:10:17 +00:00
Bill Yi
a815a12c40 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I267bdda4fe2a243d548b1842e9a08950e61069c0
2020-12-05 16:49:34 -08:00
TreeHugger Robot
448ec6b5fe Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-12-05 01:04:28 +00:00
Bill Yi
d890249a20 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I106d32515484c4ad081b1a0bc2bf01d79b5097ad
2020-12-04 03:58:02 -08:00
Bill Yi
d0f3a4ca19 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2d0e585779a9e28de3aeb1eb8ca3246a09b717d4
2020-12-04 03:09:46 -08:00
Xin Li
cec81e3030 Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: Iafcefc2aa64cf3c50b1d139ec0204a315be29da7
Change-Id: I5d4e70fe723d890b5694c3490d6ec841b1ac596e
2020-12-02 00:29:15 -08:00
Treehugger Robot
0cf0f58ceb Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." am: 4f8b47e5c2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1515029

Change-Id: Ib92cfdb77164a7b24e65b2a028f963b606144096
2020-12-01 02:41:37 +00:00
Treehugger Robot
4f8b47e5c2 Merge "Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class." 2020-12-01 01:59:21 +00:00
Joseph Murphy
6d78a33475 Makes this class abstract so that Tradefed's automatic search for runnable test classes doesn't get confused by this class.
Bug: b/174168302
Change-Id: I765e3f6c7f8ef2f2734862e75513e73353fea4c0
2020-12-01 00:25:00 +00:00
Bonian Chen
d9ba9cf45b Merge "[Settings] Reduce the operation of VoLTE config redraw" am: 967311df7f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510918

Change-Id: I84f2911036c321bb2129e4df82125c9fe3b54bc7
2020-11-26 08:24:12 +00:00
Bonian Chen
80a69cb5e0 Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" am: 3c934b2859
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1510917

Change-Id: I3c19b17b3daa801a4fac4f4cb5742113e3602ba5
2020-11-26 08:23:25 +00:00
Bonian Chen
967311df7f Merge "[Settings] Reduce the operation of VoLTE config redraw" 2020-11-26 07:35:21 +00:00
Bonian Chen
3c934b2859 Merge "[Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case" 2020-11-26 07:35:00 +00:00
Bonian Chen
f9256b41f2 [Settings] Reduce the operation of VoLTE config redraw
There're 3 VoLTE configuration UIs sharing the same configuration,
but only 1 of them will be displayed.

The 3 classes extending Enhanced4gBasePreferenceController are:
1. Enhanced4gAdvancedCallingPreferenceController
2. Enhanced4gCallingPreferenceController
3. Enhanced4gLtePreferenceController
They're different in the value of getMode().

The design within Enhanced4gBasePreferenceController only allows to show one of them.
Which means, the other two don't need to register for PhoneStateListener and should ignore actions in response to it when receiving callback from PhoneStateListener.

Through detecting the VoLTE configuration mode, some operations could be
avoided.
This fix is targeting to avoid these operations from happening.

Bug: 172987488
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I56d4900b5bcb189693c99e870b013da97ed283db
(cherry picked from commit d2e22f4cee)
Change-Id: I92e4b84b81622548fb356a4c7af99668bd2a9e00
2020-11-26 14:18:25 +08:00
Bonian Chen
9769677a3c [Settings] Add voice call status and VoLTE mode detection into VoLTE UI test case
1. VoLTE UI should gray out during voice call.
2. UI should be invisible when VoLTE mode mismatch.

Bug: 172781455
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
Merged-In: I8b6a212dc727f1ab78f4dd280cb41966b7054180
(cherry picked from commit 227329b2f7)
Change-Id: I1bd239b6434038323a0689e2bc3bf05182bfcd45
2020-11-26 13:52:47 +08:00
Treehugger Robot
6e347e61ca Merge "Fix unexpected highlight" am: e763da5884
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1490657

Change-Id: I421b2f253178e9adba05fc4ada6a5b7d2e9498f4
2020-11-25 10:19:53 +00:00
Treehugger Robot
e763da5884 Merge "Fix unexpected highlight" 2020-11-25 09:00:54 +00:00
Sarah Chin
690de7e76e Merge "Update ICC lock API methods" am: bf2a6d1e11
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478

Change-Id: Ia11d5dd7bd456bb0bc51078aeee97a166ca39e77
2020-11-23 18:17:48 +00:00
Sarah Chin
bf2a6d1e11 Merge "Update ICC lock API methods" 2020-11-23 17:50:19 +00:00
Sarah Chin
04b9046ec6 Merge "Update setCdmaRoaming/SubscriptionMode APIs" am: b26cf2d260
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506517

Change-Id: I5d299e2907e204ffccbe898eef0c508b1e518bb0
2020-11-20 03:33:18 +00:00
Sarah Chin
b26cf2d260 Merge "Update setCdmaRoaming/SubscriptionMode APIs" 2020-11-20 02:45:35 +00:00
Sarah Chin
e962520266 Update ICC lock API methods
Test: atest TelephonyManagerTest
Bug: 171884262
Change-Id: Ia4ba222dfa7d7756a3675f75b3467d0265967516
Merged-In: Ia4ba222dfa7d7756a3675f75b3467d0265967516
2020-11-19 15:04:12 -08:00
Sarah Chin
ce9fda5a60 Update setCdmaRoaming/SubscriptionMode APIs
Test: atest TelephonyManagerTest
Test: make RunSettingsRoboTests
Bug: 171884158
Bug: 171883908
Change-Id: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
Merged-In: Ib78149c41612d56a46974621eb71b5e0cfe97c5a
2020-11-19 14:46:37 -08:00
Sarah Chin
4928687552 Merge "Update signal strength on ServiceState in service" am: 3169b21b4e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1505031

Change-Id: I33153c2891cd16bd4f4cb2d5e792aa20154226b9
2020-11-19 09:40:30 +00:00
Sarah Chin
3169b21b4e Merge "Update signal strength on ServiceState in service" 2020-11-19 09:17:18 +00:00
Sarah Chin
99aad232be Update signal strength on ServiceState in service
Test: make RunSettingsRobotTests
Bug: 167643728
Change-Id: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
Merged-In: Ibf69f9e9ec2acafef1316069d37b8d2a27d7d4d7
(cherry picked from commit 3b3704d693)
2020-11-19 00:11:36 -08:00
Taesu Lee
ed51eed0c3 Fix unexpected highlight
Check a key of preferences also.

Bug: 172699068
Test: Manual
      make RunSettingsRoboTests
      ROBOTEST_FILTER=HighlightablePreferenceGroupAdapterTest

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I9bb0ea68de0ab1bcc2134345905644d869f69e28
2020-11-13 15:07:04 +09:00
Tobias Thierer
7a8b3a140e Merge "Fix malformed OWNERS." am: b460d47489
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1495947

Change-Id: I7d6c0fa35036ac7d0ac130c0b96fbb181f29aa9d
2020-11-11 21:06:20 +00:00
Tobias Thierer
b460d47489 Merge "Fix malformed OWNERS." 2020-11-11 20:46:05 +00:00
Tobias Thierer
6b3df1be9e Fix malformed OWNERS.
Per go/android-owners, include directions should be of the form
[gerrit_project_name]:[absolute_path_to_included_file].

Exempt-From-Owner-Approval: Only editing OWNERS file that ought
to be owned by ourselves, anyway.

Bug: 159055442
Test: Treehugger
Change-Id: I9130985b484349264f1fc42c320e93b2bc672a59
2020-11-11 20:45:53 +00:00
Treehugger Robot
3cda0e9872 Merge "Fix crash on "Connection preferences"" am: b75c952800
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157

Change-Id: I329bb9cb76f9dddd02c3d339a7fc450f0e0b5698
2020-11-04 08:40:13 +00:00
Treehugger Robot
b75c952800 Merge "Fix crash on "Connection preferences"" 2020-11-04 08:14:27 +00:00
Hugh Chen
eda6d60e05 Fix crash on "Connection preferences"
This CL adds a null check condition to avoid crash for
some device not support PrintManager.

Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763
2020-11-03 11:02:38 +08:00