Peter Wang
66fd9dbad2
Added an option in reset menu in Settings to enable resetting Euicc data
...
only
Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
Merged-In: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
2021-03-17 15:47:48 -07:00
android-build-team Robot
f6d72b2a86
Snap for 7215955 from a5ea519cc6
to rvc-qpr3-release
...
Change-Id: Id4e065ba7537ec61389cf135f2b3d8443e8079c4
2021-03-17 22:06:17 +00:00
Chiachang Wang
d507dc19b1
Replace hidden CM#isNetworkSupported() usage
...
It's a refactor work for connectivity mainline module. The
hidden methods access is no longer allowed, so the usage for
isNetworkSupported() should be replaced. Settings use it to
check if device support telephony, wifi or ethernet service.
There are alternative methods to check if device supports such
features. Replace as it is.
Bug: 172183305
Test: m ; make RunSettingsRoboTests
Change-Id: I8f1d11558b1be575a0777ed195abe027e838cb74
Merged-In: I8f1d11558b1be575a0777ed195abe027e838cb74
2021-03-17 15:22:40 +00:00
SongFerngWang
2166de23f3
Change the behavior of notifyAllowedNetworkTypesChanged.
...
Bug: 180903931
Test: atest AllowedNetworkTypesListenerTest.java
Change-Id: Ic94816415920bf25896ef2b198e228f369039c94
Merged-In: Ic94816415920bf25896ef2b198e228f369039c94
2021-03-17 21:20:21 +08:00
Chiachang Wang
eb16ebd14a
Replace the hidden ProxyInfo methods usage
...
The hidden ProxyInfo methods usage should be replaced because
ProxyInfo is moving to connectivity mainline module. Setting
will not be able to access it. Replace the usage with
corresponding APIs.
Bug: 172183305
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Test: manually update proxy from setting and check the result
Change-Id: I59192d0d5d38c833eb83cc930e358a738ebe3d13
2021-03-17 12:47:22 +00:00
Chiachang Wang
b16da1a9ca
Replace the way to access StaticIpConfiguration
...
StaticIpConfiguration is a part of incoming connectivity
mainline module. The hidden variable is not accessible for
module outside. The caller should use getter and builder
to access it. Replace the usage with the formal way.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
com.android.settings.wifi.WifiConfigController2Test
Change-Id: I2ccd427ba19a4ec7df863c38ee0b34cf0be87fa5
2021-03-17 11:30:11 +00:00
Lucas Lin
5c73826020
Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d
am: ddbd32432e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939
Change-Id: I1e1a332f52f0dff1dda585912e5cc41ab5296156
2021-03-17 07:20:45 +00:00
Lucas Lin
ddbd32432e
Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939
Change-Id: I2492c9b4e7bb5b34ad6b3719525e8b00433d2778
2021-03-17 07:02:17 +00:00
Lucas Lin
5ee7a7d07d
Merge "Change the parameter type from ContentResolver to Context"
2021-03-17 06:35:21 +00:00
Bonian Chen
49cdb602ea
[Settings] Support getSystemService(Class<T>)
...
Add getSystemService(Class<T>) to align the capability with framework
part.
Bug: 179640862
Test: local
Change-Id: I278951c2402aa8551cee37923f45626ab1830dd3
2021-03-17 13:32:32 +08:00
TreeHugger Robot
2bec77689e
Merge "Only display single line for title" into rvc-qpr-dev am: a5ea519cc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13849828
Change-Id: I8972ff3ca02d7ebd435f65a8eef5228b9a20fbc5
2021-03-16 23:54:35 +00:00
TreeHugger Robot
a5ea519cc6
Merge "Only display single line for title" into rvc-qpr-dev
2021-03-16 23:29:09 +00:00
Bonian Chen
d42d9a41f6
Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02
am: c27980c1a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941
Change-Id: I8efdc871c29a6c56aacf7a1b553a20c9cafc765d
2021-03-16 14:45:42 +00:00
Bonian Chen
c27980c1a9
Merge "[Settings] Code refactor - remove unused import lines" am: d248042a02
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639941
Change-Id: I365757ae7bb17cabb39e377eb23aaf4ac97013b9
2021-03-16 14:09:39 +00:00
Bonian Chen
d248042a02
Merge "[Settings] Code refactor - remove unused import lines"
2021-03-16 13:47:28 +00:00
Bonian Chen
203f0fe89d
[Settings] Code refactor - remove unused import lines
...
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style
Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
lucaslin
11e738c3a0
Change the parameter type from ContentResolver to Context
...
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.
Bug: 172183305
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=PrivateDnsModeDialogPreferenceTest
Change-Id: I6c06460b67f81112db311f0739457d5f1e2e4554
Merged-In: I6c06460b67f81112db311f0739457d5f1e2e4554
2021-03-16 09:36:12 +00:00
Lucas Lin
e30a49423b
Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889
am: 73c971a5af
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I6ae6e3f272c275ee3590328aa6039e2b995859c4
2021-03-16 08:46:30 +00:00
Lucas Lin
73c971a5af
Merge "Use getPrivateDnsMode() to get the value of private DNS" am: 159f261889
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620600
Change-Id: I2ce646a34a7fc521b42c221faadfe6779f1c5ca4
2021-03-16 08:06:34 +00:00
Lucas Lin
159f261889
Merge "Use getPrivateDnsMode() to get the value of private DNS"
2021-03-16 07:39:35 +00:00
android-build-team Robot
4e81944767
Snap for 7208305 from 5f062373bd
to rvc-qpr3-release
...
Change-Id: I913d530b862f26a943c930d0b8d66950cbc12665
2021-03-15 15:58:39 +00:00
Treehugger Robot
f21b7ac120
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
am: c38b502c4a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2ab0c8c81b6ba25a32bd41437c6a37cda9fc0e9
2021-03-15 12:12:13 +00:00
Treehugger Robot
c38b502c4a
Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4d177c825df890a2d8947173e85ddd401e9f7361
2021-03-15 11:30:18 +00:00
Treehugger Robot
56834d2ce3
Merge "Add OWNER to network/datausage/wifi path"
2021-03-15 11:02:28 +00:00
Chiachang Wang
4589965ebd
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
am: 201429b683
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib0118ce1ed80dd4b672e98f8a7a905d42462f24f
2021-03-15 10:51:50 +00:00
Chiachang Wang
201429b683
Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d7e876c9fb8bf81a300b6b76154672e0d3b04c7
2021-03-15 10:14:46 +00:00
Chiachang Wang
d709b55250
Merge "Replace the hidden getActiveLinkProperties usage"
2021-03-15 09:42:16 +00:00
Chiachang Wang
fd1fa9c0a8
Replace the hidden getActiveLinkProperties usage
...
It's a refactor work to remove the hidden connectivity method
usages outside the incoming connectivity module.
CM#getActiveLinkProperties is hidden and no longer supported
outside the module. Caller should replace it with
CM#getLinkProperties(Network), so replace the usage as it is.
Bug: 172183305
Test: m
Change-Id: I20bcc9da97113da352e43a87d029596c9729cad8
2021-03-15 09:07:48 +00:00
Bill Yi
62fd4e850b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f062373bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13868209
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4f9a496b81acc2f2f31dab8546d6f2add2db1f75
2021-03-15 07:02:44 +00:00
Betty Chang
ebea5200cb
Add OWNER to network/datausage/wifi path
...
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
2021-03-15 06:39:14 +00:00
Jeremy Goldman
22b94fb3fd
Add goldmanj to the Settings' vpn2 directory Owners file
...
Change-Id: I91f560230a5dde1014a18c3d3bd03d1ed6f91dd6
2021-03-15 03:20:32 +00:00
Bill Yi
5f062373bd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9c6912b3ddd71aeecf639f628f15d04723ffea1d
2021-03-14 19:39:14 +00:00
Tsung-Mao Fang
121041cf58
Only display single line for title
...
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.
Change-Id: Ifc3cc689a221830c6687b7d69cf86f1ed7f2d698
Test: Built the apk and saw single line title.
Bug: 169936038
Merged-In: I0c9d80273ed752c5a83afcad18d67400bcfc1618
2021-03-12 08:34:57 +00:00
android-build-team Robot
5ac499d349
Snap for 7201919 from 36288fc240
to rvc-qpr3-release
...
Change-Id: Ibaca36b612480ca8dcad2deb16ffcf9aa7f04e2a
2021-03-11 23:06:24 +00:00
TreeHugger Robot
9444cfa8cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 36288fc240
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13830592
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8b19a631d045bb90a6e9fb2205e5256b163a6028
2021-03-11 19:25:43 +00:00
TreeHugger Robot
d3faa11064
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: f6ba91f322
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835675
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I096c84edb684d619d339a541ee249f556eca944f
2021-03-11 19:25:32 +00:00
TreeHugger Robot
36288fc240
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-11 18:43:56 +00:00
TreeHugger Robot
f6ba91f322
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-11 18:42:47 +00:00
Andras Kloczl
8210550151
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-s ours am: cb10105fe1
-s ours am: 601902f3dc
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2d2861dafde2d11d39741db7189d6586542d6851
2021-03-11 11:37:15 +00:00
András Klöczl
a1e59f0a6a
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours am: e690821501
-s ours am: fca809b408
-s ours am: 5715f4301e
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a4f9d1b918a7d406383472636f6ec519c1b5a8c
2021-03-11 11:37:07 +00:00
Andras Kloczl
fb94b7d113
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80
-s ours am: c40b15712c
-s ours am: a95829294d
-s ours am: 7c4f563b62
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icf18ccc315b62ea33a38e5786b3962d1da50635f
2021-03-11 11:36:57 +00:00
Andras Kloczl
601902f3dc
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-s ours am: cb10105fe1
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85f497897bd66a1b6072999de4d60e1a1f561461
2021-03-11 11:17:38 +00:00
András Klöczl
5715f4301e
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours am: e690821501
-s ours am: fca809b408
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icde46b453814ccc365535520ce454fc7aa377054
2021-03-11 11:17:30 +00:00
Andras Kloczl
cb10105fe1
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours am: 4f095b1a6b
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I668e9b33db1da19a9c8f3962df55354887d07309
2021-03-11 10:59:57 +00:00
András Klöczl
fca809b408
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours am: e690821501
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idb18b517ec93e78c3a32d2276948703764387350
2021-03-11 10:59:37 +00:00
Andras Kloczl
7c4f563b62
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80
-s ours am: c40b15712c
-s ours am: a95829294d
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1c849158caa489631927a805e3891a623213beeb
2021-03-11 10:59:34 +00:00
Andras Kloczl
4f095b1a6b
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours am: b21072b773
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If83710ea2b67104d3f3cbc1ce55f32ed129770cf
2021-03-11 10:42:24 +00:00
András Klöczl
e690821501
[automerger skipped] Merge "Prevent using invalid result uri during multi user image change" into pi-dev am: f1125282f9
-s ours am: 28539c02dd
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816456
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2052e3022c61172aac54fb1855d500eb3f0755a
2021-03-11 10:42:15 +00:00
Andras Kloczl
a95829294d
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80
-s ours am: c40b15712c
-s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4017e71f1c6b9f6a1eee1cde5d8c3534fa4a4ed5
2021-03-11 10:42:06 +00:00
Andras Kloczl
b21072b773
[automerger skipped] Prevent using invalid result uri during multi user image change am: 6746add669
-s ours am: 94ed37dacf
-s ours
...
am skip reason: Change-Id I258c305f825da94474c8027828e3b9707b463699 with SHA-1 9c0024f455
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13816457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41fd0e7c9aaef6aa0f4d0784ba916612f95e89dc
2021-03-11 10:28:53 +00:00