Commit Graph

71997 Commits

Author SHA1 Message Date
Treehugger Robot
9059706e7b Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
2021-03-02 19:05:16 +00:00
Sudheer Shanka
0a476f5f53 Update DataSaverBackend to use NetworkPolicyManager.Listener.
This will avoid having to update this every time we
add a new callback.

Test: treehugger
Change-Id: Ic34e3eac87d207eb2ffff7430fdf3b77871ae812
2021-03-02 13:05:43 +00:00
Treehugger Robot
b6dc427c50 Merge "Wellbeing Package needs to be enabled by default" 2021-03-02 06:09:37 +00:00
paulhu
2a5051e4fd Update Utils#getTetheringLabel usage on Settings
Utils#getTetheringLabel() is using TetheringManger to get
tetherable interface. So update the usage on Settings.

Bug: 180693313
Test: atest SettingsRoboTests
Change-Id: I1907743ed13c333ecbafd25b6dd9276fe692f2ea
2021-03-02 03:57:34 +00:00
Naga Venkata Durga Ashok Mutyala
f76cd69793 Wellbeing Package needs to be enabled by default
Add the wellbeing application to keepEnabledPackages.
so, it will prevent the users to disable explicitly.

Test: NA
Bug: 180078180
Change-Id: I2645f30fac60106410eaf2126c10d8ab804fd1b7
2021-02-26 15:09:55 +00:00
Treehugger Robot
08bea2183d Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b4a6e88530092dc2849dc4fb7e09c0d5463db3
2021-02-26 03:55:00 +00:00
Treehugger Robot
7086917968 Merge "Keystore 2.0: Update credential settings to use public Keystore API." 2021-02-26 01:50:16 +00:00
Janis Danisevskis
a05bd65cb6 Keystore 2.0: Update credential settings to use public Keystore API.
Test: N/A
Bug: 171305607
Bug: 171305388
Change-Id: I377115aca6b2df8052ae118f986c2f713535b6ec
2021-02-25 15:58:22 -08:00
Treehugger Robot
5e85b6b2a9 Merge "Add OWNERS" am: f69f3ed7dc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46ab676806c0a211818a2f0465a28dc97d3a64d3
2021-02-25 14:47:30 +00:00
Treehugger Robot
f69f3ed7dc Merge "Add OWNERS" 2021-02-25 14:19:48 +00:00
Paul Hu
995581e856 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe3e26c5bdda32edf656b4d7e94d2dc17c14e06
2021-02-25 08:19:44 +00:00
Paul Hu
cbcea32087 Merge "Replace ConnectivityManager hidden symbols on Settings" 2021-02-25 07:44:50 +00:00
Meng Wang
0b31d30218 Merge "Use string "Carrier settings version"" am: 2161d17f32
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbb0cd3d4c4726587082ecc4cbbfa2957e60467
2021-02-25 00:10:09 +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
59f43e5299 Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d99ba0c146418dbca6fe190c02a7b52db2e85da
2021-02-24 06:07:30 +00:00
Treehugger Robot
d8137193ae Merge "Grant BatteryStats OWNERS for FakeUid.java" 2021-02-24 05:34:05 +00:00
Treehugger Robot
1d7e8ae790 Merge "Adding notification team members to notification directory" am: f290b00125
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba4fb1061bbc4036b3166f8ddc3d9836f10078a1
2021-02-24 04:26:10 +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
8d618ac1f7 Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida7f4763d4039cf8af53a37b7e5faf5d42dbae21
2021-02-24 02:40:25 +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
Treehugger Robot
c309ada683 Merge "Owners updates" am: 395caa5fa6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e1aff62b059325bf4069f4bbca35b074dabe976
2021-02-24 01:22:19 +00:00
Chiachang Wang
12eadd2133 Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86fde55123d8f7e28c6ed6c37cd6c05373920684
2021-02-24 01:18:05 +00:00
Chiachang Wang
2fe30b6403 Merge "Replace NetworkUtils methods" am: 3dd1c29aee
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1571848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4419b7cc320726dbac4c324f6ce5c42434322fc7
2021-02-24 00:16:42 +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
lucaslin
862dd61608 Modify the value of intent-filter
ACTION_PROMPT_PARTIAL_CONNECTIVITY, ACTION_PROMPT_UNVALIDATED
and ACTION_PROMPT_LOST_VALIDATION has exposed and their value
also need to be updated due to API lint errors.

Bug: 172183305
Test: Check NO_INTERNET notification can be shown.
Change-Id: I40dfeec1c25cd549bbe5559e3c3ce21813fbf922
Merged-In: I40dfeec1c25cd549bbe5559e3c3ce21813fbf922
2021-02-22 03:05:08 +00:00
Xin Li
ad3fa60e26 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
2021-02-21 09:25:11 -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
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
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
SongFerngWang
f91d9c40f2 Add OWNERS
Bug: 179666288
Test: Build pass
Change-Id: I6e42f45083ee6dac9f0aeed4be71820107f4fd58
2021-02-19 02:33:26 +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
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