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
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
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
Alex Salo
72dad8bc9d
Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1552081
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iafddf0eb17f24f4b0c845411092ed8c6c36fbbd5
2021-02-05 00:25:15 +00:00
Alex Salo
d1b9b7f87f
Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment"
2021-02-05 00:02:42 +00:00
Abel Tesfaye
2babd2d36a
Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment
...
Test: locally with phone
Change-Id: I73663cd3e9e86431a9264925661159fbcd16b9d3
Merged-In: I931aabaada09c87b4a7936bcde4fcff8bc237dd0
2021-02-04 22:07:08 +00:00
Bill Yi
21cea68a24
[automerger skipped] Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" am: 0e0360963a
-s ours
...
am skip reason: Change-Id Ied29947db9713f171dd3c582554fddbb0a1c8d7e with SHA-1 3e1fb17420
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1573546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4a3153c551d622287caed126207c367a8427c0d
2021-02-04 18:19:16 +00:00
Bill Yi
0e0360963a
Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE"
2021-02-04 17:08:42 +00:00
Treehugger Robot
14993282f1
Merge "[Settings] Add owner into Settings/network" am: 18b440997f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1574280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5cd2673f9d2daea6de8c3329172e1f65590a03e1
2021-02-04 08:26:11 +00:00
Treehugger Robot
18b440997f
Merge "[Settings] Add owner into Settings/network"
2021-02-04 08:01:46 +00:00
Zoey Chen
f74551eb47
[Settings] Add owner into Settings/network
...
Bug: None
Test: Not required
Change-Id: I7cc22c9455f4f074c1e22dd27e1f9cb4028376a8
2021-02-04 13:11:04 +08:00
Bill Yi
0f8ac7d168
Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
...
Merged-In: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
Merged-In: I402b212594a9e9f4c118d94008f53177d3430361
Change-Id: I19cd6d4c1152270a8936d7a9b999c870415f4221
2021-02-03 17:01:33 -08:00
Aaron Huang
3178dfc76a
Merge "Replace @hide API with public API" am: d52cff9b57
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1566248
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1a7897d737557abe1b7ede7f3931b2798e9610ab
2021-02-03 08:30:43 +00:00
Aaron Huang
d52cff9b57
Merge "Replace @hide API with public API"
2021-02-03 07:37:33 +00:00
Bill Yi
3e1fb17420
Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
...
Merged-In: Ia1d85c7136b824e69077ea06c68d142a706c2b11
Change-Id: Ied29947db9713f171dd3c582554fddbb0a1c8d7e
2021-02-02 09:44:11 -08:00
Sarah Chin
123205e141
Update onSubscriptonOverride listener
...
Test: atest FrameworksTelephonyTests
Test: atest SubscriptionManagerTest
Bug: 175723642
Change-Id: I9436b414608d7c964185d3d5c3f1f554c65b2c12
Merged-In: I9436b414608d7c964185d3d5c3f1f554c65b2c12
2021-02-01 18:33:34 -08:00
Aaron Huang
3bb961affd
Replace @hide API with public API
...
ProxyInfo is inculded in framework-connectivity module
which should not have external dependencies on its hidden API.
Thus, migrate getExclusionListAsString to getExclusionList.
Bug: 178777253
Test: build
Change-Id: I64b9d5be062bec43c7be3ea68d1f63054319df2d
Change-Id: I400df793fc669d0e574fb4cf022d021d99859d53
2021-02-01 19:16:23 +08:00
Jiun-Yang Hsu
1e2386b14b
Merge "Create folder and OWNERS file for component test" am: cf231cad93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1564814
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60949e540697933fb138ab9d42d28657474cf136
2021-01-29 23:21:55 +00:00
Jiun-Yang Hsu
cf231cad93
Merge "Create folder and OWNERS file for component test"
2021-01-29 12:48:32 +00:00
Jiun-Yang Hsu
2d0baa2c27
Create folder and OWNERS file for component test
...
Test: No test needed for creating folder and OWNERS
Change-Id: I6b1aff581df36a9c70309df2f2ce30d547a820d5
2021-01-29 09:01:30 +00:00
Peter Wang
b4f375fdc4
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia9cd23da0ae90f7f5c38fae54900b30e7ca12bad
2021-01-27 22:03:32 +00:00
Peter Wang
ffccb8a611
Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA"
2021-01-27 21:39:51 +00:00
Yo Chiang
7ac7030d49
Merge "Remove feature flag "settings_dynamic_system"" am: df58c6505d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1540949
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I141aeae1f09a535aad5084f335c6ecbed696bfde
2021-01-26 11:34:53 +00:00
Yo Chiang
df58c6505d
Merge "Remove feature flag "settings_dynamic_system""
2021-01-26 10:53:54 +00:00
Peter Wang
7e8d24e073
Add an intent filter for MobileNetworkListActivity to enable access
...
from the LPA
Bug: 170507492
Test: Local
Change-Id: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
Merged-In: I6e87d3a3c75c832354c3a3ad407889e8d2701cbd
2021-01-19 22:21:45 -08:00
Yo Chiang
f1065e359f
Remove feature flag "settings_dynamic_system"
...
Bug: 176795908
Test: Presubmit
Test: DSULoader
Change-Id: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
Merged-In: Ib6b450489c63913c47858cf295e4785fd5d0cfbb
2021-01-14 15:47:41 +08:00
Benjamin Franz
9229794727
Merge "Update constructor usage for CompatibilityChangeInfo" am: 39a920dd22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1541372
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4946065f619aac04cf681c310bfe04a6e5e68099
2021-01-12 16:22:18 +00:00
Benjamin Franz
39a920dd22
Merge "Update constructor usage for CompatibilityChangeInfo"
2021-01-12 15:38:01 +00:00
Treehugger Robot
8c2b2cc806
Merge "Fix too many receivers Exception" am: 2e6cde6b94
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1498417
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id69d676c8386f74a7e642984ea7387baacd2711c
2021-01-08 09:22:52 +00:00
Treehugger Robot
2e6cde6b94
Merge "Fix too many receivers Exception"
2021-01-08 05:35:46 +00:00
Benjamin Franz
92480fc15d
Update constructor usage for CompatibilityChangeInfo
...
As we're introducing an overridable flag on CompatibilityChangeInfo, the
constructor takes an additional argument that needs to be reflected in
these tests.
Bug: 174043039
Test: atest SettingsRoboTests
Change-Id: Ib5528ded408cb7807e2e3a90e1f99ee1775d566d
2021-01-06 15:12:50 +00:00
Treehugger Robot
8677c6a4b7
Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default" am: d3d0962cd1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526372
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4f151b07b92e0c55a53b38216024858b9fd68ce
2021-01-06 04:57:58 +00:00
Treehugger Robot
d3d0962cd1
Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default"
2021-01-06 04:24:25 +00:00
Jason Jeremy Iman
620158be52
[adb-wireless] Allow ADB-over-WiFi when WiFi is not default
...
When other network types with higher priority than wifi is
connected alongside wifi, turning on ADB over wifi is not
possible.
This is happening due to `isWifiConnected()` only checks
if wifi is the default network and not if wifi is connected.
Often times multiple networks such as ethernet is used in
conjuction with wifi, making ADB over wifi not working with
the setup.
Fix by returning if any available network is a WiFi network.
Bug: 173466085
Test: Tested on eve Chrome OS ARCVM, ADB WiFi can be toggled when
WiFi is not the default network.
Change-Id: I8474a4e8b37a4af0031e1462645509f1e634e9a8
2021-01-06 11:00:03 +09:00
TreeHugger Robot
8e18b5b69d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d2a2867d85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281572
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
2021-01-03 05:24:18 +00:00
Bill Yi
7c77e36579
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 783c18d8a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281571
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife1751f97a9e4a80f9af2981ae626382bcb2aca3
2021-01-03 05:24:11 +00:00
TreeHugger Robot
d2a2867d85
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2021-01-03 05:10:18 +00:00
Bill Yi
88409f1af9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I838570051ce2aab9c2b98fb2bf738a06b7687893
2021-01-02 22:27:59 +00:00
Bill Yi
783c18d8a6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibc84cbad5cb80898de5f771c8e1defd43122d694
2021-01-02 21:59:25 +00:00
TreeHugger Robot
156857c2e0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c045ccdc5a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13282324
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I74a9fab4956fed3f808d28e110c300de403bdb2c
2021-01-02 18:21:51 +00:00
TreeHugger Robot
c045ccdc5a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-01-02 18:05:17 +00:00
Bill Yi
6c25b86023
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee457eea5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13281529
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff609972087838e5cbdd1f01b64598456edc2e4f
2021-01-02 04:29:13 +00:00
Treehugger Robot
b441429a8f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce
-s ours am: aae7ce1b1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c5788675875037a68a77308b1bb61eea802e32d
2021-01-02 04:21:27 +00:00
Treehugger Robot
a6ed699018
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c
-s ours am: ed32f93dbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie98a3ecc9281eca2f3631fe6a779bf8fd8a313a0
2021-01-02 04:21:22 +00:00
Treehugger Robot
aae7ce1b1c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30364048ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539147
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64108906b14421f342bb5418d800a4b639a43708
2021-01-02 03:33:25 +00:00
Treehugger Robot
ed32f93dbd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f89dd1307c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1539148
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a22c4edab65206bd4441d791c19fda687276057
2021-01-02 03:33:06 +00:00
Treehugger Robot
30364048ce
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-02 03:14:44 +00:00
Treehugger Robot
f89dd1307c
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-01-02 03:14:05 +00:00
Bill Yi
502f111677
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie47dac2298ca18d01ea7d1319eab3a9dd221d191
2021-01-01 18:34:16 -08:00