Commit Graph

14 Commits

Author SHA1 Message Date
Philip P. Moltmann
035ea3b0d1 Use new RestrictedLockUtils API
This is made necessary by changes to the SystemAPI the lib relies on.

Test: RunSettingsRoboTests
Bug: 116798569
Change-Id: I2812ce9e58e3fb15a5579ddc10cd0edf33d0ed44
2018-10-09 12:39:19 -07:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
tmfang
41ab6b4bf8 Migrate all AlertDialogs to AndroidX version
This CL only changed AlertDialog imports.
So, reviewer can review it easily.

Change-Id: I097bc44394195b14287f4f920c570ac8653f356a
Fixes: 111413092
Test: This CL can't pass Robo test.
2018-07-20 11:32:13 +08:00
Victor Chang
71d1fed0e7 Show different strings when PO/DO user approves a cert
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"

The change only applies to ProfileOwner and DeviceOwner case

Fix: 28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
2016-05-31 22:43:09 +01:00
Victor Chang
19c7ef11bd Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev 2016-05-13 15:08:17 +00:00
Victor Chang
cba033e4b5 Fix NULL instead of DPC name is displayed in Certificate warning
Bug: 28752118

Change-Id: I5a6e17efd92aaea5188d83f2ccb7e7b8d1f1dc1b
2016-05-13 14:45:30 +01:00
Victor Chang
e8c5eca02d Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev 2016-05-11 14:43:14 +00:00
Victor Chang
01f4dbcc1c Fix ConfirmCredential is not presented before trusting cert installed by PO/DO
- Show ConfirmCredential in TrustedCredentialsSettings when Trust button is clicked
  for the very first time since the activity launched
- Warning activity (work mode off, crpyto-aware) should not be shown when the activity is started. Also fixed it here.

Bug: 28619980
Change-Id: I084b70883c087376e437a9ad3238d7c3313a0a17
2016-05-11 15:05:21 +01:00
Victor Chang
f5b2fea636 Show a different Root CA string for device owner
Bug: 28627835
Change-Id: Iab750dbe7099336b664ef66892cbf2c1b89a9e8e
2016-05-09 16:41:45 +01:00
Victor Chang
e8a46f2838 Remove reference to @string/ssl_ca_cert_dialog_title
Bug: 28263186
Change-Id: I2e1c7d30d1fff49b2103acec90769edf4b61911b
2016-04-19 17:47:58 +01:00
Victor Chang
17ead044e1 "CA cert installed" notification should take PO into account
- PO shows same dialog as DO, as shown in UI mock
- Keep consumer message the same
- Add cancel button
- string change
- remove TYPE_SYSTEM_ALERT due to the bug that the dialog is shown in primary user and bypass work challenge
  (Step: unlock work user -> launch dialog -> lock work user -> unlock personal user -> the dialog is still shown)
- Remove dismissKeyguard, because I believe the dialog should still be protected by the keyguard

Bug: 25772443
Bug: 18224038
Change-Id: I4f2580d1f6d2f88cfeadebcf6e8b0406e5c4b413
2016-04-13 11:13:58 +01:00
Victor Chang
caa8877f75 Show trust option for multiple unapproved cert in chain
- Add a argument to pass user id
- Check approval status of certs in WorkerThread

Bug: 18224038
Change-Id: I5fd6a41e9593d0f339fecb4185331175e32c50c2
2016-04-12 21:00:14 +01:00
Makoto Onuki
4cfe39f539 Use explicit APIs to get device owner information
Bug 24676413

Change-Id: Id346c2f01658173c9671edcfd34bc33f1b25faa4
2015-11-24 14:55:26 -08:00
Maggie Benthall
9d6c40e56d Activity for messaging installed CA certs, and icon in Settings.
Add the MonitoringCertInfoActivity, used by Settings, QuickSettings
and notification to explain about CA certs enabling network traffic
monitoring.
Add a button on the Security item in Settings when a cert is installed.

Bug: 10633199

Change-Id: Ic753fe22b66c30d837a9ba471a0632a07bb7471f
2013-09-14 15:02:51 -04:00