OSDN Git Service

android-x86/packages-apps-Settings.git
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 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 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

9 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 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 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 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:41:44 +0000 (12:41 -0700)]
Import translations. DO NOT MERGE

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

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:05:35 +0000 (12:05 -0700)]
Import translations. DO NOT MERGE

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

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 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-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 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: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 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 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:40:25 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE

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

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:08:55 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE

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

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 19:59:14 +0000 (12:59 -0700)]
Import translations. DO NOT MERGE

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

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 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 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

10 years agoam edcb923d: Add string parameter order to default SMS dialog text
David Braun [Thu, 13 Mar 2014 18:30:11 +0000 (18:30 +0000)]
am edcb923d: Add string parameter order to default SMS dialog text

* commit 'edcb923df6f9e690fd16b0e643c6ba3da5e9264c':
  Add string parameter order to default SMS dialog text

10 years agoAdd string parameter order to default SMS dialog text
David Braun [Thu, 13 Mar 2014 18:20:48 +0000 (11:20 -0700)]
Add string parameter order to default SMS dialog text

Bug: 13433191 cs - Android - Other: Swapped placeholders in Hangouts confirmation message, reverse m
Change-Id: I8d00c58e5000b3851304d48c4681f9ebe2eebec8

10 years agoam 7c35c10e: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 13 Mar 2014 16:40:31 +0000 (16:40 +0000)]
am 7c35c10e: (-s ours) Import translations. DO NOT MERGE

* commit '7c35c10ebcf53a25d2c9c5cf37c25b1d5b553d1c':
  Import translations. DO NOT MERGE

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

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

10 years agoam 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 11 Mar 2014 17:41:25 +0000 (17:41 +0000)]
am 14b82fd7: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '14b82fd73f59f51dffee9562057ab747f12134d3':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 11 Mar 2014 17:37:53 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:15:28 +0000 (02:15 +0000)]
am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev

* commit '8840aa4c406bf08bba186cf9e674033bd1b9a4c1':
  DO NOT MERGE Add preference for caption text opacity

10 years agoam d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences...
Alan Viverette [Tue, 11 Mar 2014 02:15:27 +0000 (02:15 +0000)]
am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev

* commit 'd43d5becb359cfdd5e30f691724739ab216011f0':
  DO NOT MERGE Remove extra fragment in captioning preferences

10 years agoMerge "DO NOT MERGE Add preference for caption text opacity" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:11:52 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev

10 years agoMerge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev
Alan Viverette [Tue, 11 Mar 2014 02:11:41 +0000 (02:11 +0000)]
Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 10 Mar 2014 22:28:38 +0000 (15:28 -0700)]
Import translations. DO NOT MERGE

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

10 years agoam 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev
Wei Wang [Sat, 8 Mar 2014 02:02:19 +0000 (02:02 +0000)]
am 104eea0b: Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev

* commit '104eea0b97c63b97040dc26ddf3635257e1b19a2':
  DO NOT MERGE Change bluetooth off display message.

10 years agoMerge "DO NOT MERGE Change bluetooth off display message." into klp-dev
Wei Wang [Sat, 8 Mar 2014 02:00:36 +0000 (02:00 +0000)]
Merge "DO NOT MERGE Change bluetooth off display message." into klp-dev

10 years agoDO NOT MERGE Add preference for caption text opacity
Alan Viverette [Fri, 7 Mar 2014 22:06:29 +0000 (14:06 -0800)]
DO NOT MERGE Add preference for caption text opacity

BUG: 11990225
Change-Id: Ib7dd92fd3e44931a1a4a2603effb02550b4fbc59

10 years agoDO NOT MERGE Remove extra fragment in captioning preferences
Alan Viverette [Fri, 7 Mar 2014 22:06:07 +0000 (14:06 -0800)]
DO NOT MERGE Remove extra fragment in captioning preferences

BUG: 11813771
Change-Id: Ied0b268aca93d7081cdcee1ea9db6347a762e3ac

10 years agoam 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Thu, 6 Mar 2014 21:59:31 +0000 (21:59 +0000)]
am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946

* commit '549a39b49510dad27da588714f848dc891913239':
  DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946

10 years agoDO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946
Rob Fletcher [Tue, 25 Feb 2014 18:16:12 +0000 (18:16 +0000)]
DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946

During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b

10 years agoDO NOT MERGE Change bluetooth off display message.
Wei Wang [Mon, 3 Mar 2014 22:58:54 +0000 (14:58 -0800)]
DO NOT MERGE Change bluetooth off display message.

Cherry picking ble advertising changes from master to KLP MR2.
b/13137996

Change-Id: I71ef30fbb005c60efe1497a33d1758be07c7f1a8

10 years agoam d83484db: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 20:56:19 +0000 (20:56 +0000)]
am d83484db: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Feb 2014 15:23:08 +0000 (07:23 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am...
Amith Yamasani [Wed, 5 Feb 2014 20:37:21 +0000 (20:37 +0000)]
am 3c4603ef: am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '3c4603ef1c19510bd4a58aee19935e084603c69b':
  Remove unused DebugIntentSender

10 years agoam 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am...
Amith Yamasani [Wed, 5 Feb 2014 20:35:24 +0000 (20:35 +0000)]
am 8f948217: am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '8f9482170835059c11cffa9c554191306db49fbd':
  Remove unused DebugIntentSender

10 years agoam c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am...
Amith Yamasani [Wed, 5 Feb 2014 20:33:48 +0000 (12:33 -0800)]
am c68a6bde: am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit 'c68a6bde44203cae70c50f6194cce22c9be5c48e':
  Remove unused DebugIntentSender

10 years agoam 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am...
Amith Yamasani [Wed, 5 Feb 2014 20:30:42 +0000 (12:30 -0800)]
am 0ad77445: am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '0ad774458a627cc4608c717a7efdadf2404d973c':
  Remove unused DebugIntentSender

10 years agoam 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am...
Amith Yamasani [Wed, 5 Feb 2014 19:52:23 +0000 (11:52 -0800)]
am 7c0ada65: am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '7c0ada65542f2c9b3899337b085aace13fcc7142':
  Remove unused DebugIntentSender

10 years agoam 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove...
Amith Yamasani [Wed, 5 Feb 2014 19:27:30 +0000 (11:27 -0800)]
am 3f722079: am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '3f72207985a5a636d14800d0b8094c28220a8e00':
  Remove unused DebugIntentSender

10 years agoam 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugI...
Amith Yamasani [Wed, 5 Feb 2014 19:22:46 +0000 (11:22 -0800)]
am 1ba09366: am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '1ba09366ccc174d71572ddbe0b80814982d2ae9b':
  Remove unused DebugIntentSender

10 years agoam 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:19:03 +0000 (11:19 -0800)]
am 0fce6123: am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '0fce6123bddf505d1dab3d7a7daff05a0832c007':
  Remove unused DebugIntentSender

10 years agoam 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:15:01 +0000 (11:15 -0800)]
am 7a2d8bd4: am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '7a2d8bd4b008efabd57e258f782e8bb59b5a09df':
  Remove unused DebugIntentSender

10 years agoam 49d502a4: am c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:09:40 +0000 (11:09 -0800)]
am 49d502a4: am c7843db0: Remove unused DebugIntentSender

* commit '49d502a45d9b7536d38210590c99d8c99a43e4d9':
  Remove unused DebugIntentSender

10 years agoam c7843db0: Remove unused DebugIntentSender
Amith Yamasani [Wed, 5 Feb 2014 19:04:25 +0000 (11:04 -0800)]
am c7843db0: Remove unused DebugIntentSender

* commit 'c7843db06c736ed8b8635f2b5d52fdd891fbf69b':
  Remove unused DebugIntentSender

10 years agoRemove unused DebugIntentSender
Amith Yamasani [Thu, 30 Jan 2014 00:11:03 +0000 (16:11 -0800)]
Remove unused DebugIntentSender

Bug: 12722251
Change-Id: Idb5f7e2fcf4da6826c9fcb2499af9cf9c189dfeb
(cherry picked from commit 26430486e4082c89e31a9489e4309566bda2fec8)

10 years agoam 6b8a7116: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 05:04:29 +0000 (21:04 -0800)]
am 6b8a7116: (-s ours) Import translations. DO NOT MERGE

* commit '6b8a7116a2203b32cff432fd1602cc3e186b2608':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 7 Jan 2014 02:46:29 +0000 (18:46 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 0ae418b2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 31 Dec 2013 00:41:18 +0000 (16:41 -0800)]
am 0ae418b2: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 30 Dec 2013 23:09:59 +0000 (15:09 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 0f952752: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 03:51:27 +0000 (19:51 -0800)]
am 0f952752: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 27 Dec 2013 00:26:39 +0000 (16:26 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 7ba72721: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 15:28:03 +0000 (07:28 -0800)]
am 7ba72721: (-s ours) Import translations. DO NOT MERGE

* commit '7ba72721134adeda10972f68fbcf74a491c6b11e':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Dec 2013 06:12:01 +0000 (22:12 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 1177cdec: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Tue, 17 Dec 2013 17:33:32 +0000 (09:33 -0800)]
am 1177cdec: (-s ours) Import translations. DO NOT MERGE

* commit '1177cdec4eeeacc787059a7843ade6571f54ac5f':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Dec 2013 20:44:01 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 879cc42f: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 15:46:25 +0000 (07:46 -0800)]
am 879cc42f: (-s ours) Import translations. DO NOT MERGE

* commit '879cc42fb33f717f985e4627355c7735c78f16b3':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 12 Dec 2013 04:01:51 +0000 (20:01 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 233d666a: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 20:10:52 +0000 (12:10 -0800)]
am 233d666a: (-s ours) Import translations. DO NOT MERGE

* commit '233d666aee25e8a869fa923e1578ca4ff0a202e2':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 9 Dec 2013 19:47:45 +0000 (11:47 -0800)]
Import translations. DO NOT MERGE

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

10 years agoam 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displ...
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:29:27 +0000 (17:29 -0800)]
am 5d65a47c: Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev

* commit '5d65a47c395918d3f777d99747eb4f2e901566ee':
  Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

10 years agoMerge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon...
Lance Jin-woong Chang [Thu, 5 Dec 2013 01:27:43 +0000 (01:27 +0000)]
Merge "Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"" into klp-dev

10 years agoRevert "Fix for formatting of Korean/Japanese text which is displayed upon default...
Lance Jin-woong Chang [Thu, 5 Dec 2013 00:59:51 +0000 (00:59 +0000)]
Revert "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181"

This reverts commit 5796dad9a41e9801878f2cf0feb76977da4b025b.

Change-Id: Ib9de134bef6328dac6aa5a4b6033c584fb672ab5

10 years agoam 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed...
Lance Chang [Thu, 5 Dec 2013 00:49:45 +0000 (16:49 -0800)]
am 071fbfd3: Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev

* commit '071fbfd3f35c01fb1c4052614902dabe16af691f':
  Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181

10 years agoMerge "Fix for formatting of Korean/Japanese text which is displayed upon default...
Lance Chang [Thu, 5 Dec 2013 00:47:14 +0000 (00:47 +0000)]
Merge "Fix for formatting of Korean/Japanese text which is displayed upon default SMS app change Bug: 11923434 Change-Id: I34a353137338b0f8d55e2309f037c34922141181" into klp-dev