OSDN Git Service

android-x86/packages-apps-Settings.git
7 years agoAdd permission check to Intents used by Authenticator Settings. am: ea55e6331e
Dmitry Dementyev [Wed, 12 Apr 2017 19:21:36 +0000 (19:21 +0000)]
Add permission check to Intents used by Authenticator Settings. am: ea55e6331e
am: bac5163a9a

Change-Id: Ib70241c596aca047a096318eb2026634692f8620

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Wed, 12 Apr 2017 19:16:01 +0000 (19:16 +0000)]
Add permission check to Intents used by Authenticator Settings.
am: ea55e6331e

Change-Id: Iafaa143dd3c3201f16d1e19cb150243fd5f88232

7 years agoAdd permission check to Intents used by Authenticator Settings.
Dmitry Dementyev [Wed, 15 Mar 2017 19:33:05 +0000 (12:33 -0700)]
Add permission check to Intents used by Authenticator Settings.

Setting shares system uid and can be used to bypass different security
checks.
We add proper handling for intents which resolve toexported=true
activities with permission filed.
Added nested preferences filtering.

Bug: 33123882
Test: manual tests
Change-Id: I3ba9c768fc4f8093dcf2eadc17f14c506ec5c327
Merged-In: Ib5bab7989fc44b4391f9050c6b18f81c58c09cf6

8 years agoam 0431bc18: am e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level...
Zach Jang [Thu, 17 Sep 2015 20:16:45 +0000 (20:16 +0000)]
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

8 years agoam e7e0c03f: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings...
Zach Jang [Thu, 17 Sep 2015 20:04:24 +0000 (20:04 +0000)]
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

8 years agoDO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
Zach Jang [Sat, 12 Sep 2015 00:37:48 +0000 (17:37 -0700)]
DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings
CL#3/3

b/23946860

Change-Id: Idd318380829f20616d4f1691965b55bfff3afbe0

8 years agoam 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 16:44:58 +0000 (16:44 +0000)]
am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoam e05f7143: Check for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Wed, 29 Jul 2015 16:15:17 +0000 (16:15 +0000)]
am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'e05f71431548cba1b14807ba7f07a5df89c3f0a4':
  Check for special char when renaming device for Wi-Fi direct.

8 years agoCheck for special char when renaming device for Wi-Fi direct.
Sanket Padawe [Mon, 18 May 2015 18:39:01 +0000 (11:39 -0700)]
Check for special char when renaming device for Wi-Fi direct.

Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef348c17a985eb51ef74469a32c3c938d)

9 years agoam a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added...
Fyodor Kupolov [Thu, 29 Jan 2015 18:57:22 +0000 (18:57 +0000)]
am a6c8a0e6: am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started

* commit 'a6c8a0e66d92bde12ae6f1934f020e7700db05d1':
  Added a check if a custom activity can be started

9 years agoam d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a...
Fyodor Kupolov [Thu, 29 Jan 2015 18:50:43 +0000 (18:50 +0000)]
am d8b606b8: am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started

* commit 'd8b606b81a5ed77d3d2cbbaa7de26853126c25d7':
  Added a check if a custom activity can be started

9 years agoam 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity...
Fyodor Kupolov [Thu, 29 Jan 2015 18:45:51 +0000 (18:45 +0000)]
am 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started

* commit '2f3bc3cb3f5add3962fb0ad441c27d44fede7787':
  Added a check if a custom activity can be started

9 years agoam e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:12:04 +0000 (18:12 +0000)]
am e3904c4f: am e8e7b9b3: Added a check if a custom activity can be started

* commit 'e3904c4f09b1a828e2d1f2f3536cdc8eca84a6aa':
  Added a check if a custom activity can be started

9 years agoam d7e93570: am f11f9f47: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:02:40 +0000 (18:02 +0000)]
am d7e93570: am f11f9f47: Added a check if a custom activity can be started

* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
  Added a check if a custom activity can be started

9 years agoam e8e7b9b3: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 18:01:00 +0000 (18:01 +0000)]
am e8e7b9b3: Added a check if a custom activity can be started

* commit 'e8e7b9b3811b3295454298b02f136adf0527d1da':
  Added a check if a custom activity can be started

9 years agoam f11f9f47: Added a check if a custom activity can be started
Fyodor Kupolov [Thu, 29 Jan 2015 17:55:47 +0000 (17:55 +0000)]
am f11f9f47: Added a check if a custom activity can be started

* commit 'f11f9f47d3cfb5d1b9e7da1705252e75913410f1':
  Added a check if a custom activity can be started

9 years agoAdded a check if a custom activity can be started
Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]
Added a check if a custom activity can be started

AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e49facb0fc4dd11d68645b4fe8d4c88)

9 years agoAdded a check if a custom activity can be started
Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]
Added a check if a custom activity can be started

AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2

9 years agoam 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t...
Carlos Valdivia [Thu, 11 Sep 2014 17:05:31 +0000 (17:05 +0000)]
am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '737d2d538b81ee843192d229ef558e69f2a944a9':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable...
Carlos Valdivia [Thu, 11 Sep 2014 16:59:49 +0000 (16:59 +0000)]
am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '61ced6d4270b86c336520856cb1545865cb01107':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent...
Carlos Valdivia [Thu, 11 Sep 2014 16:49:32 +0000 (16:49 +0000)]
am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '01137c2004a617dae870f9c07b34a29f8706b615':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:42:54 +0000 (16:42 +0000)]
am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:37:09 +0000 (16:37 +0000)]
am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '37b58a420ff59254cbe9420c64685fdb7ea4e375':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoSECURITY: Don't pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
SECURITY: Don't pass a usable Pending Intent to 3rd parties.

Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends.  This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.

Bug: 17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
(cherry picked from commit f5d3e74ecc2b973941d8adbe40c6b23094b5abb7)

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Aug 2014 21:21:56 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import

10 years agoam 12d64129: (-s ours) am c53e033e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:27:40 +0000 (21:27 +0000)]
am 12d64129: (-s ours) am c53e033e: (-s ours) Import translations. DO NOT MERGE

* commit '12d6412978761f1aab14fbe9244d14c7cefc63b8':
  Import translations. DO NOT MERGE

10 years agoam c53e033e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 21:21:09 +0000 (21:21 +0000)]
am c53e033e: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 12:00:45 +0000 (05:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib5aa49667b420a1ff6426274d9205242d638c78c
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 6 Jul 2014 11:57:08 +0000 (04:57 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5b2f01e63ccf0f291b96f749af7d85f2f0036728
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 25 Jun 2014 17:39:48 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3b2d1434d76982612d7aa754464a4abf1210daef
Auto-generated-cl: translation import

10 years agoDO NOT MERGE Fix build for notification listener internal api change
Griff Hazen [Wed, 18 Jun 2014 04:43:19 +0000 (21:43 -0700)]
DO NOT MERGE Fix build for notification listener internal api change

Bug: 15426276
Change-Id: I3861eb03796f9938f66237454aea148f5c64b370

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 21:52:35 +0000 (14:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idbb361c506a6d3d88653e6699b00d79c344b8c98
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 00:59:15 +0000 (17:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9185da8de4b0c0818b926377543992356f265dd9
Auto-generated-cl: translation import

10 years agoam 95228074: am c44d7c6b: Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 18:05:39 +0000 (18:05 +0000)]
am 95228074: am c44d7c6b: Prohibit uninstall of the default (or only) home app

* commit '95228074d2e01575799a526a29ec53a61c36aa23':
  Prohibit uninstall of the default (or only) home app

10 years agoam c44d7c6b: Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:58:59 +0000 (17:58 +0000)]
am c44d7c6b: Prohibit uninstall of the default (or only) home app

* commit 'c44d7c6be64be790878ddf1f21c0d9e91d238245':
  Prohibit uninstall of the default (or only) home app

10 years agoProhibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:17:21 +0000 (10:17 -0700)]
Prohibit uninstall of the default (or only) home app

We suppress the ability to uninstall (including uninstall of updates to
system-bundled apps) when the package in question is either the only
installed home app, or has been explicitly tagged by the user as the
"every time" home app among all those installed.

Bug 14162565

Change-Id: I582bb0d2abf0911ac68813f4c7e6fd7d17bfc2ca

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 00:18:12 +0000 (17:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: I20c3ae14070c3fae914ec7151dc425ddf518ffa6
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 14 Apr 2014 19:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: I571889dbba0de412f258289e097ec510fbf02e05
Auto-generated-cl: translation import

10 years agoam 915ef6e3: (-s ours) am 52e3681f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:02:35 +0000 (16:02 +0000)]
am 915ef6e3: (-s ours) am 52e3681f: (-s ours) Import translations. DO NOT MERGE

* commit '915ef6e3127b34c73d43e86149b9aabc23216e72':
  Import translations. DO NOT MERGE

10 years agoam 52e3681f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 16:00:02 +0000 (16:00 +0000)]
am 52e3681f: (-s ours) Import translations. DO NOT MERGE

* commit '52e3681feb64afaefd5cffa5a9e88a97bca4d48d':
  Import translations. DO NOT MERGE

10 years agoam fba8cd35: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 10 Apr 2014 15:57:44 +0000 (15:57 +0000)]
am fba8cd35: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 9 Apr 2014 19:46:43 +0000 (12:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iff7d2cccff323a2cfb7193d399e8910f226304d7
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 9 Apr 2014 19:43:07 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8cec72991260fa660991ca7423299bbf417df000
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 9 Apr 2014 19:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: I84d923dacf746299500503257fd925228b869e82
Auto-generated-cl: translation import

10 years agoam f56d838a: (-s ours) am 2319553c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:31:59 +0000 (02:31 +0000)]
am f56d838a: (-s ours) am 2319553c: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 0f2228a5: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:46 +0000 (02:24 +0000)]
am 0f2228a5: (-s ours) Import translations. DO NOT MERGE

* commit '0f2228a5480759551b1faf93d510fc9c1c16ea06':
  Import translations. DO NOT MERGE

10 years agoam 2319553c: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 8 Apr 2014 02:24:35 +0000 (02:24 +0000)]
am 2319553c: (-s ours) Import translations. DO NOT MERGE

* commit '2319553cdc644c4fae21ca3ad55564729f409cf4':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Apr 2014 19:10:30 +0000 (12:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9c4dadd6e7a78db976f67c0c494b06495a69e45b
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Apr 2014 19:07:10 +0000 (12:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4c9953f71809e215404a0e150abbba7bb098504a
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 7 Apr 2014 19:05:35 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE

Change-Id: I933f503cae1b0ae72af3c9f3513ff86355d8e095
Auto-generated-cl: translation import

10 years agoam ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnect...
Xia Wang [Sat, 5 Apr 2014 00:48:38 +0000 (00:48 +0000)]
am ac768973: am ce11881a: Allow VPN to stay connected for some time before disconnecting it.

* commit 'ac768973bc23b9f8f266013c20d301554729fd70':
  Allow VPN to stay connected for some time before disconnecting it.

10 years agoam ce11881a: Allow VPN to stay connected for some time before disconnecting it.
Xia Wang [Sat, 5 Apr 2014 00:43:17 +0000 (00:43 +0000)]
am ce11881a: Allow VPN to stay connected for some time before disconnecting it.

* commit 'ce11881accf5db04e2a54b58176e24de49ef6917':
  Allow VPN to stay connected for some time before disconnecting it.

10 years agoAllow VPN to stay connected for some time before disconnecting it.
Xia Wang [Fri, 4 Apr 2014 23:23:38 +0000 (16:23 -0700)]
Allow VPN to stay connected for some time before disconnecting it.

Change-Id: I25994b8329514a32b5b6f383abef231d3decb4ec

10 years agoam 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Fri, 4 Apr 2014 14:45:45 +0000 (14:45 +0000)]
am 3f3469ae: (-s ours) am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '3f3469aecc1da8bf72482ddae53e11d0245fddd9':
  Import translations. DO NOT MERGE

10 years agoam 216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Apr 2014 14:38:19 +0000 (14:38 +0000)]
am 216b5c50: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-ub-dev

* commit '216b5c501bb81977407b5977e6ee709b34f3a37d':
  Import translations. DO NOT MERGE

10 years agoam cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Apr 2014 14:37:50 +0000 (14:37 +0000)]
am cc01536f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 4 Apr 2014 14:32:06 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Fri, 4 Apr 2014 14:32:04 +0000 (14:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-ub-dev
Baligh Uddin [Fri, 4 Apr 2014 14:31:59 +0000 (14:31 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-ub-dev

10 years agoam 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am...
Adrian Roos [Thu, 3 Apr 2014 14:51:39 +0000 (14:51 +0000)]
am 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '0b55caf01af1efa15ff0bfbf50a1726fce788660':
  Add lockout after trying to enter PIN / Password too often

10 years agoam a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am...
Adrian Roos [Thu, 3 Apr 2014 14:45:34 +0000 (14:45 +0000)]
am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit 'a52a37b0fe17109877abbc25943d0d74232f3e5f':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am...
Adrian Roos [Thu, 3 Apr 2014 14:38:30 +0000 (14:38 +0000)]
am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '1b0b38cfeb54638899ddab48ff9198590f951a55':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am...
Adrian Roos [Thu, 3 Apr 2014 14:35:13 +0000 (14:35 +0000)]
am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am...
Adrian Roos [Thu, 3 Apr 2014 14:29:57 +0000 (14:29 +0000)]
am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '90630f6a6d19e169befb8ad8117d53200eb562c4':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am...
Adrian Roos [Thu, 3 Apr 2014 14:23:57 +0000 (14:23 +0000)]
am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '09235d1065b501aa8a42e0767d72c15e7b846bae':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add...
Adrian Roos [Thu, 3 Apr 2014 14:17:11 +0000 (14:17 +0000)]
am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '82b3e62a4f8c8a229f700bbf122b8f8854162146':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after...
Adrian Roos [Thu, 3 Apr 2014 14:11:02 +0000 (14:11 +0000)]
am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '4692a48c28d7002221fec28d5ac324636f81c8f2':
  Add lockout after trying to enter PIN / Password too often

10 years agoam c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter...
Adrian Roos [Thu, 3 Apr 2014 14:05:07 +0000 (14:05 +0000)]
am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit 'c4bfea207acf62c9e70949d3225d082d95d4d193':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Passwo...
Adrian Roos [Thu, 3 Apr 2014 13:58:57 +0000 (13:58 +0000)]
am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '3f38173fadc1423d4c36b265a2ab5fdc09d88271':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:55:28 +0000 (13:55 +0000)]
am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '3a7690b157c100f3a36b6fdc2578a12845875e06':
  Add lockout after trying to enter PIN / Password too often

10 years agoam 8184ea52: Add lockout after trying to enter PIN / Password too often
Adrian Roos [Thu, 3 Apr 2014 13:49:53 +0000 (13:49 +0000)]
am 8184ea52: Add lockout after trying to enter PIN / Password too often

* commit '8184ea524519a67b1284266844e6e186f3a74cab':
  Add lockout after trying to enter PIN / Password too often

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Apr 2014 18:52:34 +0000 (11:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id18f3fec7657dd9eba74e4fd0f5c34eeea264fd2
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Apr 2014 18:49:10 +0000 (11:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2521114c59686637b57ea802bbb72aa7fa01615c
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 2 Apr 2014 18:47:25 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ife01297eb460bb5881d86ed7c0f672ecb461cb48
Auto-generated-cl: translation import

10 years agoAdd lockout after trying to enter PIN / Password too often
Adrian Roos [Mon, 31 Mar 2014 19:33:35 +0000 (21:33 +0200)]
Add lockout after trying to enter PIN / Password too often

Enforce the same lockout that is already enforced when entering the pattern.

Bug: 13647935

Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7

10 years agoam 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into...
Xia Wang [Wed, 2 Apr 2014 03:45:56 +0000 (03:45 +0000)]
am 3e238230: am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev

* commit '3e23823015d2ad0679d89adc2a62c7d568adada8':
  Add legacy VPN test framework and test cases

10 years agoam 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev
Xia Wang [Wed, 2 Apr 2014 03:40:26 +0000 (03:40 +0000)]
am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev

* commit '836eff87a93f5b2857b41763197ab6782581aafc':
  Add legacy VPN test framework and test cases

10 years agoMerge "Add legacy VPN test framework and test cases" into klp-dev
Xia Wang [Wed, 2 Apr 2014 03:36:50 +0000 (03:36 +0000)]
Merge "Add legacy VPN test framework and test cases" into klp-dev

10 years agoAdd legacy VPN test framework and test cases
Xia Wang [Sat, 29 Mar 2014 00:20:53 +0000 (17:20 -0700)]
Add legacy VPN test framework and test cases

- VpnProfileParser can parse VPN profiles from an xml file
- CertInstallerHelper installs keys and certificates to keystore
- VpnTests includes all test cases

Change-Id: Ib5ce33e770ee4f82bea153f9b5c5cf3802f95b0c

10 years agoam 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:15:49 +0000 (00:15 +0000)]
am 88adaa72: (-s ours) am 112916b5: (-s ours) Import translations. DO NOT MERGE

* commit '88adaa72a385c3199787ecd3dae826f25d38572d':
  Import translations. DO NOT MERGE

10 years agoam 112916b5: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 1 Apr 2014 00:09:19 +0000 (00:09 +0000)]
am 112916b5: (-s ours) Import translations. DO NOT MERGE

* commit '112916b59634a86195880a1368d8d60a86f33188':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 21:42:20 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2df2a0668882bab5b18242e3db72b5a5daf983b0
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 31 Mar 2014 21:40:25 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0208bc3b072d49bb77ea2f07e365b1982bb5e324
Auto-generated-cl: translation import

10 years agoDO NOT MERGE Settings: Implement new required method.
John Spurlock [Fri, 28 Mar 2014 13:41:30 +0000 (09:41 -0400)]
DO NOT MERGE Settings: Implement new required method.

Only required since it uses the non-public version
of the api.

Bug:13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa

10 years agoam f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 23:05:03 +0000 (23:05 +0000)]
am f39672bf: (-s ours) am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 3a9b49f9: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 27 Mar 2014 22:22:03 +0000 (22:22 +0000)]
am 3a9b49f9: (-s ours) Import translations. DO NOT MERGE

* commit '3a9b49f975df7c53e86dd795e21f904442c22a4a':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Mar 2014 21:11:08 +0000 (14:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I09b061fd0c7dd8e4ea00e6627af4e8dfa0d01200
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 26 Mar 2014 21:08:55 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I81d83e8408295dcc6e24b92459170e9d81d2ec0f
Auto-generated-cl: translation import

10 years agoMerge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Tue, 25 Mar 2014 19:01:04 +0000 (19:01 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev

10 years agoam b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 17:02:02 +0000 (17:02 +0000)]
am b86dff84: (-s ours) am da4a6a53: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam da4a6a53: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 25 Mar 2014 16:54:48 +0000 (16:54 +0000)]
am da4a6a53: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 20:01:09 +0000 (13:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I75bc6fa1afafd7abc9a8d0af3e8825c053225807
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 24 Mar 2014 19:59:14 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ifc3cdc5dd618ef6c452303597b5abc791e0bf5af
Auto-generated-cl: translation import

10 years agoam 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 19:02:30 +0000 (19:02 +0000)]
am 2e71c1df: (-s ours) am 947e8995: (-s ours) Import translations. DO NOT MERGE

* commit '2e71c1df7cc52badeab52053bfa4c7a7f5b83cc8':
  Import translations. DO NOT MERGE

10 years agoam 947e8995: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:41:54 +0000 (18:41 +0000)]
am 947e8995: (-s ours) Import translations. DO NOT MERGE

* commit '947e8995856a66d05bfb614edf00dd5edfecc4ba':
  Import translations. DO NOT MERGE

10 years agoDO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising...
Wei Wang [Fri, 28 Feb 2014 00:28:34 +0000 (16:28 -0800)]
DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."

This is cherry pick from master/klp-dev changes.
This reverts commit eb56b9ccb8fa70a6c567d0bcd02f821e4de4bf7b.

Conflicts:
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87

Conflicts:
src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
src/com/android/settings/bluetooth/BluetoothSettings.java
src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 19 Mar 2014 20:10:41 +0000 (13:10 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4fe915d0452b637fc646265dca39732877a12444
Auto-generated-cl: translation import

10 years agoam c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:46:32 +0000 (20:46 +0000)]
am c8131cb9: (-s ours) am e8de72e5: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam e8de72e5: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 20:34:20 +0000 (20:34 +0000)]
am e8de72e5: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Mar 2014 19:42:54 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I85a8b58b4ced6be66f751e4315f5b039e0378355
Auto-generated-cl: translation import