Colin Cross
d7f340d5b2
Merge "Build Settings-robo-testutils for use by SettingsGoogleRoboTests" into rvc-qpr-dev-plus-aosp
2021-02-23 04:12:50 +00:00
Colin Cross
81062029dd
Merge "Export proguard.flags, manifest and sources for use by SettingsGoogle" into rvc-qpr-dev-plus-aosp
2021-02-23 04:12:50 +00:00
Colin Cross
38d3b0fa18
Export proguard.flags, manifest and sources for use by SettingsGoogle
...
This relands I3d2f042a9ebf4a6f551449904eb77a34f637f28f.
Bug: 175124789
Change-Id: I1cc3796f31e7db3d8f062436ebc618d93db19822
Test: m SettingsGoogle
Test: m RunSettingsGoogleRoboTests
2021-02-19 19:08:36 +00:00
Colin Cross
dc7bc483a3
Build Settings-robo-testutils for use by SettingsGoogleRoboTests
...
This relands I385629c5c958e94ea289e88b0e65eb005006f4e3.
Bug: 175124789
Change-Id: Ib2cb9f4e080f4de6313d7dba3185709fd60130b7
Test: m RunSettingsGoogleRoboTests
2021-02-19 19:08:17 +00:00
Adam Bookatz
227d74be02
Merge "Update new owners for battery pages." am: c2c5de6199
am: 9e3bb7026c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7f02e3d702a6e0aa9425d8a1dd973d33ea3aa89
2021-02-19 18:57:56 +00:00
Adam Bookatz
9e3bb7026c
Merge "Update new owners for battery pages." am: c2c5de6199
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1595832
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1177d1ceb9c73e18bc203267931021bc908a8221
2021-02-19 18:18:50 +00:00
Adam Bookatz
c2c5de6199
Merge "Update new owners for battery pages."
2021-02-19 17:26:50 +00:00
Treehugger Robot
fef782861a
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
am: 00eaf3f7e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2792e10c7808d9a0d31c8b7136d60c594c4b2abf
2021-02-19 09:18:02 +00:00
Lorenzo Colitti
e584f62ac4
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef
am: 9e072f09a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09ebb58281e60c246550426b2b962a4dce6b72ad
2021-02-19 09:16:56 +00:00
Treehugger Robot
00eaf3f7e0
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1581223
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic7975ae92fa2be360b20dfc4d18f4ad9af789ebe
2021-02-19 09:04:14 +00:00
Treehugger Robot
b086fed657
Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON"
2021-02-19 08:53:56 +00:00
Lorenzo Colitti
9e072f09a0
Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie4310decabc5f997e79a736b82581b8b47ed8b0d
2021-02-19 08:27:04 +00:00
Lorenzo Colitti
be4a0e84ef
Merge "Reset VPN settings by calling VpnManager."
2021-02-19 08:04:53 +00:00
Bob Badour
cfcf58354c
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5
am: 358e0966fc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b93f42c5d78ce53819da38574f3b0433cc0efe6
2021-02-19 02:25:25 +00:00
Bob Badour
358e0966fc
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1b8c547ca8fd066ab2a826e7dc9b53356fb811b
2021-02-19 00:58:34 +00:00
Adam Bookatz
0ea873ea3d
Update new owners for battery pages.
...
Change-Id: Ic1c1eca0af6b76da7774428018ea405657c4bae1
Test: N/A
Merged-In: I330d074c6e504493abf4cece51199ec5851b5d3b
2021-02-18 23:57:35 +00:00
Bob Badour
7d8e27cbb5
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings"
2021-02-18 23:43:49 +00:00
Treehugger Robot
d558605aeb
Merge changes I62c58967,I1dd57fa2 am: 20e39131c9
am: 72b557ac6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I216766fc245cdefacda920dcdde56c0d50f6d6b6
2021-02-18 17:09:56 +00:00
Lorenzo Colitti
927ff0169f
Stop using ConnectivityManager for VPNs. am: 1434c08600
am: cd7a7d20a1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie612e6ca5f73330b99f64054a718500647100f42
2021-02-18 17:09:55 +00:00
Treehugger Robot
72b557ac6a
Merge changes I62c58967,I1dd57fa2 am: 20e39131c9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1593774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibae0be639bd6f0a4af5cc108d750c5f77321e6d7
2021-02-18 16:53:39 +00:00
Lorenzo Colitti
cd7a7d20a1
Stop using ConnectivityManager for VPNs. am: 1434c08600
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I963c04fcf90280bc96a5daa8170dad772a5db955
2021-02-18 16:53:28 +00:00
Treehugger Robot
20e39131c9
Merge changes I62c58967,I1dd57fa2
...
* changes:
Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
Stop using ConnectivityManager for VPNs.
2021-02-18 15:47:13 +00:00
Lorenzo Colitti
b5ea7d584e
Reset VPN settings by calling VpnManager.
...
Currently, ConnectivityManager#factoryReset calls
VpnManager#factoryReset. Call the VpnManager method directly so
it can be removed from ConnectivityManager.
Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I7c702a627cd448dbde40e0d885fbc570ecd1e55d
2021-02-18 23:51:11 +09:00
Lorenzo Colitti
65128bab08
Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
...
It is only used in GlobalHttpPreferenceController. Move it there.
Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
Merged-In: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 23:51:11 +09:00
Lorenzo Colitti
1434c08600
Stop using ConnectivityManager for VPNs.
...
These methods have all moved to VpnManager.
Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
Merged-In: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 23:50:59 +09:00
TreeHugger Robot
af061ae9e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c27fab1d5e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13559497
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I061359a6ab7e65349f93ef6b0ebc5dd145623217
2021-02-13 18:32:45 +00:00
Bill Yi
d3ee559603
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: acf789f35a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13561669
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4676a7e5b838ff558ecd79f3ea1e3f2159c7048d
2021-02-13 18:32:38 +00:00
TreeHugger Robot
c27fab1d5e
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-02-13 17:54:17 +00:00
Bob Badour
6695ff84d9
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings
...
Added SPDX-license-identifier-Apache-2.0 to:
Android.bp
protos/Android.bp
tests/anomaly-tester/Android.bp
tests/perftests/Android.bp
tests/robotests/Android.bp
tests/uitests/Android.bp
tests/unit/Android.bp
tests/unit/InstrumentedEntitlementApp/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c
2021-02-12 17:08:01 -08:00
Bill Yi
acf789f35a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f6118a293ecb1c5d671398e9253e8908cf18c94
2021-02-12 04:56:56 -08:00
Bill Yi
f532cdefb0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9adb00d0640a1550bf967bc70baae11bcc7ee605
2021-02-12 09:25:35 +00:00
Treehugger Robot
ef81307178
Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870
am: 29302ad638
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I71456415072c95cbb7a91f0538d0c07d323ec612
2021-02-09 12:45:11 +00:00
Treehugger Robot
29302ad638
Merge "Switch Settings from IConnectivityManager to VpnManager." am: ace5a90870
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d050875038408172e538290a53d10306d986578
2021-02-09 12:21:58 +00:00
Jing Ji
492e985708
Fix crash issue when NetworkSelectSettings UI goes OFF and then ON
...
When updating selected preference instance by index, since
mPreferenceCategory hasn't been updated yet, and then there is a
possibility that the index is over the size of preference, so this
would result to Settings crash because IndexOutOfBoundsException
was detected in NetworkSelectSettings.
After updating the network preferences of mPreferenceCategory, update
the selected preference.
Test: manual - Checked that crash does not occur when
NetworkSelectSettings UI goes OFF and then ON.
Test: auto - Passed NetworkSelectSettingsTest.
Bug: 179754915
Change-Id: Ib736fe8fdcc82c3ac01ad1828d0f2a1c24610f2b
2021-02-09 09:42:03 +00:00
Treehugger Robot
ace5a90870
Merge "Switch Settings from IConnectivityManager to VpnManager."
2021-02-09 09:09:35 +00:00
Chiachang Wang
dbd031a46f
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38
am: 5c5b36f19d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7f3a634620e6467da136e0454ab98c994d7a23a6
2021-02-08 11:31:48 +00:00
Chiachang Wang
5c5b36f19d
Merge "Replace Proxy hidden constants and methods usages" am: e3be1ecb38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574955
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iba522bcd7591747f012918dc87f05f7aab1c2a1b
2021-02-08 11:00:55 +00:00
Chiachang Wang
e3be1ecb38
Merge "Replace Proxy hidden constants and methods usages"
2021-02-08 10:27:05 +00:00
Lorenzo Colitti
04d34ced59
Switch Settings from IConnectivityManager to VpnManager.
...
The VPN code is moving out of ConnectivityService to a new
VpnManagerService. Update Settings to call into the VpnManager
class instead of using the AIDL interface directly. This way,
the VPN code can be moved without touching Settings.
Bug: 173331190
Test: builds, boots
Test: manually verified VPN settings page
Change-Id: Id2731a166b5d6783acb1c711a54604b69aa8c0d7
2021-02-08 16:50:25 +09:00
TreeHugger Robot
5130730d9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 42f0c09a95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513511
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic015a19cf6a67a19a6100ff3e787fc62d2031f0a
2021-02-08 05:03:09 +00:00
TreeHugger Robot
32a131a0f5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ad376e668d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13513510
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5178301f18df626ea068796c638a59a436029e11
2021-02-08 05:02:34 +00:00
TreeHugger Robot
42f0c09a95
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-02-08 04:28:36 +00:00
TreeHugger Robot
ad376e668d
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-02-08 04:24:35 +00:00
Bill Yi
94fc64396b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I68d5c5e5ec56489504224bdd9e431bb96555d6de
2021-02-07 19:27:59 +00:00
Bill Yi
857a2e0052
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieee517e48487579ff5ce29f1aaf4ab7cae860688
2021-02-07 18:58:53 +00:00
Chiachang Wang
9aaad19a82
Replace Proxy hidden constants and methods usages
...
Proxy is a part of incoming connectivity mainline module. The
hidden APIs are no longer available outside the module. These
shared constants and methods are moving to ProxyUtils insdide
net shared lib. Update the corresponding usage in the caller
side.
Bug: 172183305
Test: atest SettingsRoboTests
Change-Id: I2d51442e65dbcdf1a36940d8a25c7571363d56e6
2021-02-05 17:37:14 +08:00
Sarah Chin
ad0fcc19c0
[automerger skipped] Merge "Update onSubscriptonOverride listener" am: bff5a89842
am: d25b9c12b6
-s ours
...
am skip reason: Change-Id I9436b414608d7c964185d3d5c3f1f554c65b2c12 with SHA-1 57fbecc6c1
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife9b2672c9674f4fb5dbb53e820342ff5d98da69
2021-02-05 06:16:01 +00:00
Sarah Chin
d25b9c12b6
Merge "Update onSubscriptonOverride listener" am: bff5a89842
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569300
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I05f0d8e4e7b335fef2c9f92829f75c88b8d36dc1
2021-02-05 05:49:59 +00:00
Sarah Chin
bff5a89842
Merge "Update onSubscriptonOverride listener"
2021-02-05 05:14:50 +00:00
Sarah Chin
3af9f8835e
Merge "Update onSubscriptonOverride listener" into rvc-qpr-dev-plus-aosp
2021-02-05 03:05:24 +00:00