Commit Graph

72444 Commits

Author SHA1 Message Date
Janis Danisevskis
2c74864579 Keystore 2.0: Update Wifi settings to use mostly public keystore API.
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-03-01 20:09:08 -08: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
a409521a64 Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 am: 08bea2183d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72543a317bfd1302e5f2226516658f61e7f4547a
2021-02-26 04:33:43 +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
181abccf09 Merge "Add OWNERS" am: f69f3ed7dc am: 5e85b6b2a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1580364

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib879a1f6e28ca9d97391aedea77b064632330b75
2021-02-25 15:22:31 +00: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
155d4d6cd3 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087 am: 995581e856
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cd486a47be45f68ad7b0db82dcb030a62edb0da
2021-02-25 09:37:00 +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
3b19347431 Merge "Use string "Carrier settings version"" am: 2161d17f32 am: 0b31d30218
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03542ee476ebff7bfae2a8f54894f00f69578744
2021-02-25 00:44:42 +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
android-build-team Robot
ec18f0472e Snap for 7168632 from f76a2ff641 to rvc-qpr3-release
Change-Id: Iccad1cee55aa22bfbbb5ae350ed0d153c30acfa9
2021-02-25 00:07:04 +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
c7bd662dee Merge "Grant BatteryStats OWNERS for FakeUid.java" am: d8137193ae am: 59f43e5299
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1584225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1d87849cf4c8c85f19858164faff1d17cf32d43
2021-02-24 06:59:58 +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
dbf857e2c7 Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32c192b2d4dfe390243a477b51ff807dced229fb
2021-02-24 05:08:28 +00:00
Tom Hsu
693e52688b Merge "Only default APN type can make preference selectable." into rvc-qpr-dev am: f76a2ff641
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13672665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia58c627514657f60dd2401cc7eaed1495d5747ca
2021-02-24 04:26:15 +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
Tom Hsu
f76a2ff641 Merge "Only default APN type can make preference selectable." into rvc-qpr-dev 2021-02-24 03:59:11 +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
Adam Bookatz
042f06aadf Merge "fuelgauge OWNERS eof newline merge conflict" am: 450a598494 am: 8d618ac1f7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597161

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib105c249882f83e1789812031ac06fad66e7025b
2021-02-24 01:50:50 +00:00
Adam Bookatz
450a598494 Merge "fuelgauge OWNERS eof newline merge conflict" 2021-02-24 01:50:22 +00:00
Chiachang Wang
b7f1c84f5b Merge "Replace subnet mask calculation to Inet4AddressUtils" am: 78b260f5fe am: 12eadd2133
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1579987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic639b459a37a4dcb90a11a2df39455143316fb5d
2021-02-24 01:43:29 +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
54651567a8 Merge "Replace NetworkUtils methods" am: 3dd1c29aee am: 2fe30b6403
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1571848

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I129c82cfe5667d29a7a988732e372b45f7fb6b98
2021-02-24 00:39:41 +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
tom hsu
0361c7b4c0 Only default APN type can make preference selectable.
- Current design is only to check mms type, but if there are other APN
 types group in one apn settings, it will show the radio button and the
 user can see the radio button and select it.

 - Improvement: Only make APN setting with defalut APN type be able to be selected.
    - https://screenshot.googleplex.com/8pfQinjya2NJWoV
Bug: 180475805
Test: Maunal test with ATT SIM.
Change-Id: Ic14121d7ce2a53b0f883a0637fc390c2aa4dd1d7
Merged-In: Iae6943971c0cc6d31dc0e9d4dd97e850117adbfd
2021-02-23 10:32:13 +00:00
Treehugger Robot
395caa5fa6 Merge "Owners updates" 2021-02-23 09:17:58 +00:00
Xin Li
7c297fa38a [automerger skipped] Merge ab/7061308 into stage. am: ad3fa60e26 -s ours
am skip reason: Change-Id I35fe00aeeb112d5d9971985619e3ec5095dcdb7b with SHA-1 8e18b5b69d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13657604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3a2aa451dcf23ec4e2b00b48e35d14542a34187
2021-02-23 09:05:06 +00:00
Chiachang Wang
78b260f5fe Merge "Replace subnet mask calculation to Inet4AddressUtils" 2021-02-23 07:28:31 +00:00
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
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