PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,170 Commits 1 Branch 0 Tags
f3cc23524fddcc2d55d17747a901b2090773e429
Commit Graph

23170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Zach Jang
8fc9b5b684 am 2e006b2b: am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '2e006b2b07c7c333c51fb9b447b8df6df66ba421':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:40:30 +00:00
Zach Jang
2e006b2b07 am b7e865ee: (-s ours) am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit 'b7e865ee486ea255e0f76c4d0129d608a7e7995d':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:27:21 +00:00
Zach Jang
b7e865ee48 am 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '0431bc18b85c410d14bbfd0dbcc87d54edbb1507':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:16:45 +00:00
Zach Jang
0431bc18b8 am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit 'e7e0c03f003930461603ae71ec0ce815d5a7f40a':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:04:24 +00:00
Zach Jang
c87ceb7ec1 am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:04:18 +00:00
Michael Wright
dab743b95c Always show pairing dialog for device-specific keyboard. 
Bug: 22876536
Change-Id: Ief9f6343d435747050bb7910f934e4777f5116de
 2015-09-17 15:23:46 +01:00
Paul Lawrence
44985b9ccd Stop long passwords crashing CryptKeeper 
Bug: 24017705
Change-Id: Ida157f96f350486d9ec0189c68fff314dc4a90f2
 2015-09-16 15:29:57 -07: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
ba98cc2c14 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-15 14:12:42 +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
Zach Jang
6ceb2ba9b8 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings 
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
 2015-09-14 14:03:12 -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
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
Zach Jang
e7e0c03f00 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings 
CL#3/3

b/23946860

Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0
 2015-09-12 00:40:20 +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
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
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
Baligh Uddin
730a73daac am cf80d7c4: (-s ours) am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'cf80d7c4f03f8c55963b4815c1b7004d77cb9e5b':
  Import translations. DO NOT MERGE
 2015-09-11 16:30:31 +00:00
Baligh Uddin
cf80d7c4f0 am 723c5b38: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '723c5b38b8fbd2db3a64b1ce782f8f760271ac98':
  Import translations. DO NOT MERGE
 2015-09-11 16:24:31 +00:00
Baligh Uddin
cdf00b1640 am 1538dde4: (-s ours) Import translations. DO NOT MERGE 
* commit '1538dde4fbb00617bfd1d51f958f32ba4d68ff12':
  Import translations. DO NOT MERGE
 2015-09-11 16:24:21 +00:00
Baligh Uddin
723c5b38b8 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-09-11 16:19:17 +00:00
Jorim Jaggi
74a2283d24 Finish trampoline activity for ConfirmDeviceCredential immediately 
Make sure to finish ConfirmDeviceCredentialActivity directly, and use
Intent.FLAG_ACTIVITY_FORWARD_RESULT, so we can't even end up in a
state where we have the trampoline activity but not the real activity.

Bug: 23849216
Change-Id: I7a5be5af74ca85c11df1f61a69c3fd5cf558e1fb
 2015-09-10 20:14:06 -07:00
Jorim Jaggi
908243c3ea am a4b5e202: am 5628251b: am 5c49b5a4: Merge "Fix crash in when restoring CredentialCheckResultTracker Fragment" into mnc-dr-dev 
* commit 'a4b5e202d5a76f13d2c528fc9e589113a4955c20':
  Fix crash in when restoring CredentialCheckResultTracker Fragment
 2015-09-11 02:25:37 +00:00