Commit Graph

71513 Commits

Author SHA1 Message Date
Paul Hu
cbcea32087 Merge "Replace ConnectivityManager hidden symbols on Settings" 2021-02-25 07:44:50 +00:00
Meng Wang
2161d17f32 Merge "Use string "Carrier settings version"" 2021-02-24 23:17:20 +00:00
Meng Wang
3f9db799e5 Use string "Carrier settings version"
.. instead of "Settings version".

Bug: 160843335
Change-Id: Ie98b9f2c62627c1e34dfa807357625b483577305
Test: make
2021-02-24 21:15:08 +00:00
Treehugger Robot
d8137193ae Merge "Grant BatteryStats OWNERS for FakeUid.java" 2021-02-24 05:34:05 +00:00
paulhu
c11ac84929 Replace ConnectivityManager hidden symbols on Settings
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Settings.

Bug: 180693313
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<Modified Test>
Change-Id: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
Merged-In: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
2021-02-24 11:45:02 +08:00
Treehugger Robot
f290b00125 Merge "Adding notification team members to notification directory" 2021-02-24 03:28:03 +00:00
Adam Bookatz
96d1b53394 Grant BatteryStats OWNERS for FakeUid.java
FakeUid.java needs to be trivially updated whenever new abstract methods are added to BatterStats.Uid in frameworks since it extends it. (e.g. ag/13547202)

Change-Id: Ie24f14e17be49056ae07ac369a8cbd067aa7ae16
Test: N/A
2021-02-24 01:51:57 +00:00
Adam Bookatz
450a598494 Merge "fuelgauge OWNERS eof newline merge conflict" 2021-02-24 01:50:22 +00:00
Julia Reynolds
f2a444328c Adding notification team members to notification directory
Change-Id: Ie51b4b4ac69843b3a68957e03462d1b226abbdc0
2021-02-23 18:54:59 +00:00
Treehugger Robot
395caa5fa6 Merge "Owners updates" 2021-02-23 09:17:58 +00:00
Chiachang Wang
78b260f5fe Merge "Replace subnet mask calculation to Inet4AddressUtils" 2021-02-23 07:28:31 +00:00
Chiachang Wang
eb20f4b06f Replace subnet mask calculation to Inet4AddressUtils
There is existing helper method in Inet4AddressUtils to calculate
the subnet mask from IPv4 prefix calculation. Replace the
implementation in caller side to simplify design in callers.

Bug: 172183305
Test: atest SettingsRoboTests
Test: Verify the method return the same value
Change-Id: I38d7d09be612fa4788cf4052bf304d17f0ae79f4
Merged-In: I38d7d09be612fa4788cf4052bf304d17f0ae79f4
2021-02-23 03:09:11 +00:00
Chiachang Wang
3dd1c29aee Merge "Replace NetworkUtils methods" 2021-02-23 00:58:59 +00:00
Chiachang Wang
0f40c023f6 Replace NetworkUtils methods
NetworkUtils is moved to connectivity mainline module which is
not accessible for module outside. getNetworkPart() method is
used by wifi lib and Settings but no usage inside the module,
so move the method to framework lib to share with wifi lib and
Settings.

Also, NetworkUtils.numericToInetAddress() method is also hidden
and deprecated. It should be replaced by
InetAddresses.parseNumericAddress().

Update the corresponding usage to refer to these methods.

Bug: 172183305
Test: atest SettingsRoboTests
Change-Id: I8240b1c74b53d5d66850d9a3ec7d5e5c11558e6a
Merged-In: I2fb674e0d7da0b11ba70177853fd6259bce372a3
2021-02-22 15:35:17 +08:00
Weng Su
880e2ab494 Owners updates
- Add wengsu to network path for provider model feature implementation

- Add wifi/OWNERS to tests/unit/src/com/android/settings/wifi/OWNERS

Bug: 180778022
Test: N/A, just owners update
Change-Id: I9255fb4980dbbe163850be2459528a3380c15d76
2021-02-20 12:58:25 +00:00
Adam Bookatz
17e0708152 fuelgauge OWNERS eof newline merge conflict
The AOSP version and internal version differ by an end-of-file newline,
which is creating merge conflicts.

Change-Id: Ib90a3ffbae9b44c3e6cf2287149f35318cd320a5
Test: N/A
Merged-In: I330d074c6e504493abf4cece51199ec5851b5d3b
2021-02-20 00:23:45 +00:00
Adam Bookatz
c2c5de6199 Merge "Update new owners for battery pages." 2021-02-19 17:26:50 +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
be4a0e84ef Merge "Reset VPN settings by calling VpnManager." 2021-02-19 08:04:53 +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
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
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
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
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
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
bff5a89842 Merge "Update onSubscriptonOverride listener" 2021-02-05 05:14:50 +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
0e0360963a Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE" 2021-02-04 17:08:42 +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
d52cff9b57 Merge "Replace @hide API with public API" 2021-02-03 07:37:33 +00: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
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
ffccb8a611 Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" 2021-01-27 21:39:51 +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
39a920dd22 Merge "Update constructor usage for CompatibilityChangeInfo" 2021-01-12 15:38:01 +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