Xiyuan Xia
c31bfb2dca
am 6642a642: am beebc958: am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
...
* commit '6642a642109b088d9b29f4374d55749c9c000995':
Fix races in ConfirmPassword/Pattern
2015-09-03 00:44:18 +00:00
Xiyuan Xia
6642a64210
am beebc958: am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
...
* commit 'beebc95884e15bc53594a6fa63e1dd7736eb4b93':
Fix races in ConfirmPassword/Pattern
2015-09-03 00:34:15 +00:00
Lifu Tang
02b86a3426
Merge "Created new task when launching injected activity"
2015-09-02 21:54:13 +00:00
Xiaohui Chen
2f138f87f1
Merge "Cleanup USER_OWNER in Settings"
2015-09-02 21:08:45 +00:00
Geoff Mendal
c638c8f7b3
Import translations. DO NOT MERGE
...
Change-Id: I594aadd6ad5c196e88e6bf08fb46ff8e3964482f
Auto-generated-cl: translation import
2015-09-02 06:20:12 -07:00
Xiyuan Xia
beebc95884
am 676a4b65: am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
...
* commit '676a4b65b18a97851c6762446b8236ca941cd0a3':
Fix races in ConfirmPassword/Pattern
2015-09-01 20:53:56 +00:00
Xiyuan Xia
676a4b65b1
am 50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
...
* commit '50e1f59a6891cbf3995db0e7fc811f018f9ba63a':
Fix races in ConfirmPassword/Pattern
2015-09-01 20:39:58 +00:00
Xiyuan Xia
50e1f59a68
Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
2015-09-01 20:29:41 +00:00
Xiaohui Chen
762104ea5d
Cleanup USER_OWNER in Settings
...
This cl updates a couple places related to managed profiles.
Bug: 19913735
Change-Id: I72b5315885fc34d8716339ecc18447c15867a5ac
2015-09-01 13:23:48 -07:00
Jason Monk
b600e38d48
am de750e8c: am 2ffca0c5: am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
...
* commit 'de750e8cf11a30045ee454c5f0d6d1de9ccdcc64':
Protect against multiple provision responses
2015-09-01 19:40:03 +00:00
Jason Monk
de750e8cf1
am 2ffca0c5: am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
...
* commit '2ffca0c52a770dfe610d492fa9ba8328b79c85f7':
Protect against multiple provision responses
2015-09-01 19:28:25 +00:00
Xiyuan Xia
9d650a28fc
am 4e485080: am 060ce6b5: am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
...
* commit '4e4850802b8be707e15f4e31327f26b5f34eac0a':
Fix wrong stage exception in ChooseLockPattern
2015-09-01 19:26:27 +00:00
Jason Monk
2ffca0c52a
am b39ceab7: am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
...
* commit 'b39ceab718f0265be3c7e8bf9df1ab0917b5307b':
Protect against multiple provision responses
2015-09-01 19:21:03 +00:00
Xiyuan Xia
4e4850802b
am 060ce6b5: am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
...
* commit '060ce6b5a77e629a1a317f7fe4c2c62fc5ed3c04':
Fix wrong stage exception in ChooseLockPattern
2015-09-01 19:15:28 +00:00
Jason Monk
b39ceab718
am 65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
...
* commit '65b0666d36896c0c5616f867af5396c036ed1cb6':
Protect against multiple provision responses
2015-09-01 19:10:12 +00:00
Xiyuan Xia
060ce6b5a7
am 9e06cbf5: am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
...
* commit '9e06cbf5a379d0a05f13d2a6e1660793fb7015a3':
Fix wrong stage exception in ChooseLockPattern
2015-09-01 19:07:30 +00:00
Jason Monk
65b0666d36
Merge "Protect against multiple provision responses" into mnc-dr-dev
2015-09-01 19:02:44 +00:00
Xiyuan Xia
9e06cbf5a3
am a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
...
* commit 'a104c05da9d42375f7307cce58039f7edafaa078':
Fix wrong stage exception in ChooseLockPattern
2015-09-01 18:54:08 +00:00
Xiyuan Xia
a104c05da9
Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
2015-09-01 18:46:19 +00:00
Xiyuan Xia
e47a2ab83e
Fix wrong stage exception in ChooseLockPattern
...
ChooseLockPattern should updateStage instead of always enabling
pattern view input.
Bug:22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
2015-09-01 11:29:36 -07:00
Jason Monk
359170f4b0
Protect against multiple provision responses
...
Bug: 23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
2015-09-01 13:20:55 -04:00
Geoff Mendal
daf2901a1a
am 938cf6f8: (-s ours) am 9cc1143d: (-s ours) am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE
...
* commit '938cf6f863cdbead814d27a7f6647d1fcc79474e':
Import translations. DO NOT MERGE
2015-09-01 16:07:17 +00:00
Xiyuan Xia
00b17fa3c3
Fix races in ConfirmPassword/Pattern
...
- Add a CheckLockResultTracker to track result of async lock check so that
it can finish on configuration change;
- Let the pending lock check finish and ignore subsequent check requests;
- Add a mDisappearing flag to prevent running disappear animation
multiple times;
- Check whether activity is still active after disappear animation
before setting result and finishing it;
- Remove no longer used mNumWrongConfirmAttempts;
Bug:23190499
Change-Id: If1784d3d1fcc152ac06137b12748b9def5726692
2015-08-31 15:25:31 -07:00
Geoff Mendal
938cf6f863
am 9cc1143d: (-s ours) am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE
...
* commit '9cc1143d8f7e7810b73516f0797558c09614c477':
Import translations. DO NOT MERGE
2015-08-31 14:35:52 +00:00
Geoff Mendal
9cc1143d8f
am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE
...
* commit '0e6d38462b96c61465d06ce6c5dfa17297e49df8':
Import translations. DO NOT MERGE
2015-08-31 14:25:26 +00:00
Geoff Mendal
0e6d38462b
am f33098ea: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f33098eaa02416997775fe1112484c56b13dc93b':
Import translations. DO NOT MERGE
2015-08-31 14:18:22 +00:00
Geoff Mendal
f33098eaa0
Import translations. DO NOT MERGE
...
Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426
Auto-generated-cl: translation import
2015-08-31 07:07:58 -07:00
Geoff Mendal
96c4330eef
Import translations. DO NOT MERGE
...
Change-Id: I39fa6b9b72e50d1ded02a2701ac6ac989a31861b
Auto-generated-cl: translation import
2015-08-31 06:23:03 -07:00
Geoff Mendal
efd3a20ce9
am 7baf9a3e: (-s ours) am f7a20d53: (-s ours) am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE
...
* commit '7baf9a3e8a7c9c7e27262bc30cdccdde049bf031':
Import translations. DO NOT MERGE
2015-08-29 23:19:04 +00:00
Geoff Mendal
7baf9a3e8a
am f7a20d53: (-s ours) am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f7a20d5349288f5efb7c94c60d7459b335fb9f98':
Import translations. DO NOT MERGE
2015-08-29 23:09:59 +00:00
Geoff Mendal
f7a20d5349
am e387dccb: (-s ours) am 96edf807: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e387dccbacb9119fec02a54d26440ef5a2ee0ce1':
Import translations. DO NOT MERGE
2015-08-29 22:57:36 +00:00
Geoff Mendal
e387dccbac
am 96edf807: (-s ours) Import translations. DO NOT MERGE
...
* commit '96edf8077347297d030af02a9452c726bbc421c8':
Import translations. DO NOT MERGE
2015-08-29 22:44:43 +00:00
Geoff Mendal
96edf80773
Import translations. DO NOT MERGE
...
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
2015-08-29 08:38:50 -07:00
Geoff Mendal
91971bc0e3
Import translations. DO NOT MERGE
...
Change-Id: Ia3254d8fb04749c16c9e5a123de212adce9b33f6
Auto-generated-cl: translation import
2015-08-29 07:54:23 -07:00
Fyodor Kupolov
20f6f0d31f
Merge "Use createRestrictedProfile method to create profile"
2015-08-29 00:08:20 +00:00
Fyodor Kupolov
9938f6fa45
Use createRestrictedProfile method to create profile
...
Bug: 23191995
Change-Id: I83d900b274563dc964fd07dbd0fccbdb4b275f29
2015-08-28 17:02:21 -07:00
Maurice Lam
566af8ce2a
am 2fef0595: am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '2fef059543bc859d5723246a635d0e1773f623de':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:48:17 +00:00
Maurice Lam
2fef059543
am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '07c2561d80fba5b3764177aa03dc4496cbe9b47e':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:41:42 +00:00
Maurice Lam
07c2561d80
am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '8cea65f99f23c1a86d7a760b2dba89fa83036959':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:31:35 +00:00
Maurice Lam
8cea65f99f
am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
...
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
[Fingerprint] Add skip dialog during SUW
2015-08-28 22:24:52 +00:00
Maurice Lam
3087a4e0fd
Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
2015-08-28 22:13:19 +00:00
Xiaohui Chen
47a82b5d6d
Merge "Cleanup USER_OWNER for cryptkeeper"
2015-08-28 20:35:24 +00:00
Maurice Lam
48cf33a94e
[Fingerprint] Add skip dialog during SUW
...
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.
Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
2015-08-28 12:39:21 -07:00
Geoff Mendal
4e95926249
am 515d5f32: (-s ours) am c350e4e1: (-s ours) am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit '515d5f32d5951fbbe310b64411a95f45a695f428':
Import translations. DO NOT MERGE
2015-08-28 10:39:38 +00:00
Geoff Mendal
515d5f32d5
am c350e4e1: (-s ours) am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c350e4e1335c0d9f89fb7be81b65baaf36a30f0f':
Import translations. DO NOT MERGE
2015-08-28 10:34:06 +00:00
Geoff Mendal
70569e65da
am 90972fe5: (-s ours) am e6d06aeb: (-s ours) am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE
...
* commit '90972fe51053179a4acd3376b6c40019eacf2e6d':
Import translations. DO NOT MERGE
2015-08-28 10:31:57 +00:00
Geoff Mendal
90972fe510
am e6d06aeb: (-s ours) am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e6d06aeb2c5d2a70f71aa1a5365eb2dea46692d8':
Import translations. DO NOT MERGE
2015-08-28 10:25:49 +00:00
Geoff Mendal
c350e4e133
am 15f11ef2: (-s ours) am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit '15f11ef2470d231d495dec7df6410952f07073c2':
Import translations. DO NOT MERGE
2015-08-28 10:25:32 +00:00
Geoff Mendal
15f11ef247
am fea2b30a: (-s ours) am 37dfaa13: (-s ours) Import translations. DO NOT MERGE
...
* commit 'fea2b30ac49e5075a4cc78c1e694a62334192f0a':
Import translations. DO NOT MERGE
2015-08-28 10:21:01 +00:00
Geoff Mendal
e6d06aeb2c
am 2751a8cf: (-s ours) am db044ffb: (-s ours) Import translations. DO NOT MERGE
...
* commit '2751a8cf319c58f83564ff9eb5efbf5b32d2dc7f':
Import translations. DO NOT MERGE
2015-08-28 10:20:47 +00:00
