Commit Graph

19146 Commits

Author SHA1 Message Date
Victor Chang
3e28393c06 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: e8df0892d4
am: 937b468fb2

* commit '937b468fb204105b514260960b23a965c29d8937':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I6be2fb8eb33ae55d984f860f158175f5ab45e3d7
2016-05-23 12:09:38 +00:00
Victor Chang
937b468fb2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2
am: e8df0892d4

* commit 'e8df0892d427cd8eec0f43970e1241f8e42bc918':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: Iac21f081af2d0cbad3c1174134854cdbcc204ec6
2016-05-23 12:03:44 +00:00
Victor Chang
4d43e9a764 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: I01cd2b287d78484c1653476b75b6d300dec0c34d
2016-05-23 11:59:19 +00:00
Victor Chang
e8df0892d4 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev
am: b0054ec4e2

* commit 'b0054ec4e2275d8d0444b94c0560374630e077f6':
  Fix Continous loop in unifed screenlock when trying to Trust a CA cert

Change-Id: If02ac2e8ddb0438e3b96491686fcd57a646d5a1f
2016-05-23 11:58:58 +00:00
Victor Chang
5e0a46bff6 Fix Continous loop in unifed screenlock when trying to Trust a CA cert
Cause: with unified screenlock, ConfirmDeviceCredentialActivity didn't
forward result with FLAG_ACTIVITY_FORWARD_RESULT

Also, fixed that ConfirmDeviceCredentialActivity didn't allow fingerprint
authenication in unified screenlock after keystore unlocked.

In ChooseLockSettingsHelper, add one new util function to allow
extra option to set returnCredentials to false while external to true.

Set StrongAuth to "not required" when it has been successfully unlocked.

Test:
1. PO Unified Screenlock/Work Challenge x fingerprint -> ok to trust cert
   (Also, no credential is returned in intent)
2. WorkMode off -> Reboot -> turn on Work mode
   -> no fingerprint option, PIN unlock successful to turn work mode on

Bug: 28752364
Change-Id: I6dc8865e8f005545f8577d7731afb4495647062b
2016-05-20 19:10:33 +01:00
Daniel Nishi
07e9f774b0 Merge "Add downloads to the deletion helper." into nyc-mr1-dev am: 95c3c5045f
am: de98b25c01

* commit 'de98b25c01341663847252fceaf97d64ceafbb29':
  Add downloads to the deletion helper.

Change-Id: I092289edbde4d9b439cb6a55ce2a507f5a36a444
2016-05-14 00:15:06 +00:00
Daniel Nishi
de98b25c01 Merge "Add downloads to the deletion helper." into nyc-mr1-dev
am: 95c3c5045f

* commit '95c3c5045fde4667e8085d69a0aba4b82126d682':
  Add downloads to the deletion helper.

Change-Id: I192143eb333d584b4ec792913eda79d9614c6150
2016-05-14 00:12:32 +00:00
Daniel Nishi
2ef20fb36d Add downloads to the deletion helper.
This adds a deletion service to delete files in the Downloads
folder. All of the files there are collected and offered to the
user to delete.

Bug: 28621781
Change-Id: I94431f9abc3a0afa2d07dbab763312c09e830aef
2016-05-13 13:35:37 -07:00
Daniel Nishi
7000aa91b0 Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev
am: 179103258e

* commit '179103258e4e664fbdd76b8440aff3edae86b093':
  Add a deletion helper view for clearing space.

Change-Id: If02b00b3e35e717508ae69894a36ac71a1c3c30f
2016-04-21 17:27:16 +00:00
Daniel Nishi
b84304d4e6 Add a deletion helper view for clearing space.
This view provides an interface which allows users to clear out
apps and other data which they may no longer need to alleviate
storage pressure. This implementation gives the bits to uninstall
apps which have not been used within the last 60 days from the
system.

A future patch will add in the ability to extend the deletion helper
view to have additional clearing types.

Change-Id: I65cba54ca247d52227e67e2fa9b84fe63fb8ab34
(cherry picked from commit a671272bf6)
2016-04-21 10:20:58 -07:00
Daniel Nishi
a671272bf6 Add a deletion helper view for clearing space.
This view provides an interface which allows users to clear out
apps and other data which they may no longer need to alleviate
storage pressure. This implementation gives the bits to uninstall
apps which have not been used within the last 60 days from the
system.

A future patch will add in the ability to extend the deletion helper
view to have additional clearing types.

Change-Id: I65cba54ca247d52227e67e2fa9b84fe63fb8ab34
2016-04-15 09:06:32 -07:00
Geoff Mendal
bddb7deb7a Import translations. DO NOT MERGE
Change-Id: Ia02626660408f6f177ca4d052cbc03eb26c0a871
Auto-generated-cl: translation import
2016-03-18 20:52:22 -07:00
Geoff Mendal
5f96b25dae Import translations. DO NOT MERGE
Change-Id: I2683d49e5f8a7beaa6eb6ee88265cda4fae9a2ca
Auto-generated-cl: translation import
2016-03-19 04:17:38 +01:00
Geoff Mendal
7f987c75a0 Import translations. DO NOT MERGE
Change-Id: I50559a9a46ebcc59a6b8476b113f6323f84ed1a9
Auto-generated-cl: translation import
2016-02-22 07:46:55 -08:00
Geoff Mendal
31843625d3 Revert "Import translations. DO NOT MERGE"
This reverts commit 6c223f1d13.

Change-Id: I958bfa40029b0e0a05cdaba8fa4ad050f574407a
2016-02-22 15:07:22 +00:00
Geoff Mendal
6c223f1d13 Import translations. DO NOT MERGE
Change-Id: I4beb7718801e8c5451db86d8f1fff952c7c1e393
Auto-generated-cl: translation import
2016-02-22 06:27:10 -08:00
Geoff Mendal
e42e2fe251 Import translations. DO NOT MERGE
Change-Id: I0cab1d68ca64567f0755574a37c2f1e52c45abca
Auto-generated-cl: translation import
2016-02-10 07:48:36 -08:00
Geoff Mendal
f53a6c90f3 Import translations. DO NOT MERGE
Change-Id: I4879140c3fa74a518309d9f48d3b8ca29411d9f8
Auto-generated-cl: translation import
2016-02-10 06:33:10 -08:00
Geoff Mendal
582bc62a3d Import translations. DO NOT MERGE
Change-Id: I25c554e30994fb003e43d31e54166ee29e8d5bf6
Auto-generated-cl: translation import
2016-02-08 17:55:50 +01:00
Geoff Mendal
b658590528 Import translations. DO NOT MERGE
Change-Id: I8f300745f44ddf8d429aa27beba2fc34bf8c9d49
Auto-generated-cl: translation import
2016-02-03 06:44:39 -08:00
Jeremy Klein
42320452f8 Merge "Add unit tests for TetherService." 2016-02-02 19:41:10 +00:00
Jeremy Klein
f6b6713d77 Add unit tests for TetherService.
BUG: 26247383
Change-Id: I07ce14f4a2726e35b8b5665a3e0a8df7af864b3b
2016-02-02 11:18:28 -08:00
Benjamin Franz
f733e93a94 Merge "Add SmallTest annotation to UserCredentialsTest" 2016-01-26 09:30:49 +00:00
Geoff Mendal
1092be7f0b Import translations. DO NOT MERGE
Change-Id: I3a891ae3544d89fd096c653c8f3c9792f14c5419
Auto-generated-cl: translation import
2016-01-25 10:55:43 -08:00
Benjamin Franz
d72fffea1b Add SmallTest annotation to UserCredentialsTest
Also cleaned up the comments and the imports slightly.

Change-Id: Ieea8af1914ff2f78764d33a9ce6b56621c809fcf
2016-01-25 18:27:18 +00:00
Geoff Mendal
764d0d272c Merge "Revert "Import translations. DO NOT MERGE"" 2016-01-25 14:54:16 +00:00
Geoff Mendal
589f0dd32c Revert "Import translations. DO NOT MERGE"
This reverts commit 098199b614.

Change-Id: Ie756851719c5324ef866be4a56f8d97180610e44
2016-01-25 14:53:23 +00:00
Geoff Mendal
c7c79f8398 Merge "Import translations. DO NOT MERGE" 2016-01-25 14:36:37 +00:00
Geoff Mendal
098199b614 Import translations. DO NOT MERGE
Change-Id: I89b37a2718f15f037dfa28fb00e983568b1b1104
Auto-generated-cl: translation import
2016-01-25 06:34:44 -08:00
Benjamin Franz
12f5e7b13e Move UserCredentialsTests to unit/
Change-Id: I17bf5fe982016ffc296ade198a74149dc0bd2ddf
2016-01-25 14:11:26 +00:00
Robin Lee
7b8f2354f4 Merge "Test: parcel marshalling for user credentials page" 2016-01-25 12:42:30 +00:00
Robin Lee
e26804208c Test: parcel marshalling for user credentials page
Unit test to verify that the internal Credential that gets passed to
dialogs for removing said credential is actually a valid Parcelable
object, since it's hard to provoke a marshal/unmarshal in real-world
usage (but not impossible).

Bug: 22541933
Change-Id: I780ca2d7b01fc6081b9ea8b2810cfc97f0433a86
2016-01-25 12:27:31 +00:00
Benjamin Franz
d11b713a9f Change build targets for settings tests
1. Split existing tests into fully automatable (unit/) and not fully
automatable (app/)
2. Revert previous changes to test runners on app/
3. Fix some typos in readme

This will enable us to add the fully automatable test target
SettingsUnitTests to the continuous integration tests on the platform.

Change-Id: I0f42c59fde84891e4bfc379150c2f0c61ce1329f
2016-01-21 12:32:15 +00:00
Benjamin Franz
11805d159c Add unit tests to Utils
1. Switch to AndroidJUnitRunner
2. Add mockito support
3. Add tests for Utils class

Change-Id: I1eabfdf1d65456d71363b8970beee9239a90ada2
2016-01-20 18:45:36 +00:00
Geoff Mendal
7a8e8880b8 Import translations. DO NOT MERGE
Change-Id: I9ed660e4a0cb209ff3a19943b4f294fcfde307b1
Auto-generated-cl: translation import
2016-01-05 07:56:37 -08:00
Tony Mantler
4559b5d62f Move some methods to DeviceInfoUtils in SettingsLib
Change-Id: I3d51e4d0d376d03dfe5f9f667d4586f17c07f3e1
2015-11-11 11:24:56 -08:00
Baligh Uddin
72372d9398 Import translations. DO NOT MERGE
Change-Id: Ia81b1f26cc4559a1b72b024249757a190ea87764
Auto-generated-cl: translation import
2015-09-25 14:12:22 -07:00
Geoff Mendal
0abb9b7d69 Import translations. DO NOT MERGE
Change-Id: Ief396718afca7ea286c8ad923eb1448074fd2d4d
Auto-generated-cl: translation import
2015-07-29 06:05:53 -07:00
Geoff Mendal
c9541e5fda Import translations. DO NOT MERGE
Change-Id: Iee81fc4d17f748e4a9fd294c6d813a773dc44b89
Auto-generated-cl: translation import
2015-07-20 15:26:26 -07:00
Narayan Kamath
485db87a11 am 5152086a: am 83a25842: Merge "Lose some deprecated test annotations."
* commit '5152086a17f23a7271ca6a56ea5456af46777aa9':
  Lose some deprecated test annotations.
2015-07-14 20:37:05 +00:00
Narayan Kamath
5152086a17 am 83a25842: Merge "Lose some deprecated test annotations."
* commit '83a25842e720ddb838519e194679b464d0114301':
  Lose some deprecated test annotations.
2015-07-14 20:27:36 +00:00
Robin Lee
4e3635d8db am 722d5e22: am be638020: am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '722d5e221aef34220f0e6be874f62b14b7dea13f':
  Match getLegacyVpn calls to changed interface
2015-07-10 20:09:32 +00:00
Robin Lee
be638020e5 am 719cbc4a: am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev
* commit '719cbc4acfe01d3aaf0dfb1061c06b69b7db2d29':
  Match getLegacyVpn calls to changed interface
2015-07-10 19:41:01 +00:00
Narayan Kamath
e92cc80bbf Lose some deprecated test annotations.
Will be deleted shortly. They're no-ops because nobody knows
how to process them.

Change-Id: I2898a57e508b0bc39edb2cc2ab7a26f98de608e0
2015-07-09 17:58:27 +01:00
Robin Lee
290784afde Match getLegacyVpn calls to changed interface
The userId argument is now explicit. Pre-requisite for bug 21499103

Change-Id: Ib83e9615326ea484ef6d63fb1a1d9c1659999dab
2015-07-07 12:35:14 -07:00
Robin Lee
2196afd9ae am d234296b: am c0d07e31: am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
* commit 'd234296b96d6dfbcf2fef205d7b86a1456e69631':
  VPN: UI for forgetting disconnected VPNs
2015-05-19 10:48:26 +00:00
Robin Lee
c0d07e314a am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev
* commit 'b5c48a4c347f7aa64b99e80370a63b3f60d3203c':
  VPN: UI for forgetting disconnected VPNs
2015-05-19 10:25:58 +00:00
Robin Lee
01b35bcae3 VPN: UI for forgetting disconnected VPNs
Made possible by expanded internal VPN APIs.

Bug: 20872408
Bug: 20692490
Bug: 20747154
Change-Id: Idc87084a130afa18b27c85cc9d4b5033dcedaabe
2015-05-18 22:55:15 +01:00
Geoff Mendal
07803c0bfe Import translations. DO NOT MERGE
Change-Id: Ia831500abc9de4dd293c116e0a81f4bcccad0672
Auto-generated-cl: translation import
2015-05-13 21:12:10 -07:00
Geoff Mendal
a287c8ebb0 Import translations. DO NOT MERGE
Change-Id: Icce0b46b679e33df1fb7cd069d01aaae5afeeea4
Auto-generated-cl: translation import
2015-05-13 06:58:02 -07:00