Commit Graph

49467 Commits

Author SHA1 Message Date
Pavel Grafov
40b82cd6e4 [automerger skipped] Merge "Update to use new ConnectivityManager API." am: 161f5ec3e9 am: 525b0dbc17
am: a9ed0226f5 -s ours
am skip reason: change_id I614c20b9a1c6748614163766866bb59b15d794f1 with SHA1 ab871a00c7 is in history

Change-Id: I820acb6e661e0cc834b7a6ba42936e1c0e41a009
2019-01-24 11:02:21 -08:00
TreeHugger Robot
f700e10016 Merge "Add default calls/SMS subscription prefs to mobile details page" 2019-01-24 18:36:33 +00:00
Pavel Grafov
a9ed0226f5 Merge "Update to use new ConnectivityManager API." am: 161f5ec3e9
am: 525b0dbc17

Change-Id: Id798a6b94be2c699c4de1c294e418a621b0adea2
2019-01-24 10:07:47 -08:00
Pavel Grafov
525b0dbc17 Merge "Update to use new ConnectivityManager API."
am: 161f5ec3e9

Change-Id: I14a198bf8c95501473ac963ee6e00331e09daa76
2019-01-24 09:50:37 -08:00
Pavel Grafov
161f5ec3e9 Merge "Update to use new ConnectivityManager API." 2019-01-24 17:34:55 +00:00
Christine Franks
17e1190606 Merge "Use ColorDisplayManager for night display" 2019-01-24 17:05:39 +00:00
TreeHugger Robot
6bccb4fb14 Merge "Ignore the storage group in the Privacy bar chart." 2019-01-24 16:42:30 +00:00
Pavel Grafov
a2f6de4b3c Merge "Update to use new ConnectivityManager API." 2019-01-24 16:15:07 +00:00
TreeHugger Robot
62fce79a47 Merge "Make links to Permissions Hub only show last day." 2019-01-24 14:57:35 +00:00
TreeHugger Robot
40e9c22fc5 Merge "Change cross profile calendar API used in robolectric test." 2019-01-24 14:25:45 +00:00
TreeHugger Robot
a3750617db Merge "New extra for ACTION_SET_NEW_PASSWORD to specify the min complexity" 2019-01-24 13:56:20 +00:00
TreeHugger Robot
8ea498cdac Merge "Fix the consistency of connection status displayed on Wi-Fi card" 2019-01-24 12:38:32 +00:00
Eran Messeri
bcb649287c Merge "KeyChain: Remove Screenlock dependency" 2019-01-24 11:28:36 +00:00
TreeHugger Robot
72d67e6929 Merge "Ignore test case" 2019-01-24 10:40:58 +00:00
Kevin Chyn
9e07ad08e2 Merge "Plumb setRequireConfirmation to CC" 2019-01-24 10:30:36 +00:00
Kevin Chyn
8565334148 Merge "Streamline accessibility flow" 2019-01-24 09:04:25 +00:00
Bernard Chau
92db5bf4f7 New extra for ACTION_SET_NEW_PASSWORD to specify the min complexity
When an app that has the permission GET_AND_REQUEST_PASSWORD_COMPLEXITY
launches ACTION_SET_NEW_PASSWORD, it can use the DPM PASSWORD_COMPLEXITY_*
constants to specify the complexity it wants in a new extra
EXTRA_PASSWORD_COMPLEXITY.
The screen lock type picker would then filter out the options which
cannot fulfil the min complexity (and DPM restrictions) and will show a
footer with a brief description of the calling app and the requested type.
The same password requirements UI is used in ChooseLockPassword screen
to display the minimum requirements that can fulfil both DPM
restrictions and the min complexity.

The app must have permission GET_AND_REQUEST_PASSWORD_COMPLEXITY
otherwise the extra would be ignored.

ACTION_SET_NEW_PASSWORD is also updated to always display the calling app
name in the screen lock type picker if it is not launched by Settings,
with or without the new extra.

Bug: 111173457
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
      atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
      atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
      atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/PasswordUtilsTest.java
      atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java
      atest packages/apps/Settings/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java
      manual test with TestDpc (ag/5901733)

Change-Id: I21a25d28669bf1223c3b02ba85c0755e59feee2e
2019-01-24 08:02:33 +00:00
tmfang
da70607f41 Ignore test case
Since it breaks the test, we ignore test case temporarily.
Owner will fix it as soon as possible.

Test: robotest
Bug: 120910747
Change-Id: I2f31d2efe629080bb1c805e2d43a92f2873a3e5b
2019-01-24 08:02:33 +00:00
Jason Chiu
36b37de9d6 Fix the consistency of connection status displayed on Wi-Fi card
- Refresh slice in WifiTracker.onConnectedChanged
- Only expose notifySliceChange to child in SliceBackgroundWorker

Fixes: 123270015
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi.slice
Change-Id: Id5540ebae2746e58e14924665c5e62bf437ebcf0
2019-01-24 14:56:04 +08:00
Kevin Chyn
56c745c38e Plumb setRequireConfirmation to CC
Bug: 111461540

Test: Tested with modified demo app with
      original and new KeyguardManager APIs

Change-Id: I56585fbfd704195586f2f516b35e9338e91b0346
2019-01-23 18:42:47 -08:00
Badhri Jagan Sridharan
875178bbfa Merge "Fix UsbPortStatus constructor arguments" 2019-01-24 02:03:19 +00:00
yuemingw
264ae20256 Change cross profile calendar API used in robolectric test.
The API changed from addCrossProfileCalendarPackage to
setCrossProfileCalendarPackages recently due to our decision
in b/121179845. Also added test for the case when
the whitelist is set to null.

Bug: 121179845
Test: make ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest -j40 RunSettingsRoboTests
Change-Id: I66b92aba6d26334e48207275b2d8981203598e15
2019-01-24 00:59:37 +00:00
Joel Galenson
4fa8a61fdf Ignore the storage group in the Privacy bar chart.
We already filter out the storage group in the Permissions Hub because
it's going away and it produces false events.  This also filters it
out in the privacy bar chart so the two are consistent.

Test: Do not see the storage group in the privacy bar chart.
Change-Id: I6d6bc5a767db06a738ae978cb086dad685cff386
2019-01-23 15:28:30 -08:00
Lei Yu
d3c02d87f9 Merge "Update SlicePreferenceController" 2019-01-23 23:22:03 +00:00
Christine Franks
5405d71616 Use ColorDisplayManager for night display
Bug: 111215474
Test: make ROBOTEST_FILTER="(Night*)" RunSettingsRoboTests -j48
Change-Id: I8b92407470446ef86e460985fc64cf2467eb3e5c
2019-01-23 13:32:30 -08:00
Pavel Grafov
9a9f6f313b Update to use new ConnectivityManager API.
Bug: 77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
Merged-In: I614c20b9a1c6748614163766866bb59b15d794f1
2019-01-23 19:53:01 +00:00
Pavel Grafov
ab871a00c7 Update to use new ConnectivityManager API.
Bug: 77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
2019-01-23 19:52:45 +00:00
Badhri Jagan Sridharan
cf7f3dafbc Fix UsbPortStatus constructor arguments
USB V1.2 hal adds new parameters for the UsbPortStatus constructor.
The constructor changes from:

public UsbPortStatus(int currentMode, @UsbPowerRole int currentPowerRole,
            @UsbDataRole int currentDataRole, int supportedRoleCombinations)

To:

public UsbPortStatus(int currentMode, int currentPowerRole, int currentDataRole,
            int supportedRoleCombinations, int contaminantProtectionStatus,
            int contaminantDetectionStatus)

Initialize the construtor with contaminant presence disabled.

Bug: 119642987
Bug: 117330206
Bug: 77606903

Test: Ran roboelectric tests
Change-Id: I8e1b29785e07abffa1f6ae7656ca697425f446e6
2019-01-23 10:45:13 -08:00
Pasty Chang
1fe41d44fe Merge "Migrating to new footer button for ChooseLockPassword page" 2019-01-23 07:37:23 +00:00
Cosmo Hsieh
2cea2d4cb3 Merge "[Network Connection] Implement toasting after wifi is connected" 2019-01-23 02:17:21 +00:00
Cosmo Hsieh
b05f76369e Merge "[Network Connection] Correct title padding" 2019-01-23 02:16:36 +00:00
Antony Sargent
ff484e11e9 Add default calls/SMS subscription prefs to mobile details page
This adds prefs to the the details page for mobile network subscriptions
that appear in multi-SIM mode. They show which subscription is set as
the default for calls and SMS respectively, and let the user change what
the default is for each. They can be set to either a specific
subscription, or set to "Ask every time".

Bug: 122670283
Test: make RunSettingsRoboTests
Change-Id: Id2b23e4b5c3d1b5c04b5766e73fc8202c05d8f75
2019-01-22 16:59:14 -08:00
Naina Nalluri
257f85e424 Merge "Add switch to enable/disable cbrs" 2019-01-23 00:04:47 +00:00
Joel Galenson
03729e780d Make links to Permissions Hub only show last day.
Default to showing only the last day of accesses.

Also fix a bug caused by the API changing from seconds to
milliseconds.

Test: Click links and see correct filter.
Change-Id: I8456723a434c7144e9115e1834f48d3c1da24d4b
2019-01-22 14:56:51 -08:00
Kevin Chyn
05668ce78c Streamline accessibility flow
Bug: 111548033

Test: Builds
Change-Id: I5df5ca230732c8ab4ff105b93ee16865b3f4d999
2019-01-22 10:59:51 -08:00
jackqdyulei
511b5fe9f2 Update SlicePreferenceController
Make sure setSliceUri is invoked even when it is null, where we create
SliceLiveData.

Then in lifecycle, if LiveData is not null, we will register observer.

Bug: 120803703
Test: Manual

Change-Id: I56caf2abf04c4a251ebafa5deb599d44b1c7fe92
2019-01-22 10:43:24 -08:00
TreeHugger Robot
2b80334b41 Merge "Clean up updateState()" 2019-01-22 18:23:15 +00:00
TreeHugger Robot
d3be363004 Merge "Add icons of WifiDppAddDeviceFragment." 2019-01-22 11:11:30 +00:00
cosmohsieh
107e16ef28 [Network Connection] Correct title padding
Padding of dialog title needs to align design doc.

Bug: 123161302
Test: manual
Change-Id: I4b8a3d12dd309b0c1812694c42c7e0d283c619f2
2019-01-22 17:21:17 +08:00
Arc Wang
bf1fb10999 Add icons of WifiDppAddDeviceFragment.
Bug: 118797202
Test: manual test
Change-Id: Ia2ef9db3526f98b1c697a864cec34e1d4dcfc400
2019-01-22 16:27:23 +08:00
pastychang
76ad11c179 Migrating to new footer button for ChooseLockPassword page
Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: I1fb4588d0c2cf04bca88ec470d59945c2fcab01c
2019-01-22 15:10:36 +08:00
cosmohsieh
b9c4797387 [Network Connection] Implement toasting after wifi is connected
When wifi is connected (onUserSelectionConnectSuccess), making a toast
infos user and closed the dialog.

Bug: 123160958
Test: atest NetworkRequestDialogFragmentTest
Change-Id: I85ab648188018773e1f76541d18903c733bc3e69
2019-01-22 13:49:10 +08:00
Arc Wang
cb64510ff7 Control UI behavior according to different Wi-Fi DPP intents.
When it's a configurator from Settings, the cancel button of WifiDppChooseSavedWifiNetworkFragment
should pop back stack. When it's a configurator from a camera app, the cancel button of
WifiDppChooseSavedWifiNetworkFragment should finish host activity.

Bug: 120517242
Test: manual test
Change-Id: Ia0fb0daf16c94ecd62aa6d357405fcd529935d2f
2019-01-22 13:45:27 +08:00
Weilun Du
def4fd900d Fixed Settings crash caused by null bluetooth adpater.
Emulator doesn't support bluetooth.

BUG: 123026204
Change-Id: I5fddfaff03dfd882688a73542278d8ef1e509ca2
Signed-off-by: Weilun Du <wdu@google.com>
2019-01-22 00:12:20 +00:00
Ajay Panicker
c2d1050665 Merge "Add Filtering for snoop logs based on L2CAP and RFCOMM Channels (3/4)" 2019-01-22 00:00:12 +00:00
Johnson Lu
c706c643a0 Merge "Fix crash issue when click 'Share' button" 2019-01-21 13:08:28 +00:00
Eran Messeri
fa7f75abd9 KeyChain: Remove Screenlock dependency
In coordination with KeyChain changes, stop using FLAG_ENCRYPTED when
importing keys into KeyStore and remove the requirement that a screen
lock is present.

The change to this package removes the checks for KeyStore state and
Keyguard presence. See the KeyChain change for more detailed
explanation.

Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedProfileOwnerTest#testKeyManagement
Bug: 120901345
Change-Id: I82f1c18e84dd4a63d55017fa4b7be31c45f7ef14
2019-01-21 12:43:44 +00:00
Johnson Lu
69b31596a2 Fix crash issue when click 'Share' button
Hide 'Share' button if access point return null wifi config.

Change-Id: I554ce8c3214c94892d57c213d0588c70aad97439
Fixes: 123172888
Test: robotests
2019-01-21 17:43:11 +08:00
TreeHugger Robot
32d561653c Merge "Add a picture for Wi-Fi DPP add device fragment." 2019-01-21 04:58:35 +00:00
TreeHugger Robot
41ab200713 Merge "[Mac Randomization] Change order of Privacy setting" 2019-01-21 04:33:27 +00:00