Paul Lawrence
e68e93fc36
am 67d0fe4c: am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '67d0fe4c0ec169514c05ec485834fca353ebc9d2':
Stop long passwords crashing CryptKeeper
2015-09-18 15:57:21 +00:00
Paul Lawrence
67d0fe4c0e
am fe9b6d3e: am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'fe9b6d3e2e08e689a6b770df497e717a1a5e767e':
Stop long passwords crashing CryptKeeper
2015-09-18 15:49:04 +00:00
Paul Lawrence
fe9b6d3e2e
am aead1b25: am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit 'aead1b2581c2594c18e16b56325b615c5944f6d7':
Stop long passwords crashing CryptKeeper
2015-09-18 15:38:15 +00:00
Paul Lawrence
aead1b2581
am 43be4b9b: Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
...
* commit '43be4b9b787ee4881dd27c41d1d554c8ef1d6a3d':
Stop long passwords crashing CryptKeeper
2015-09-18 15:32:29 +00:00
Paul Lawrence
43be4b9b78
Merge "Stop long passwords crashing CryptKeeper" into mnc-dr-dev
2015-09-18 15:26:01 +00:00
Paul Lawrence
9db2961ad0
am 1ec8f89b: am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit '1ec8f89b8e6efcb2453135a12a1a0a08ccdcb583':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:58:04 +00:00
Paul Lawrence
1ec8f89b8e
am 98e9c747: am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit '98e9c7472ccb8f45220f73bf1c693f681681c00a':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:49:49 +00:00
Paul Lawrence
98e9c7472c
am 8d28491a: am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit '8d28491a2f2d8ef8e2142171d290f46f381c8a76':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:44:08 +00:00
Paul Lawrence
8d28491a2f
am c2e73bbc: Merge "Remove don\'t kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
...
* commit 'c2e73bbc06739cdd55f7baaca8ab1aa915ee6e83':
Remove don't kill flag from CryptKeeper to stop logspam
2015-09-18 14:37:01 +00:00
Paul Lawrence
c2e73bbc06
Merge "Remove don't kill flag from CryptKeeper to stop logspam" into mnc-dr-dev
2015-09-18 14:31:11 +00:00
Paul Lawrence
44985b9ccd
Stop long passwords crashing CryptKeeper
...
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
2015-09-16 15:29:57 -07:00
Baligh Uddin
647ab07f95
am cdf9e483: (-s ours) am e4c1dccd: (-s ours) am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'cdf9e48335deed100505622a0e721a720b03838b':
Import translations. DO NOT MERGE
2015-09-15 14:37:45 +00:00
Baligh Uddin
cdf9e48335
am e4c1dccd: (-s ours) am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'e4c1dccda9719c1432b28eea90fbb0381d99638c':
Import translations. DO NOT MERGE
2015-09-15 14:32:12 +00:00
Baligh Uddin
e4c1dccda9
am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '6df1ad97c906e936255a9feee6631b1684b0fa09':
Import translations. DO NOT MERGE
2015-09-15 14:27:34 +00:00
Baligh Uddin
6df1ad97c9
am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit 'ba98cc2c1463b33c383e8399eb7742aa50b5a027':
Import translations. DO NOT MERGE
2015-09-15 14:20:20 +00:00
Baligh Uddin
66402753e4
Merge "Import translations. DO NOT MERGE"
2015-09-15 14:12:45 +00:00
Baligh Uddin
ba98cc2c14
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
2015-09-15 14:12:42 +00:00
Hyejin
7837e0272b
am 375633ae: am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '375633aea2a5ba9b0fc3b099bead8bbfef6a4cf3':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:49:17 +00:00
Hyejin
375633aea2
am 1dcb1135: am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '1dcb1135b8157977cd44c05768f422243d64df83':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:45:21 +00:00
Hyejin
1dcb1135b8
am 7e84e35f: am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '7e84e35fb191c0967feb0352a39a3147ceb68a8b':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:37:16 +00:00
Hyejin
7e84e35fb1
am 5565b5cd: Fix IndexOutOfBoundsException while silent provisioning check
...
* commit '5565b5cd7537e9360e6382507a45cf5e091a5108':
Fix IndexOutOfBoundsException while silent provisioning check
2015-09-15 00:29:32 +00:00
Hyejin
5565b5cd75
Fix IndexOutOfBoundsException while silent provisioning check
...
- If hostpot off, we receive result through HotspotOffReceiver.
Sometimes, during provisioning, we're used to receive this.
In this case, we don't care.
After provisioning, we'll receive the intent again.
- In stress test,
index is sometimes invalid, equals to mCurrentTethers.size().
So, when provisioning, We check whether index is valid or not.
BUG=23528220
Change-Id: I70f35e045042c6c81b1db03e2a44cd41d3e7437f
2015-09-14 16:04:52 -07:00
Paul Lawrence
4f60679b76
Remove don't kill flag from CryptKeeper to stop logspam
...
Bug: 23500739
Change-Id: Ibf06121bf37a42853eeeaef699f5074420b2af31
2015-09-14 14:55:57 -07:00
Maurice Lam
2662df8433
[WifiSettings] Submit Wi-Fi dialog with enter key
...
Add a OnKeyListener for hardware keyboards and an
OnEditorActionListener for on-screen IMEs to submit the Wi-Fi dialog
with the currently entered information.
Before committing the action, check for whether the dialog is
submittable -- that is checking whether all necessary information has
been entered. If not the enter key behaves the same as it is before
the change.
Bug: 22211604
Change-Id: Idede4233a7385d3bcd8fd6614948270280536bf1
2015-09-14 12:07:06 -07:00
Baligh Uddin
6ea05b747d
Import translations. DO NOT MERGE
...
Change-Id: I260590df2eeda8d9228cbb4635bf804c5ce1276a
Auto-generated-cl: translation import
2015-09-14 03:20:45 -07:00
Baligh Uddin
eb1c872563
Import translations. DO NOT MERGE
...
Change-Id: I80c5843b1be74f3b58aa812986ff04680f588b2c
Auto-generated-cl: translation import
2015-09-14 02:48:18 -07:00
Selim Cinek
e3be8eb3e5
am f19b9b6d: am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
...
* commit 'f19b9b6d88f87a12723b3bf52f8d03bb6a831e83':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
2015-09-12 05:07:53 +00:00
Jorim Jaggi
22bf95e650
am fb5aa541: am d59ce1f4: am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
...
* commit 'fb5aa5418ce4c103d8b2aa500cc4351e4b141397':
Add timeout if we dont get onEnterAnimationComplete
2015-09-12 02:57:18 +00:00
Jorim Jaggi
30c5aed420
am c350cd0f: am 97081aa9: am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
...
* commit 'c350cd0f87cb0c23e58159b8b75022fed5ce97d8':
Finish trampoline activity for ConfirmDeviceCredential immediately
2015-09-12 02:57:17 +00:00
Selim Cinek
f19b9b6d88
am 0fe43c9a: am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
...
* commit '0fe43c9aec51d6389aa3e6943190a75a62b641be':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
2015-09-12 00:56:55 +00:00
Selim Cinek
0fe43c9aec
am fc76ddd0: am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
...
* commit 'fc76ddd01e165e9641349cc721b294d62ce268e5':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
2015-09-12 00:47:34 +00:00
Selim Cinek
fc76ddd01e
am cda53c5d: Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
...
* commit 'cda53c5dc2c6a2c01dfd5db278a7899dd868da7d':
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
2015-09-12 00:38:18 +00:00
Selim Cinek
cda53c5dc2
Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev
2015-09-12 00:28:09 +00:00
Selim Cinek
2547ea5b58
Fixed a bug where the ConfirmDeviceCredentials activity was shown twice.
...
When rotating the ConfirmDeviceCredentials Activity, it was launched again after
solving the challenge.
Bug: 23937676
Change-Id: Ic0852448f498c79d5448c72cbc31bb55d9bfeddb
2015-09-11 17:22:22 -07:00
Jorim Jaggi
fb5aa5418c
am d59ce1f4: am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
...
* commit 'd59ce1f4e33cdc87af960ed3b35d0cf39afc00ff':
Add timeout if we dont get onEnterAnimationComplete
2015-09-11 23:30:43 +00:00
Jorim Jaggi
c350cd0f87
am 97081aa9: am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
...
* commit '97081aa929ea239937923359904f32ffa26f5180':
Finish trampoline activity for ConfirmDeviceCredential immediately
2015-09-11 23:30:42 +00:00
Jorim Jaggi
d59ce1f4e3
am 6f5bbc1b: am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
...
* commit '6f5bbc1b1e73b3559e311ea2e59a2281b67f65ca':
Add timeout if we dont get onEnterAnimationComplete
2015-09-11 23:22:17 +00:00
Jorim Jaggi
97081aa929
am c77839e0: am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
...
* commit 'c77839e0e12aaa656a65d5c3ff6da33cb0a76d46':
Finish trampoline activity for ConfirmDeviceCredential immediately
2015-09-11 23:22:16 +00:00
Jorim Jaggi
6f5bbc1b1e
am 5bd836aa: Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
...
* commit '5bd836aac3b7602a4166bc836aaa33ccc7107d74':
Add timeout if we dont get onEnterAnimationComplete
2015-09-11 22:33:38 +00:00
Jorim Jaggi
c77839e0e1
am aee6e41e: Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
...
* commit 'aee6e41e5188e8809d8439f05fdce311aa7171c8':
Finish trampoline activity for ConfirmDeviceCredential immediately
2015-09-11 22:33:37 +00:00
Jorim Jaggi
5bd836aac3
Merge "Add timeout if we dont get onEnterAnimationComplete" into mnc-dr-dev
2015-09-11 22:14:06 +00:00
Jorim Jaggi
aee6e41e51
Merge "Finish trampoline activity for ConfirmDeviceCredential immediately" into mnc-dr-dev
2015-09-11 22:13:21 +00:00
Jorim Jaggi
88957ef8ee
Add timeout if we dont get onEnterAnimationComplete
...
Window manager doesn't send us onEnterAnimationComplete in the case
where there are two activites starting at the same time and the
screen orientation is changing. Add a timeout to work around this
until we have a proper fix.
Bug: 23849216
Change-Id: I4be7787d1bc13f8cb0ffd892010c4b5c0142c783
2015-09-11 14:02:45 -07:00
Maurice Lam
420965f93e
Merge "[AccountSettings] Start add account in new task"
2015-09-11 18:10:45 +00:00
Baligh Uddin
e55e9c21fe
am 7e681ef5: (-s ours) am ad4de2fa: (-s ours) am c5d18345: (-s ours) am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE
...
* commit '7e681ef59442d803c7b9bc33fa92a3c8a15c5796':
Import translations. DO NOT MERGE
2015-09-11 17:00:28 +00:00
Baligh Uddin
7e681ef594
am ad4de2fa: (-s ours) am c5d18345: (-s ours) am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ad4de2fa60a490bf922051c515cf8ac0a133a8cf':
Import translations. DO NOT MERGE
2015-09-11 16:50:21 +00:00
Baligh Uddin
5f1b486117
am 5215f65c: (-s ours) am 730a73da: (-s ours) am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '5215f65c167fbe0814155273a0c4348cc8dac2f4':
Import translations. DO NOT MERGE
2015-09-11 16:47:18 +00:00
Baligh Uddin
ad4de2fa60
am c5d18345: (-s ours) am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c5d183458c13a0d780aee93f256ea5dc6b22f815':
Import translations. DO NOT MERGE
2015-09-11 16:41:33 +00:00
Baligh Uddin
5215f65c16
am 730a73da: (-s ours) am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
...
* commit '730a73daace1bafb86eeceb79b6d623d2feab2d9':
Import translations. DO NOT MERGE
2015-09-11 16:40:01 +00:00
Baligh Uddin
c5d183458c
am cdf00b16: (-s ours) am 1538dde4: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cdf00b1640bc621d513dcb965f44a4ace8bacece':
Import translations. DO NOT MERGE
2015-09-11 16:32:04 +00:00
