OSDN Git Service
Maurice Lam [Thu, 10 Sep 2015 01:03:54 +0000 (01:03 +0000)]
Merge "[WifiSetup] Suppress crash during Wi-Fi setup"
Jim Miller [Wed, 9 Sep 2015 23:22:50 +0000 (23:22 +0000)]
am
eddb0493: am
93b39ff9: am
01f44efa: am
179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reache
* commit '
eddb04934b2b52ab0ff6545515df8f0801f538c0':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
Jim Miller [Wed, 9 Sep 2015 23:14:27 +0000 (23:14 +0000)]
am
93b39ff9: am
01f44efa: am
179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRIN
* commit '
93b39ff9bd40df755967a4dfe0593b30b0cfa8d2':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
Jim Miller [Wed, 9 Sep 2015 23:08:06 +0000 (23:08 +0000)]
am
01f44efa: am
179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEO
* commit '
01f44efab0673e8648470c8be1670730660a4778':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
Maurice Lam [Wed, 9 Sep 2015 23:03:00 +0000 (16:03 -0700)]
[WifiSetup] Suppress crash during Wi-Fi setup
Bug:
23936498
Change-Id: I7d97995cfb3c904aee3fc1baa50ea3dafe7d72ea
Jim Miller [Wed, 9 Sep 2015 23:02:34 +0000 (23:02 +0000)]
am
179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro
* commit '
179fa5078b6e105e6e01e82c0af7c43745c452b0':
Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
Jim Miller [Wed, 9 Sep 2015 22:53:53 +0000 (22:53 +0000)]
Merge "Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again." into mnc-dr-dev
Jim Miller [Wed, 2 Sep 2015 21:00:50 +0000 (14:00 -0700)]
Handle fp enrollment errors more gracefully
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.
Fixes bug
23546104
Fixes bug
22708384
Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
Sungmin Choi [Wed, 9 Sep 2015 18:32:10 +0000 (18:32 +0000)]
am
605685ce: am
5fc62441: am
9819dcb9: am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
605685ceae58d6a0c920ec4f809cf11cd32c34e1':
Hide or show APNs with type="ims" as CarrierConfig
Sungmin Choi [Wed, 9 Sep 2015 18:14:08 +0000 (18:14 +0000)]
am
5fc62441: am
9819dcb9: am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
5fc624418c11d8a949c6ab61fa3c0b0bc2fb2d46':
Hide or show APNs with type="ims" as CarrierConfig
Sungmin Choi [Wed, 9 Sep 2015 18:06:25 +0000 (18:06 +0000)]
am
9819dcb9: am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
9819dcb93e2ce077e674cf4a25b66c5df341b2f9':
Hide or show APNs with type="ims" as CarrierConfig
Sungmin Choi [Wed, 9 Sep 2015 17:58:29 +0000 (17:58 +0000)]
am
9fcc7e1b: Hide or show APNs with type="ims" as CarrierConfig
* commit '
9fcc7e1b20b890283dfe9a02999f40637d27dbb2':
Hide or show APNs with type="ims" as CarrierConfig
Alan Viverette [Wed, 9 Sep 2015 14:27:52 +0000 (10:27 -0400)]
Rename night mode back to Night mode
Which is technically correct (the best correct) and appropriately
manages user expectations.
Change-Id: Ic1680bc47a0c7953afc01f3c678f19b0755062f4
Sungmin Choi [Fri, 28 Aug 2015 23:56:31 +0000 (16:56 -0700)]
Hide or show APNs with type="ims" as CarrierConfig
APN with type="ims" is used to attach IMS APN to the modem.
This APN is meaningless and confusing to end users.
Most carriers don't care to show this APN from apn list.
Some carriers want to show this APN from apn list and others don't.
This change hides or shows this as CarrierConfig from the APN list.
Bug:
23770219
Change-Id: Ia632f39401d84e8c63ac96f1c3b12aa3d8d2a4e6
Jorim Jaggi [Tue, 8 Sep 2015 22:16:53 +0000 (22:16 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 22:07:52 +0000 (22:07 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 22:02:24 +0000 (22:02 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 21:53:45 +0000 (21:53 +0000)]
Jorim Jaggi [Tue, 8 Sep 2015 21:40:27 +0000 (14:40 -0700)]
Fix build
Change-Id: I8885ecd0f5ccab5e73f75323c51a504509c575e3
Jorim Jaggi [Tue, 8 Sep 2015 21:39:53 +0000 (21:39 +0000)]
am
6599eb9a: am
52aca96c: am
64ea62a3: am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
6599eb9af255f1e0406b813d038737d5a3c11942':
Fix crash in fingerprint settings when rotating
Jorim Jaggi [Tue, 8 Sep 2015 21:36:04 +0000 (21:36 +0000)]
am
52aca96c: am
64ea62a3: am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
52aca96c0bd1a52aab3e42c08b10fed7c5763773':
Fix crash in fingerprint settings when rotating
Jorim Jaggi [Tue, 8 Sep 2015 21:26:38 +0000 (21:26 +0000)]
am
64ea62a3: am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
64ea62a30a416b46ecdb2042e052825b96702012':
Fix crash in fingerprint settings when rotating
Jorim Jaggi [Tue, 8 Sep 2015 21:17:06 +0000 (21:17 +0000)]
am
8c543276: Fix crash in fingerprint settings when rotating
* commit '
8c543276f1dd366bd142ce44a8e3084fddb22971':
Fix crash in fingerprint settings when rotating
Jorim Jaggi [Fri, 4 Sep 2015 18:42:28 +0000 (11:42 -0700)]
Fix crash in fingerprint settings when rotating
Fragments always need empty constructors.
Bug:
23806551
Change-Id: Ib22a89be60f799d70caf1acf2ac95a20e6be9675
Julia Reynolds [Tue, 8 Sep 2015 17:14:02 +0000 (17:14 +0000)]
Merge "Differentiate battery optimization string."
Julia Reynolds [Fri, 4 Sep 2015 14:36:57 +0000 (10:36 -0400)]
Differentiate battery optimization string.
Bug:
23585186
Change-Id: If98629c7a3204f2600c9d7d9c257de24e826f085
Robin Lee [Tue, 8 Sep 2015 16:03:26 +0000 (16:03 +0000)]
Merge "Show installed user keys in Security Settings"
Geoff Mendal [Mon, 7 Sep 2015 16:05:03 +0000 (16:05 +0000)]
am
8375466f: (-s ours) am
593714a8: (-s ours) am
f1e6378a: (-s ours) am
f1a62026: (-s ours) Import translations. DO NOT MERGE
* commit '
8375466fe9c0616d3ccdb66bafb135ec5de20cc9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:58:42 +0000 (15:58 +0000)]
am
593714a8: (-s ours) am
f1e6378a: (-s ours) am
f1a62026: (-s ours) Import translations. DO NOT MERGE
* commit '
593714a8d135f7ddafd2ae369cfd09777afdb8e5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:51:05 +0000 (15:51 +0000)]
am
f1e6378a: (-s ours) am
f1a62026: (-s ours) Import translations. DO NOT MERGE
* commit '
f1e6378a7e181fadd0ccd007dc7249d7ad250a24':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:42:38 +0000 (15:42 +0000)]
am
f1a62026: (-s ours) Import translations. DO NOT MERGE
* commit '
f1a62026b83b54b5f234cd87df66fa32f754c914':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 7 Sep 2015 15:35:11 +0000 (08:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
Geoff Mendal [Mon, 7 Sep 2015 14:49:54 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ide5e5bf4e5da66bfb8246f90da690f447db2e411
Auto-generated-cl: translation import
Maurice Lam [Fri, 4 Sep 2015 19:30:26 +0000 (19:30 +0000)]
Merge "Update setup wizard skip dialog strings"
Xiaohui Chen [Fri, 4 Sep 2015 17:42:35 +0000 (17:42 +0000)]
Merge "Remove dead Nsd checkbox"
Xiaohui Chen [Fri, 4 Sep 2015 17:42:22 +0000 (17:42 +0000)]
Merge "Cleanup remaining USER_OWNER in Settings"
Maurice Lam [Thu, 3 Sep 2015 18:50:36 +0000 (11:50 -0700)]
Update setup wizard skip dialog strings
Change "Don't skip" to "Go back".
Bug:
23764890
Change-Id: I899ce893ddeb1cef94d1733871005fd0356ed475
Jason Monk [Thu, 3 Sep 2015 18:46:50 +0000 (18:46 +0000)]
am
7af285b3: am
3f2ac58c: am
07b26bb3: am
1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
* commit '
7af285b3fc8638f2caba31bb4a91e7cf9535f263':
Start tether service with redeliver intent
Jason Monk [Thu, 3 Sep 2015 18:36:00 +0000 (18:36 +0000)]
am
3f2ac58c: am
07b26bb3: am
1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
* commit '
3f2ac58c932311fa61bc848af7aceec6f0f3a63d':
Start tether service with redeliver intent
Xiaohui Chen [Thu, 3 Sep 2015 18:29:45 +0000 (11:29 -0700)]
Remove dead Nsd checkbox
It seems to be dead from few years ago. This cl just cleans things up.
See b/
6449478 for context.
Change-Id: Ida5eca16df88c866d3557e12dcde8884706810c6
Jason Monk [Thu, 3 Sep 2015 18:25:57 +0000 (18:25 +0000)]
am
07b26bb3: am
1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
* commit '
07b26bb3fcc35d990be7263afe546445d23938b2':
Start tether service with redeliver intent
Jason Monk [Thu, 3 Sep 2015 18:14:51 +0000 (18:14 +0000)]
am
1cfaf01f: Merge "Start tether service with redeliver intent" into mnc-dr-dev
* commit '
1cfaf01fdaba22884a126a84748cf3a619785b3e':
Start tether service with redeliver intent
Jason Monk [Thu, 3 Sep 2015 17:51:09 +0000 (17:51 +0000)]
Merge "Start tether service with redeliver intent" into mnc-dr-dev
Xiaohui Chen [Wed, 2 Sep 2015 23:54:00 +0000 (16:54 -0700)]
Cleanup remaining USER_OWNER in Settings
Bug:
19913735
Change-Id: I6894a7c81ed7504b02d533d9e9f65f800dbca895
Jorim Jaggi [Thu, 3 Sep 2015 17:28:46 +0000 (17:28 +0000)]
am
469447bb: am
bfacb5f4: am
98d91550: am
c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
* commit '
469447bb8c7a252034750aa215e809a45413e732':
Fix fingerprint settings ripples
Maurice Lam [Thu, 3 Sep 2015 17:28:44 +0000 (17:28 +0000)]
am
570852da: am
84afdfde: am
82db64e9: am
d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '
570852da1875ad34d6d1b751e2bacaee8d7a9a1a':
[Fingerprint] Update strings for skip dialog
Sungmin Choi [Thu, 3 Sep 2015 17:28:43 +0000 (17:28 +0000)]
am
eeb5f8f1: am
a43a40ff: am
e31208ae: am
05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit '
eeb5f8f1a2d31a9231ebb96ce55abe2213900377':
To hide none security option, use config_hide_none_security_option config
Geoff Mendal [Thu, 3 Sep 2015 17:28:42 +0000 (17:28 +0000)]
am
10c447c2: (-s ours) am
532ebb9f: (-s ours) am
8ee8b379: (-s ours) am
e182fa77: (-s ours) Import translations. DO NOT MERGE
* commit '
10c447c2cdb09ec1bb092d35fb93911aeccbc2e4':
Import translations. DO NOT MERGE
Jason Monk [Thu, 3 Sep 2015 16:48:25 +0000 (12:48 -0400)]
Start tether service with redeliver intent
So that the intent comes back when we are restarted rather than
null causing a crash.
Bug:
23678853
Change-Id: I1697159d5557feb7a87b238f8efa99ed3142fe6a
Jorim Jaggi [Thu, 3 Sep 2015 06:23:58 +0000 (06:23 +0000)]
am
bfacb5f4: am
98d91550: am
c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
* commit '
bfacb5f483b6fe8c117d8df9ab0a1bbe3909df26':
Fix fingerprint settings ripples
Maurice Lam [Thu, 3 Sep 2015 06:23:36 +0000 (06:23 +0000)]
am
84afdfde: am
82db64e9: am
d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '
84afdfdefaa935764aff589799b3ccf3a2fa06a1':
[Fingerprint] Update strings for skip dialog
Sungmin Choi [Thu, 3 Sep 2015 06:22:57 +0000 (06:22 +0000)]
am
a43a40ff: am
e31208ae: am
05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit '
a43a40ffe7e55a4421635fc0a47ede295f2d61ed':
To hide none security option, use config_hide_none_security_option config
Geoff Mendal [Thu, 3 Sep 2015 06:21:36 +0000 (06:21 +0000)]
am
532ebb9f: (-s ours) am
8ee8b379: (-s ours) am
e182fa77: (-s ours) Import translations. DO NOT MERGE
* commit '
532ebb9f7afaf512567811fe8cdb9b74376b00c2':
Import translations. DO NOT MERGE
Jorim Jaggi [Thu, 3 Sep 2015 01:37:47 +0000 (01:37 +0000)]
am
98d91550: am
c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
* commit '
98d91550b624ca942fea7d096835c5bdf73f9af2':
Fix fingerprint settings ripples
Jorim Jaggi [Thu, 3 Sep 2015 01:28:51 +0000 (01:28 +0000)]
am
c624a72b: Merge "Fix fingerprint settings ripples" into mnc-dr-dev
* commit '
c624a72be19027a0784fb41575129b334ff02ae7':
Fix fingerprint settings ripples
Jorim Jaggi [Thu, 3 Sep 2015 01:19:28 +0000 (01:19 +0000)]
Merge "Fix fingerprint settings ripples" into mnc-dr-dev
Xiyuan Xia [Thu, 3 Sep 2015 00:44:18 +0000 (00:44 +0000)]
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
Jorim Jaggi [Thu, 3 Sep 2015 00:24:55 +0000 (17:24 -0700)]
Fix fingerprint settings ripples
Bug:
22471044
Bug:
23234027
Change-Id: If74a133f33c9cc72cb9ff6ccce32458d7300ae07
Xiyuan Xia [Thu, 3 Sep 2015 00:34:15 +0000 (00:34 +0000)]
am
beebc958: am
676a4b65: am
50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
* commit '
beebc95884e15bc53594a6fa63e1dd7736eb4b93':
Fix races in ConfirmPassword/Pattern
Maurice Lam [Wed, 2 Sep 2015 23:54:52 +0000 (23:54 +0000)]
am
82db64e9: am
d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '
82db64e940905a18aae4e716f361b6a9a72d0a4e':
[Fingerprint] Update strings for skip dialog
Maurice Lam [Wed, 2 Sep 2015 23:44:06 +0000 (23:44 +0000)]
am
d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '
d8723073bb802c0e75df20edbada5e47bd020057':
[Fingerprint] Update strings for skip dialog
Maurice Lam [Wed, 2 Sep 2015 23:35:15 +0000 (23:35 +0000)]
Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
Lifu Tang [Wed, 2 Sep 2015 21:54:13 +0000 (21:54 +0000)]
Merge "Created new task when launching injected activity"
Maurice Lam [Wed, 2 Sep 2015 21:36:19 +0000 (14:36 -0700)]
[Fingerprint] Update strings for skip dialog
Bug:
23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
Sungmin Choi [Wed, 2 Sep 2015 21:25:25 +0000 (21:25 +0000)]
am
e31208ae: am
05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit '
e31208ae1c253b35edd34192f49c14a59bbd8c13':
To hide none security option, use config_hide_none_security_option config
Xiaohui Chen [Wed, 2 Sep 2015 21:08:45 +0000 (21:08 +0000)]
Merge "Cleanup USER_OWNER in Settings"
Sungmin Choi [Wed, 2 Sep 2015 21:02:58 +0000 (21:02 +0000)]
am
05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit '
05c7dde1f3a6044db7b687dfcbacbde50f3befb1':
To hide none security option, use config_hide_none_security_option config
Sungmin Choi [Fri, 31 Jul 2015 09:03:52 +0000 (02:03 -0700)]
To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.
Bug:
22209425
Bug:
22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
Geoff Mendal [Wed, 2 Sep 2015 14:28:48 +0000 (14:28 +0000)]
am
8ee8b379: (-s ours) am
e182fa77: (-s ours) Import translations. DO NOT MERGE
* commit '
8ee8b37933b52d8f495cb9317b02f4843aa090bb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 2 Sep 2015 14:18:54 +0000 (14:18 +0000)]
am
e182fa77: (-s ours) Import translations. DO NOT MERGE
* commit '
e182fa77888d0b42b4896f031e7b1d8c88a62a4c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 2 Sep 2015 14:05:31 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce
Auto-generated-cl: translation import
Geoff Mendal [Wed, 2 Sep 2015 13:20:12 +0000 (06:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I594aadd6ad5c196e88e6bf08fb46ff8e3964482f
Auto-generated-cl: translation import
Xiyuan Xia [Tue, 1 Sep 2015 20:53:56 +0000 (20:53 +0000)]
am
676a4b65: am
50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
* commit '
676a4b65b18a97851c6762446b8236ca941cd0a3':
Fix races in ConfirmPassword/Pattern
Xiyuan Xia [Tue, 1 Sep 2015 20:39:58 +0000 (20:39 +0000)]
am
50e1f59a: Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
* commit '
50e1f59a6891cbf3995db0e7fc811f018f9ba63a':
Fix races in ConfirmPassword/Pattern
Xiyuan Xia [Tue, 1 Sep 2015 20:29:41 +0000 (20:29 +0000)]
Merge "Fix races in ConfirmPassword/Pattern" into mnc-dr-dev
Xiaohui Chen [Tue, 1 Sep 2015 17:26:53 +0000 (10:26 -0700)]
Cleanup USER_OWNER in Settings
This cl updates a couple places related to managed profiles.
Bug:
19913735
Change-Id: I72b5315885fc34d8716339ecc18447c15867a5ac
Jason Monk [Tue, 1 Sep 2015 19:40:03 +0000 (19:40 +0000)]
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
Jason Monk [Tue, 1 Sep 2015 19:28:25 +0000 (19:28 +0000)]
am
2ffca0c5: am
b39ceab7: am
65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
* commit '
2ffca0c52a770dfe610d492fa9ba8328b79c85f7':
Protect against multiple provision responses
Xiyuan Xia [Tue, 1 Sep 2015 19:26:27 +0000 (19:26 +0000)]
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
Jason Monk [Tue, 1 Sep 2015 19:21:03 +0000 (19:21 +0000)]
am
b39ceab7: am
65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
* commit '
b39ceab718f0265be3c7e8bf9df1ab0917b5307b':
Protect against multiple provision responses
Xiyuan Xia [Tue, 1 Sep 2015 19:15:28 +0000 (19:15 +0000)]
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
Jason Monk [Tue, 1 Sep 2015 19:10:12 +0000 (19:10 +0000)]
am
65b0666d: Merge "Protect against multiple provision responses" into mnc-dr-dev
* commit '
65b0666d36896c0c5616f867af5396c036ed1cb6':
Protect against multiple provision responses
Xiyuan Xia [Tue, 1 Sep 2015 19:07:30 +0000 (19:07 +0000)]
am
9e06cbf5: am
a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
* commit '
9e06cbf5a379d0a05f13d2a6e1660793fb7015a3':
Fix wrong stage exception in ChooseLockPattern
Jason Monk [Tue, 1 Sep 2015 19:02:44 +0000 (19:02 +0000)]
Merge "Protect against multiple provision responses" into mnc-dr-dev
Xiyuan Xia [Tue, 1 Sep 2015 18:54:08 +0000 (18:54 +0000)]
am
a104c05d: Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
* commit '
a104c05da9d42375f7307cce58039f7edafaa078':
Fix wrong stage exception in ChooseLockPattern
Xiyuan Xia [Tue, 1 Sep 2015 18:46:19 +0000 (18:46 +0000)]
Merge "Fix wrong stage exception in ChooseLockPattern" into mnc-dr-dev
Xiyuan Xia [Tue, 1 Sep 2015 18:29:36 +0000 (11:29 -0700)]
Fix wrong stage exception in ChooseLockPattern
ChooseLockPattern should updateStage instead of always enabling
pattern view input.
Bug:
22760251
Change-Id: I3675c0aada293e168769147ba8e4203e9310e593
Jason Monk [Tue, 1 Sep 2015 17:20:55 +0000 (13:20 -0400)]
Protect against multiple provision responses
Bug:
23573004
Change-Id: I9cbc7574d2019244f7198784372ce68d7e4d1fa2
Geoff Mendal [Tue, 1 Sep 2015 16:07:17 +0000 (16:07 +0000)]
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
Xiyuan Xia [Mon, 31 Aug 2015 18:59:46 +0000 (11:59 -0700)]
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
Geoff Mendal [Mon, 31 Aug 2015 14:35:52 +0000 (14:35 +0000)]
am
9cc1143d: (-s ours) am
0e6d3846: (-s ours) am
f33098ea: (-s ours) Import translations. DO NOT MERGE
* commit '
9cc1143d8f7e7810b73516f0797558c09614c477':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 31 Aug 2015 14:25:26 +0000 (14:25 +0000)]
am
0e6d3846: (-s ours) am
f33098ea: (-s ours) Import translations. DO NOT MERGE
* commit '
0e6d38462b96c61465d06ce6c5dfa17297e49df8':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 31 Aug 2015 14:18:22 +0000 (14:18 +0000)]
am
f33098ea: (-s ours) Import translations. DO NOT MERGE
* commit '
f33098eaa02416997775fe1112484c56b13dc93b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 31 Aug 2015 14:07:58 +0000 (07:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426
Auto-generated-cl: translation import
Geoff Mendal [Mon, 31 Aug 2015 13:23:03 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39fa6b9b72e50d1ded02a2701ac6ac989a31861b
Auto-generated-cl: translation import
Geoff Mendal [Sat, 29 Aug 2015 23:19:04 +0000 (23:19 +0000)]
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
Geoff Mendal [Sat, 29 Aug 2015 23:09:59 +0000 (23:09 +0000)]
am
f7a20d53: (-s ours) am
e387dccb: (-s ours) am
96edf807: (-s ours) Import translations. DO NOT MERGE
* commit '
f7a20d5349288f5efb7c94c60d7459b335fb9f98':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 22:57:36 +0000 (22:57 +0000)]
am
e387dccb: (-s ours) am
96edf807: (-s ours) Import translations. DO NOT MERGE
* commit '
e387dccbacb9119fec02a54d26440ef5a2ee0ce1':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 22:44:43 +0000 (22:44 +0000)]
am
96edf807: (-s ours) Import translations. DO NOT MERGE
* commit '
96edf8077347297d030af02a9452c726bbc421c8':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 29 Aug 2015 15:38:50 +0000 (08:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
OSDN Git Service
