Commit Graph

59716 Commits

Author SHA1 Message Date
Yi-Ling Chuang
a591d7a082 Fix NPE when coming back to settings homepage.
When users navigate back to the homepage, if there is a slice being
displayed, slice callback will be triggered. It will then check if this
slice has any error hint, where NPE would occur if the slice turns out
to be null. Hence, add a null check before checking slice hint.

Fixes: 148158780
Test: rebuild and navigate back to the homepage.
Change-Id: I2b04dc0d64a223cc85f6af55b2ae2dbc5f3e1f40
2020-03-11 16:52:44 +08:00
Sunny Shao
3d3757683c Update the OWNER files
Bug: 151179432
Test: manual review
Change-Id: I2bfd917c2bea2d71303ed9aecf29d850f12eec3d
2020-03-11 16:45:14 +08:00
Arc Wang
0a45c4099d [Wi-Fi] Fix 2 Wi-Fi shortcuts bug
Check feature flag to show the shortcut of
WifiSettingsActivity or WifiSettings2Activity.

Bug: 151133236
Test: manual
      Home context menu -> Widgets -> Settings shortcut
      Should only show 1 Wi-Fi shortcut option.
Change-Id: Ie980b69ce1f23614475070b5c74d9a6d5cdab7ae
2020-03-11 15:41:13 +08:00
Automerger Merge Worker
020efc050a [automerger skipped] Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2 am: 382ac6e42e -s ours
am skip reason: Change-Id I9404e2c3c816311c7ef3875622fe5cd5a315ec58 with SHA-1 721467c679 is in history

Change-Id: I62f64918ee1bf00cad66f117b400c4404f7e7996
2020-03-11 06:04:38 +00:00
Automerger Merge Worker
382ac6e42e Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" am: 7ef5614ee2
Change-Id: I2881def2e37235b8d9ef4d9d82ad0abc6e7ecab4
2020-03-11 05:51:49 +00:00
Benedict Wong
1e2a91ba1a Address cleanup comments from aosp/1234607
This change addresses minor cleanup comments from aosp/1234607, renaming
a method.

Bug: 148991741
Test: Compiles
Change-Id: I2f31f8045040e6065a89e842b034aea605a99bd4
2020-03-11 05:46:27 +00:00
Treehugger Robot
7ef5614ee2 Merge "Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED" 2020-03-11 05:40:34 +00:00
Automerger Merge Worker
489d671497 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev am: b8fb854e98
Change-Id: I26425ff7fa3413bc5cb3458843f643bb346696e5
2020-03-11 04:20:28 +00:00
Daniel Bright
fa5ffc97e6 Repoint ACTION_SECRET_CODE + ACTION_SIM_STATE_CHANGED
Bug: 148160428
Test: make, flash
Merged-In: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
Change-Id: I9404e2c3c816311c7ef3875622fe5cd5a315ec58
2020-03-10 21:12:25 -07:00
Arc Wang
b8fb854e98 Merge "[Wi-Fi] Add STA+AP information in Hotspot & tethering footer" into rvc-dev 2020-03-11 04:00:49 +00:00
Automerger Merge Worker
18bc0af360 Merge "Revert "Ignore some failed tests."" into rvc-dev am: 6aa40f6ea7
Change-Id: I6ba6d60334ef3bdd9a873ae5435f6757789f7842
2020-03-11 03:33:24 +00:00
TreeHugger Robot
6aa40f6ea7 Merge "Revert "Ignore some failed tests."" into rvc-dev 2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504 Revert "Ignore some failed tests."
This reverts commit db4fd2b1c3.

Reason for revert: Test failures are fixed.

Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
2020-03-11 03:16:33 +00:00
Automerger Merge Worker
e9711ca347 [automerger skipped] Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e am: d0d3fd6457 -s ours
am skip reason: Change-Id Ic635b11c995077ebf1e143d9562b100d7730fe52 with SHA-1 a381196b8b is in history

Change-Id: I9079a3807c1d493ccc3cba4e188db11da94eeaaa
2020-03-11 02:20:11 +00:00
Automerger Merge Worker
d0d3fd6457 Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" am: bb8841c22e
Change-Id: I3a0714c6e42bf6dde1371f2c188b4fa3bc4aceba
2020-03-11 02:01:13 +00:00
Bonian Chen
bb8841c22e Merge "Remove reference of Phoneconstants for SUBSCRIPTION_KEY" 2020-03-11 01:45:14 +00:00
Automerger Merge Worker
6e0521fefd Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev am: bff2347964
Change-Id: I69e1948eef5f572f6de11f2a6ef8021970d85924
2020-03-11 00:43:56 +00:00
Quang Luong
bff2347964 Merge "Fix Tx link speed still showing after disconnecting from wifi network" into rvc-dev 2020-03-11 00:31:29 +00:00
Kevin Chyn
59834e6bf4 Partial revert of ag/10482633
SUW is using activity result codes already. Let's stick with the old
behavior until/if there's a way to make it work nicely.

Fixes: 151058692

Test: Skip fingerprint in SUW. Fingerprint not shown again in SUW.
Change-Id: I3c52cddd568dc5ded6bf810272ffb77f0841c692
2020-03-10 17:26:26 -07:00
Christopher Tate
36f182159f DO NOT MERGE - Track framework changes to crashApplication
Bug: 128649910
Test: manual
Test: atest OsHostTests#testForegroundServiceBadNotification
Merged-In: Ia613372360f8b32f6ad3b7d2092e7cb27f067fbc
Change-Id: I6894e3df309669ba98ad23432aa18d6043739aad
2020-03-10 15:52:05 -07:00
Automerger Merge Worker
bb25e17d43 [automerger skipped] Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28 am: c702fbbccc -s ours
am skip reason: Change-Id I1eed95ee1060aff953306a696e91e0205acdad7c with SHA-1 a632c79d32 is in history

Change-Id: I6373b613d7555c796ceaed8469e57ddcc4d5fe60
2020-03-10 21:01:16 +00:00
Chen Chen
847b534fdf MetricId: Avoid byte[] and string ambiguity
Passing null to the function will result in conflict with Bluetooth proto
(int int int byte[] int)
Bug: 122571213
Test: Build

Change-Id: Iad90e67a2cdde86aabb95585975be56fc33361fe
2020-03-10 12:49:56 -07:00
Automerger Merge Worker
c702fbbccc Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" am: f4e97c4e28
Change-Id: Ib2887b224883d82cdc4abdde4a9af34838ed39b9
2020-03-10 17:47:07 +00:00
Treehugger Robot
f4e97c4e28 Merge "[Mainline] Remove NETWORK_TYPE_LTE_CA" 2020-03-10 17:26:27 +00:00
Automerger Merge Worker
ae0bd4256f [automerger skipped] Merge "Secret code fix - uses public symbol for secret" am: 716c06f700 am: 66d4405d1d -s ours
am skip reason: Change-Id I681d88d7f2f0f923850d33219a1ee56eedf87cad with SHA-1 27c6358127 is in history

Change-Id: I36220a7c22556640143212703a277955452a0ceb
2020-03-10 17:20:19 +00:00
Automerger Merge Worker
66d4405d1d Merge "Secret code fix - uses public symbol for secret" am: 716c06f700
Change-Id: Ic2025dbfe0dcaf21b5a3a50c8caa778242440b6d
2020-03-10 16:59:32 +00:00
Automerger Merge Worker
43c4fa35da Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev am: a8bee76d11
Change-Id: I8727fec517436adf608b26fc1372c7c43cfa504a
2020-03-10 16:58:34 +00:00
Nathan Harold
a8bee76d11 Merge "Disable 5G Scanning in NetworkScanHelper" into rvc-dev 2020-03-10 16:35:02 +00:00
Daniel Bright
716c06f700 Merge "Secret code fix - uses public symbol for secret" 2020-03-10 16:31:01 +00:00
Kenny Guy
37295f86bf DO NOT MERGE
Update battery manager toggle to support on / off summary.

Screenshots attached to the bug.

Bug: 148847755
Test: Visual - on blueline aosp build / boot / check settings pages
Test: Visual - on blueline eng build / boot / check settings pages
Change-Id: I44b1c74baf4bafa549519d4f20fa470389cd5e0b
(cherry picked from commit 1a289bdeba)
2020-03-10 16:10:29 +00:00
Automerger Merge Worker
379902636b Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev am: 1334a7e986
Change-Id: If8964911c25b2d5cc8a38e4dd319ceb91ce95fe2
2020-03-10 15:02:13 +00:00
TreeHugger Robot
1334a7e986 Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev 2020-03-10 14:45:46 +00:00
Automerger Merge Worker
0a6442df22 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev am: 7c2979c340
Change-Id: I5620a3a5c637aa142b3aa04f7b2a881f3e21ca76
2020-03-10 12:29:00 +00:00
TreeHugger Robot
7c2979c340 Merge "[Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page" into rvc-dev 2020-03-10 12:12:46 +00:00
calvinpan
75867d8f63 Hide the 5G opiton when 5G has been disallowed
1. Create PreferenceEntriesBuilder for 5G entry. In the past, the
preferred network type entries was based on CarrierConfigManger value
but 5G option is based on allowed netowork type and device access
family, so include 4G and 5G logic in PreferenceEntriesBuilder.

2. If user selected item not in preferred network option, settings will
auto selected on the first item. For example, if user selected on 5G and
device disallowed 5G(5G option will be hide), so settings will selected
on first item(4G).

Bug: 149721842
Test: EnabledNetworkModePreferenceControllerTest

Change-Id: Ic447a137f9db4cf1a0048a8e58487c29b402bb48
2020-03-10 10:23:43 +00:00
Arc Wang
005fe6951c [Wi-Fi] Add STA+AP information in Hotspot & tethering footer
Use WifiManager#isStaApConcurrencySupported() to check if a
device supports STA+AP and shows the footer information.

Bug: 121328949
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TetherSettingsTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherFooterPreferenceControllerTest
Change-Id: I3446abb5cc9cdf76da8d17f5de31bd65715c165c
2020-03-10 18:15:13 +08:00
Automerger Merge Worker
cbc146d3f4 Merge "Change sticky card UI back to homepage card style" into rvc-dev am: e5110e9388
Change-Id: I8c47d8c3dea5b3f816facdc4775d8653fc0c01d6
2020-03-10 08:26:07 +00:00
Automerger Merge Worker
48d161b7b0 Merge "Add entry point at output switcher to do group operation" into rvc-dev am: 378ca1dac4
Change-Id: Ic0758e620662f68ee614e4478e26bad1468b0c70
2020-03-10 08:25:59 +00:00
TreeHugger Robot
e5110e9388 Merge "Change sticky card UI back to homepage card style" into rvc-dev 2020-03-10 08:25:47 +00:00
tim peng
378ca1dac4 Merge "Add entry point at output switcher to do group operation" into rvc-dev 2020-03-10 08:07:43 +00:00
Automerger Merge Worker
fd12e2e677 Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev am: b65866968e
Change-Id: I21d36da4f3826bc1168d607945d9e45dbba8d0a2
2020-03-10 07:44:09 +00:00
TreeHugger Robot
b65866968e Merge "MetricId: Avoid byte[] and string ambiguity" into rvc-dev 2020-03-10 07:24:52 +00:00
Quang Luong
d0a22bd699 Fix Tx link speed still showing after disconnecting from wifi network
Make sure the tx link speed preference in the Network Details page
disappears when the network is disconnected.

Bug: 151126855
Test: manually going to network details page and disconnecting and
verifying that the link speed disappears.

Change-Id: I3dfd66085db987535c201d38961e4bca709752c9
2020-03-10 00:09:52 -07:00
Tim Peng
1a5b896dc2 The text contrast of "disconnected" in Switch media output panel is insufficient.
-Apply generic color "textColorSecondary"

Bug: 151050490
Test: manual
Change-Id: Id5e967faab6dedb25607f8afb12acbf338211144
2020-03-10 07:08:24 +00:00
govenliu
6794ce8233 [Wi-Fi] Use startActivityForResult instead of startActivity to launch google help page
The startActivity API can not launch the help page.
Change to use startActivityForResult to launch.

Bug: 143784389
Test: Add learnMore_launchesHelp_shouldStartActivityForResult unit test to check if startActivityForResult be called.
Change-Id: Ia3ef82f94d4c8feb71131b44be26df74d6259805
2020-03-10 14:28:34 +08:00
Tim Peng
b4c4c362c5 Add entry point at output switcher to do group operation
-Entry point is available only when there are more than 1 connected device
-Add group Slice item when it is available
-Add intent filter in manifest
-Add test case

Bug: 146813761
Test: make -j42 RunSettingsRoboTests
Change-Id: If398b7a31219fd1910503d96fe7593622528c792
2020-03-10 13:44:09 +08:00
Automerger Merge Worker
bb70a39c68 Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev am: e28309b2dc
Change-Id: Ibe04ae804fe19a7767ac28d1b509e81475b0d2fc
2020-03-10 05:29:59 +00:00
Daniel Bright
d3b1fa8081 Secret code fix - uses public symbol for secret
There were two CLs that conflicted causing
the functionality to break again.  This CL switches
back to TestingSettingsBroadcastReceiver back to using
the secret code on TelephonyManager.

This is Ok because ag/10331474 moves AndroidManifest
to same flag.

Test: Brought up "Testing" activity using secret code
Test: Hit breakpoint in TestingSettingsBroadcastReceiver
      within if block.
Bug: 149524255
Merged-In: I681d88d7f2f0f923850d33219a1ee56eedf87cad
Change-Id: I681d88d7f2f0f923850d33219a1ee56eedf87cad
2020-03-09 22:29:22 -07:00
TreeHugger Robot
e28309b2dc Merge "[Wi-Fi] Fix crash when launch Wi-Fi detail from slice" into rvc-dev 2020-03-10 05:17:40 +00:00
Automerger Merge Worker
a6b501c926 Merge "Adjust layout for Slice InputRange" into rvc-dev am: af4d55e7dd
Change-Id: I54caf734aa1e1e43ac5d85c5bdcc736cbcc75aff
2020-03-10 03:21:11 +00:00