PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,447 Commits 1 Branch 0 Tags
262b817ee5061b4647f0406e9a8814b22b1846a8
Commit Graph

28447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Chang
262b817ee5 Merge "Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: 4d43e9a764" into nyc-mr1-dev-plus-aosp 
am: 87d713cf7c

* commit '87d713cf7c25ad944518dfa0757a2928ddda5d67':

Change-Id: Ida92b41c06e97e6f42abbd06fcd0806ac8397040
 2016-05-23 12:11:11 +00:00
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
Android Build Merger (Role)
87d713cf7c Merge "Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 am: 4d43e9a764" into nyc-mr1-dev-plus-aosp 2016-05-23 12:04:53 +00:00
Victor Chang
918c5c5551 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev am: b0054ec4e2 
am: 4d43e9a764

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

Change-Id: I73a10207712ba0c8ebf0ddbdb3a7b6680539e821
 2016-05-23 12:03:48 +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
b0054ec4e2 Merge "Fix Continous loop in unifed screenlock when trying to Trust a CA cert" into nyc-dev 2016-05-23 11:51:54 +00:00
Baligh Uddin
5cc864c555 Import translations. DO NOT MERGE am: ffe930ec76 -s ours am: 21b7e430e0 -s ours 
am: 6e9d64ba33  -s ours

* commit '6e9d64ba334555f0b83cf400fb0e8ac6dff9e1e8':

Change-Id: Iba0d03b9f2a8237e7fd8c7b529b67de2fa67aad5
 2016-05-22 23:26:03 +00:00
Baligh Uddin
9c26b8a9f2 Import translations. DO NOT MERGE am: ffe930ec76 -s ours am: e973bb7182 -s ours 
am: 6744d9977e  -s ours

* commit '6744d9977e503755b414b2943cdb47cb118fcd84':
  Import translations. DO NOT MERGE

Change-Id: Ic7c46f9f0c5b9b48f2c9eddac249faac11fe3830
 2016-05-22 23:26:02 +00:00
Baligh Uddin
6e9d64ba33 Import translations. DO NOT MERGE am: ffe930ec76 -s ours 
am: 21b7e430e0  -s ours

* commit '21b7e430e0169d7b5a6f888c19ae37b1b503dec8':

Change-Id: I887f76c385a55621ba61f3621a81b86daea005b3
 2016-05-22 23:23:11 +00:00
Baligh Uddin
6744d9977e Import translations. DO NOT MERGE am: ffe930ec76 -s ours 
am: e973bb7182  -s ours

* commit 'e973bb718299b907a54b0a5d76dbafafa97fbdef':
  Import translations. DO NOT MERGE

Change-Id: I8840558f1983641822a42322fa157fff5d07a7b7
 2016-05-22 23:22:48 +00:00
Baligh Uddin
e973bb7182 Import translations. DO NOT MERGE 
am: ffe930ec76  -s ours

* commit 'ffe930ec76e8bf2ca0ffaffffea60b452e1ad88c':
  Import translations. DO NOT MERGE

Change-Id: I7414492ad43d04da52e362c754b3e2d7d86486f1
 2016-05-22 23:20:36 +00:00
Baligh Uddin
21b7e430e0 Import translations. DO NOT MERGE 
am: ffe930ec76  -s ours

* commit 'ffe930ec76e8bf2ca0ffaffffea60b452e1ad88c':
  Import translations. DO NOT MERGE

Change-Id: Ie71c67e0abd0b08ced8672cae96d4800337c6992
 2016-05-22 23:20:05 +00:00
Baligh Uddin
ffe930ec76 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 28857042
Change-Id: I2ef0467d8a959436073642564afcb8fd25d3d09e
 2016-05-21 13:10:17 -07:00
Felipe Leme
b8c2af0185 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e am: ec218b75ac 
am: 0316e470d1

* commit '0316e470d175a5c3b4840815010f00973b64fac5':

Change-Id: I34d343a3b9764610c1430f909e189964d5d28cb0
 2016-05-20 22:11:13 +00:00
Felipe Leme
6af9e6a8b4 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e am: d21e63fe4b 
am: 1d6d3723ba

* commit '1d6d3723bae00d0b6fd3f19dc63b0cb396bbc367':
  Defined help page for Data Saver.

Change-Id: I5061c9969b538ad3e5f08b6ce95ab6d190955866
 2016-05-20 22:11:01 +00:00
Felipe Leme
0316e470d1 Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e 
am: ec218b75ac

* commit 'ec218b75accb4ab4007b96076b4e8fd997798dec':

Change-Id: Ia0be1f58f0fb1b8e64fbf4bbafcfd69b9abb72e8
 2016-05-20 22:09:27 +00:00
Felipe Leme
1d6d3723ba Merge "Defined help page for Data Saver." into nyc-dev am: f8265a8f1e 
am: d21e63fe4b

* commit 'd21e63fe4b381354a2033bac1251f4152a7e14a3':
  Defined help page for Data Saver.

Change-Id: Ie8761cd677ee5a14a92ba52419d1ee21dfa1befa
 2016-05-20 22:08:22 +00:00
Felipe Leme
d21e63fe4b Merge "Defined help page for Data Saver." into nyc-dev 
am: f8265a8f1e

* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
  Defined help page for Data Saver.

Change-Id: I1430270ab4ac368a6909038ad90816ba67e1d664
 2016-05-20 22:06:06 +00:00
Felipe Leme
ec218b75ac Merge "Defined help page for Data Saver." into nyc-dev 
am: f8265a8f1e

* commit 'f8265a8f1ed751d93ef15596658b82748d2a8d28':
  Defined help page for Data Saver.

Change-Id: I8ee0281525ab7b606bec6262ac2b115cbe31ca2e
 2016-05-20 21:33:30 +00:00
Felipe Leme
f8265a8f1e Merge "Defined help page for Data Saver." into nyc-dev 2016-05-20 21:27:57 +00:00
Jason Monk
f19dddb288 Merge "Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: 00e73e75d5" into nyc-mr1-dev-plus-aosp 
am: 0f8347312f

* commit '0f8347312f30c08fba18c2a42834f59f5d88aee9':

Change-Id: If6f6ea84b92e909a48802894aa202b956edcf9b8
 2016-05-20 18:32:34 +00:00
Jason Monk
d814e2886d Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: cb0e0f9e30 
am: 0d9fe2a14b

* commit '0d9fe2a14b515d257de11c042d5584e30374eb64':
  Protect against monkey crash

Change-Id: I382c9d82d6ad30c23c1753d99f6c361c91eb415e
 2016-05-20 18:32:33 +00:00
Android Build Merger (Role)
0f8347312f Merge "Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 am: 00e73e75d5" into nyc-mr1-dev-plus-aosp 2016-05-20 18:28:32 +00:00
Jason Monk
39573c7cf2 Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 
am: 00e73e75d5

* commit '00e73e75d5092a99fd58b1e0b86a7b5d9c3cbcfb':
  Protect against monkey crash

Change-Id: Ib6d44bdf26d7ace8189c2d53b147b4749a3610c6
 2016-05-20 18:28:19 +00:00
Jason Monk
0d9fe2a14b Merge "Protect against monkey crash" into nyc-dev am: d3ce331b94 
am: cb0e0f9e30

* commit 'cb0e0f9e300785a74eaebde9b048861a5c66135f':
  Protect against monkey crash

Change-Id: I4f731e57db6563e92d64c873c71f5da1367fcf67
 2016-05-20 18:28:18 +00:00
Jason Monk
cb0e0f9e30 Merge "Protect against monkey crash" into nyc-dev 
am: d3ce331b94

* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
  Protect against monkey crash

Change-Id: I62f6f9968fe9826ee6045277e55773963d333c16
 2016-05-20 18:24:36 +00:00
Jason Monk
00e73e75d5 Merge "Protect against monkey crash" into nyc-dev 
am: d3ce331b94

* commit 'd3ce331b94af2c896864f78459c8656629d3455f':
  Protect against monkey crash

Change-Id: Ie079d13887e9159d78ef5485bfa96878cee01d6a
 2016-05-20 18:24:35 +00:00
Jason Monk
d3ce331b94 Merge "Protect against monkey crash" into nyc-dev 2016-05-20 18:21:08 +00:00
Jason Monk
fd41b42487 Protect against monkey crash 
When rebuild comes in after context is no longer valid

Change-Id: Ib64e93372bff4c6b0e1232ac257f3df0e9d0be0a
Fixes: 28875397
 2016-05-20 14:15:10 -04: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
Victor Chang
4a38f28c19 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 2c04e72414 
am: e8653d4dd2

* commit 'e8653d4dd2aae4a5cc1ac572c02090ed738c8c26':

Change-Id: I8c2c3148d64c1c94a5ccdeed1c83be08c0f7c5ef
 2016-05-20 17:48:35 +00:00
Victor Chang
9b94f36138 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 am: 4e47a17a62 
am: a92877f63c

* commit 'a92877f63c5e2d8f88338027969e505903a9554c':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: Iaf117fa1267317771b77040edd8f409bdf8409b1
 2016-05-20 17:48:34 +00:00
Victor Chang
e8653d4dd2 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 
am: 2c04e72414

* commit '2c04e724148556aacbb3956b39af04a16e2a385e':

Change-Id: Ia833572871a8dcd6b89465bd7117354fa8f8f7b3
 2016-05-20 17:41:22 +00:00
Victor Chang
a92877f63c Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev am: 99a88eca78 
am: 4e47a17a62

* commit '4e47a17a625e3d275bd6e8d6884aee6564875ed8':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: Ie5fa3d38a976009242964f0c784b2760e7ffef7e
 2016-05-20 17:39:57 +00:00
Victor Chang
4e47a17a62 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev 
am: 99a88eca78

* commit '99a88eca7840af3cee8ab13a82c12e3217ea6120':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: I77209cdef4dc285e36d3c632acc3fa6cd9ee1bbf
 2016-05-20 17:34:08 +00:00
Victor Chang
2c04e72414 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev 
am: 99a88eca78

* commit '99a88eca7840af3cee8ab13a82c12e3217ea6120':
  Temp fix for NPE when race condition happens in TrustedCredentialsSettings

Change-Id: I9106b6bee11927b909fcfbc417941d0cead07691
 2016-05-20 17:30:38 +00:00
Victor Chang
99a88eca78 Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev 2016-05-20 17:19:42 +00:00
Victor Chang
00859bd548 Temp fix for NPE when race condition happens in TrustedCredentialsSettings 
Bug: 28762124
Change-Id: I21e46c2008e106db1c43573171e0d852cbe0a68a
 2016-05-20 17:19:29 +00:00
Felipe Leme
cf2c0b1b97 Defined help page for Data Saver. 
BUG: 28865521
Change-Id: I07930232312df2775ecee5beacee6921f7245847
 2016-05-20 09:08:28 -07:00
Jason Monk
33816a83c1 Merge "Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: a9dc3a8826" into nyc-mr1-dev-plus-aosp 
am: 7796e8f7cd

* commit '7796e8f7cdae827cbcb6899a2a3cf513c99d6266':

Change-Id: I2f71094a59503db85b87e2a68107ba9bc004dfc0
 2016-05-20 15:15:57 +00:00
Jason Monk
bb160f5de2 Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: fb71469253 
am: f86de9078a

* commit 'f86de9078a91f8ed16265ddfaf7a55a61b9778ed':
  Don't use ApplicationsState for summaries

Change-Id: I89d00fa3fd2e25c448f7c341f3e559eb473377a0
 2016-05-20 15:15:55 +00:00
Android Build Merger (Role)
7796e8f7cd Merge "Don\'t use ApplicationsState for summaries am: 290ca6ec5c am: a9dc3a8826" into nyc-mr1-dev-plus-aosp 2016-05-20 15:13:20 +00:00
Jason Monk
f86de9078a Don\'t use ApplicationsState for summaries am: 290ca6ec5c 
am: fb71469253

* commit 'fb71469253a64d7da163181b46cdb7639da778e9':
  Don't use ApplicationsState for summaries

Change-Id: Ia28528ad388e7732442f4572e13e36cf1f20db9e
 2016-05-20 15:13:08 +00:00
Jason Monk
a9d7ea4c15 Don\'t use ApplicationsState for summaries am: 290ca6ec5c 
am: a9dc3a8826

* commit 'a9dc3a8826ad709c526f208a464e15dc208e4c94':
  Don't use ApplicationsState for summaries

Change-Id: Ie71c994f87f811554adadccd6518e44945d35086
 2016-05-20 15:13:08 +00:00
Jason Monk
a9dc3a8826 Don\'t use ApplicationsState for summaries 
am: 290ca6ec5c

* commit '290ca6ec5c1f029bff7a43d1d499359e25a41904':
  Don't use ApplicationsState for summaries

Change-Id: I0a458fd54256315333eb5c6bcef809e2b2381a5a
 2016-05-20 15:10:20 +00:00
Jason Monk
fb71469253 Don\'t use ApplicationsState for summaries 
am: 290ca6ec5c

* commit '290ca6ec5c1f029bff7a43d1d499359e25a41904':
  Don't use ApplicationsState for summaries

Change-Id: I09f949a2606e30c9e56d7c9026c3fa306cfa506a
 2016-05-20 15:10:20 +00:00
Jason Monk
290ca6ec5c Don't use ApplicationsState for summaries 
Since it grabs a lock that can be slow on the main thread, don't use
ApplicationsState in any of the summaries, instead load the information
directly from the PM.

Change-Id: Ibefe867810d2a9926177a8de4e23a7faea4b1c3b
Fixes: 28435146
 2016-05-20 09:37:53 -04:00
Daniel Nishi
bbbdf1fa24 Merge "Add a collapsible checkbox preference for deletion helper." into nyc-mr1-dev am: ab5a648ddb 
am: d7c52d9a99

* commit 'd7c52d9a992fe799cc2206a6a829d4ab57f77f84':
  Add a collapsible checkbox preference for deletion helper.

Change-Id: I63632673593f3f64d53e44425f94d6accec99127
 2016-05-20 00:16:36 +00:00