OSDN Git Service

android-x86/frameworks-base.git
10 years agoFix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE
Craig Mautner [Mon, 16 Dec 2013 23:58:31 +0000 (15:58 -0800)]
Fix incorrect setting of TaskRecord.frontOfTask DO NOT MERGE

When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
member frontOfTask was being set true incorrectly for the top
activity. It should only be true for the bottom activity. This fix
ensures that frontOfTask is always set correctly for all activities by
consoldating it into one method.

Fixes bug 12171535.

Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70

10 years agoam 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev...
Trevor Johns [Mon, 16 Dec 2013 23:05:48 +0000 (23:05 +0000)]
am 987ac90d: am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs

* commit '987ac90d60b8a0b5ae909ce80b5234c1e5c41068':
  Docs: Clean up HCE dev guide

10 years agoam ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into...
Trevor Johns [Mon, 16 Dec 2013 23:02:44 +0000 (23:02 +0000)]
am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs

* commit 'ed8d921a2e8feae859bb1899356a936eb84fe50f':
  Docs: Clean up HCE dev guide

10 years agoam eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
Trevor Johns [Mon, 16 Dec 2013 22:59:19 +0000 (14:59 -0800)]
am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs

* commit 'eec66178668d22910d3889e62087b3797ebf6dd2':
  Docs: Clean up HCE dev guide

10 years agoam 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
Trevor Johns [Mon, 16 Dec 2013 22:56:38 +0000 (22:56 +0000)]
am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs

* commit '73c1681b2f557dfba09a2e1a071dec190dd05e36':
  Docs: Clean up HCE dev guide

10 years agoMerge "Docs: Clean up HCE dev guide" into klp-docs
Trevor Johns [Mon, 16 Dec 2013 22:43:47 +0000 (22:43 +0000)]
Merge "Docs: Clean up HCE dev guide" into klp-docs

10 years agoDocs: Clean up HCE dev guide
Trevor Johns [Fri, 13 Dec 2013 04:09:14 +0000 (20:09 -0800)]
Docs: Clean up HCE dev guide

Fixed various typos and minor errors in the HCE dev guide. Also added a
note to clarify when CATEGORY_PAYMENT should be used vs CATEGORY_OTHER.

Issue: 11991294

Change-Id: Ifa3f30fe5f35715a4cea3f3565b6f3771f44814a
Signed-off-by: Trevor Johns <trevorjohns@google.com>
10 years agoam 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614
Scott Main [Mon, 16 Dec 2013 21:38:11 +0000 (21:38 +0000)]
am 201c7874: am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614

* commit '201c78745d093e0a13420a96647965ee1ccaf68f':
  fix typo bug: 12174614

10 years agoam 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614
Scott Main [Mon, 16 Dec 2013 21:34:58 +0000 (21:34 +0000)]
am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614

* commit '9a1d3d50cf42db2778dd0e7833608d3293353395':
  fix typo bug: 12174614

10 years agoam 31647391: am c53b7aad: fix typo bug: 12174614
Scott Main [Mon, 16 Dec 2013 21:31:45 +0000 (13:31 -0800)]
am 31647391: am c53b7aad: fix typo bug: 12174614

* commit '316473915d6f41523c21d7077093c4071ebb4283':
  fix typo bug: 12174614

10 years agoam c53b7aad: fix typo bug: 12174614
Scott Main [Mon, 16 Dec 2013 21:29:18 +0000 (21:29 +0000)]
am c53b7aad: fix typo bug: 12174614

* commit 'c53b7aad505b9d3130ad56fe72989704015858a3':
  fix typo bug: 12174614

10 years agofix typo
Scott Main [Mon, 16 Dec 2013 21:22:08 +0000 (13:22 -0800)]
fix typo
bug: 12174614

Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f

10 years agoam c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in Media...
Elliott Hughes [Mon, 16 Dec 2013 21:07:24 +0000 (21:07 +0000)]
am c0d6028f: am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

* commit 'c0d6028f58b0a55e4956b1bc34ac7e4a98b0f894':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer

10 years agoam a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and Media...
Elliott Hughes [Mon, 16 Dec 2013 21:04:50 +0000 (21:04 +0000)]
am a012fee3: am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

* commit 'a012fee3c31803799176f3efb75cf2f929eeb062':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer

10 years agoam 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
Elliott Hughes [Mon, 16 Dec 2013 21:01:19 +0000 (13:01 -0800)]
am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

* commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer

10 years agoam 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo...
Christopher Tate [Mon, 16 Dec 2013 20:58:11 +0000 (20:58 +0000)]
am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"

* commit '4275cae4084cff0e267d9e0d63b968aa0788909a':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)

10 years agoMerge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"
Elliott Hughes [Mon, 16 Dec 2013 20:58:01 +0000 (20:58 +0000)]
Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer"

10 years agoam e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Christopher Tate [Mon, 16 Dec 2013 20:52:13 +0000 (20:52 +0000)]
am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"

* commit 'e998b6076532daaa9c2c621a09a04d67a75a5ad0':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)

10 years agoam 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Christopher Tate [Mon, 16 Dec 2013 20:49:55 +0000 (12:49 -0800)]
am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"

* commit '6040bd47f41fd56ee608f6a80a0babe942ea1df3':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)

10 years agoMerge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
Christopher Tate [Mon, 16 Dec 2013 20:44:33 +0000 (20:44 +0000)]
Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"

10 years agoam fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable...
Nick Kralevich [Mon, 16 Dec 2013 18:44:04 +0000 (18:44 +0000)]
am fbd6d5a8: am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

* commit 'fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.

10 years agoam 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation...
Nick Kralevich [Mon, 16 Dec 2013 18:41:03 +0000 (18:41 +0000)]
am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

* commit '09fdc159552c85032ce9860fc0d63b6eebeca82a':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.

10 years agoam c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify versio...
Katie McCormick [Mon, 16 Dec 2013 18:36:41 +0000 (18:36 +0000)]
am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs

* commit 'c49273895ea96da5d88c806fb6acd4a92b963f84':
  Doc update: clarify version of flags.

10 years agoam 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Nick Kralevich [Mon, 16 Dec 2013 18:36:39 +0000 (10:36 -0800)]
am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

* commit '3ddee4dec9b7ae2265c356f5809eae73e1ef8796':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.

10 years agoam 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags...
Katie McCormick [Mon, 16 Dec 2013 18:33:42 +0000 (18:33 +0000)]
am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs

* commit '1e609ac45df13fed93df81e805ea6d6485da3aa0':
  Doc update: clarify version of flags.

10 years agoam 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp...
Katie McCormick [Mon, 16 Dec 2013 18:29:57 +0000 (10:29 -0800)]
am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs

* commit '4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
  Doc update: clarify version of flags.

10 years agoMerge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
Nick Kralevich [Mon, 16 Dec 2013 18:28:42 +0000 (18:28 +0000)]
Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."

10 years agoam c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
Katie McCormick [Mon, 16 Dec 2013 18:28:00 +0000 (18:28 +0000)]
am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs

* commit 'c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
  Doc update: clarify version of flags.

10 years agoMerge "Doc update: clarify version of flags." into klp-docs
Katie McCormick [Mon, 16 Dec 2013 18:25:12 +0000 (18:25 +0000)]
Merge "Doc update: clarify version of flags." into klp-docs

10 years agoam 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile...
Narayan Kamath [Mon, 16 Dec 2013 15:26:41 +0000 (15:26 +0000)]
am 8f90e476: am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."

* commit '8f90e47694b441941fdf5f17fcb9927ec23fb50b':
  Use StrictJarFile instead of JarFile for cert collection.

10 years agoam 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collec...
Narayan Kamath [Mon, 16 Dec 2013 15:23:50 +0000 (15:23 +0000)]
am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."

* commit '28635ca3e3815ca01417ef03dd9debd938e34307':
  Use StrictJarFile instead of JarFile for cert collection.

10 years agoam 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
Narayan Kamath [Mon, 16 Dec 2013 15:20:26 +0000 (07:20 -0800)]
am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."

* commit '44291d9c2722e0d22dc6f909585f4302abdce205':
  Use StrictJarFile instead of JarFile for cert collection.

10 years ago[bootanimation] Drop user loadable bootanimation.zip abiltiy.
Robert Craig [Mon, 16 Dec 2013 14:42:51 +0000 (09:42 -0500)]
[bootanimation] Drop user loadable bootanimation.zip abiltiy.

A prior change removed the ability of
the shell to push to /data/local. Because
of this, the bootanimation code no longer
supports users loading custom bootanimation.zip
files. This patch drops the access attempt
from the code.

Change-Id: Ie30dd73699c8296be00dc6fbf14691e08baa6410
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
10 years agoFix ResTable_config::CONFIG_* typo (MCC vs MNC)
Mårten Kongstad [Tue, 26 Nov 2013 13:48:22 +0000 (14:48 +0100)]
Fix ResTable_config::CONFIG_* typo (MCC vs MNC)

In commit 08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly
changed to assign the same value to both CONFIG_MCC and CONFIG_MNC:
    - CONFIG_MCC = 0x0001,
    - CONFIG_MNC = 0x0002,
    + CONFIG_MCC = ACONFIGURATION_MCC,
    + CONFIG_MNC = ACONFIGURATION_MCC,

This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as
intended.

Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970

10 years agoMerge "Use StrictJarFile instead of JarFile for cert collection."
Narayan Kamath [Mon, 16 Dec 2013 11:29:45 +0000 (11:29 +0000)]
Merge "Use StrictJarFile instead of JarFile for cert collection."

10 years agoam 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers...
Jesse Hall [Sun, 15 Dec 2013 00:22:37 +0000 (00:22 +0000)]
am 97b3e43f: am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"

* commit '97b3e43ff108cb4761450732fc02e4b69502b8a0':
  Fix incorrect name in eglSwapBuffers log wrapper

10 years agoam e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
Jesse Hall [Sun, 15 Dec 2013 00:20:11 +0000 (00:20 +0000)]
am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"

* commit 'e2e15d6da1936890117ad21fb6b18cce321c7d2b':
  Fix incorrect name in eglSwapBuffers log wrapper

10 years agoam a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
Jesse Hall [Sun, 15 Dec 2013 00:16:24 +0000 (16:16 -0800)]
am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"

* commit 'a0ab49bb52f44eac97f81117d6864edd6a2e0487':
  Fix incorrect name in eglSwapBuffers log wrapper

10 years agoMerge "Fix incorrect name in eglSwapBuffers log wrapper"
Jesse Hall [Sun, 15 Dec 2013 00:11:21 +0000 (00:11 +0000)]
Merge "Fix incorrect name in eglSwapBuffers log wrapper"

10 years agoam 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on intern...
Kenny Root [Fri, 13 Dec 2013 22:23:33 +0000 (22:23 +0000)]
am 31b9ec01: am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"

* commit '31b9ec01ff6087773cb35af6824a6422a0181afb':
  Use java.util.Objects instead on internal API

10 years agoam 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"
Kenny Root [Fri, 13 Dec 2013 22:20:37 +0000 (22:20 +0000)]
am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"

* commit '62d509d24f91959b75219edd0ab1a6f22b82c600':
  Use java.util.Objects instead on internal API

10 years agoam 37c69fdd: Merge "Use java.util.Objects instead on internal API"
Kenny Root [Fri, 13 Dec 2013 22:17:29 +0000 (14:17 -0800)]
am 37c69fdd: Merge "Use java.util.Objects instead on internal API"

* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API

10 years agoMerge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev
Amith Yamasani [Fri, 13 Dec 2013 22:16:57 +0000 (22:16 +0000)]
Merge "Fix bad xml generation due to mismatched start/end tags" into klp-modular-dev

10 years agoMerge "Use java.util.Objects instead on internal API"
Kenny Root [Fri, 13 Dec 2013 22:12:52 +0000 (22:12 +0000)]
Merge "Use java.util.Objects instead on internal API"

10 years agoUse java.util.Objects instead on internal API
Kenny Root [Fri, 13 Dec 2013 20:00:26 +0000 (12:00 -0800)]
Use java.util.Objects instead on internal API

Not needed since java.util.Objects implements all the needed
functionality.

Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c

10 years agoMerge "Introduce a Lifecycle for system services" into klp-modular-dev
Adam Lesinski [Fri, 13 Dec 2013 18:33:24 +0000 (18:33 +0000)]
Merge "Introduce a Lifecycle for system services" into klp-modular-dev

10 years agoFix bad xml generation due to mismatched start/end tags
Amith Yamasani [Fri, 13 Dec 2013 17:05:26 +0000 (09:05 -0800)]
Fix bad xml generation due to mismatched start/end tags

This was causing a problem with lost policy permissions when global proxy was set for a user.

Extract all xml literals into constants to avoid such errors in the future.
Fix some minor line length issues.

Bug: 12065908
Change-Id: I11d532b4aaa978a09ac562fd6b9ddce1f699a03e

10 years agoUse StrictJarFile instead of JarFile for cert collection.
Narayan Kamath [Thu, 12 Dec 2013 16:54:33 +0000 (16:54 +0000)]
Use StrictJarFile instead of JarFile for cert collection.

This ensures that we use the same underlying zip
processing code as the runtimes.

bug: 10193060

(cherry picked from commit eb565dc527eda8c0a43df0d1f30132638ca4ba20)

Change-Id: Iaaa26b02678278394619d0a41613d9ceeae3203c

10 years agoam b90d8591: am 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings...
Kristian Monsen [Fri, 13 Dec 2013 07:31:40 +0000 (07:31 +0000)]
am b90d8591: am 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings from core/jni"

* commit 'b90d8591343e1af176ff181e6bb343f739c037a6':
  Fix one and hide the other warnings from core/jni

10 years agoam 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings from core/jni"
Kristian Monsen [Fri, 13 Dec 2013 07:27:41 +0000 (07:27 +0000)]
am 13b648eb: am 584ace0d: Merge "Fix one and hide the other warnings from core/jni"

* commit '13b648ebff99a3fb8c26152745d294a55f8c11b7':
  Fix one and hide the other warnings from core/jni

10 years agoam 584ace0d: Merge "Fix one and hide the other warnings from core/jni"
Kristian Monsen [Fri, 13 Dec 2013 06:38:21 +0000 (22:38 -0800)]
am 584ace0d: Merge "Fix one and hide the other warnings from core/jni"

* commit '584ace0d3f79ff43db9298798065dd5beaa66a45':
  Fix one and hide the other warnings from core/jni

10 years agoMerge "Fix one and hide the other warnings from core/jni"
Kristian Monsen [Fri, 13 Dec 2013 06:32:03 +0000 (06:32 +0000)]
Merge "Fix one and hide the other warnings from core/jni"

10 years agoam 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"
Kenny Root [Fri, 13 Dec 2013 01:19:59 +0000 (01:19 +0000)]
am 2d7316d7: am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"

* commit '2d7316d72d3aacf70b0ad2a51b3bdc53d1c025b3':
  Add GCMParameterSpec to preloaded-classes

10 years agoam 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"
Kenny Root [Fri, 13 Dec 2013 01:16:45 +0000 (01:16 +0000)]
am 2a288bab: am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"

* commit '2a288babaef57308e042ed97caea6b49c8ae5033':
  Add GCMParameterSpec to preloaded-classes

10 years agoam fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"
Kenny Root [Fri, 13 Dec 2013 01:13:38 +0000 (17:13 -0800)]
am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes"

* commit 'fc2f459c522448331b79c388e9f7b19f72650586':
  Add GCMParameterSpec to preloaded-classes

10 years agoMerge "Add GCMParameterSpec to preloaded-classes"
Kenny Root [Fri, 13 Dec 2013 01:08:26 +0000 (01:08 +0000)]
Merge "Add GCMParameterSpec to preloaded-classes"

10 years agoam 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package...
Katie McCormick [Fri, 13 Dec 2013 01:04:09 +0000 (01:04 +0000)]
am 4561f199: am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs

* commit '4561f1990def36aef17dbb35511a1522195e7f95':
  Doc update: Update package summary for BT.

10 years agoam 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary...
Katie McCormick [Fri, 13 Dec 2013 01:01:18 +0000 (01:01 +0000)]
am 08e0142f: am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs

* commit '08e0142fb72cf08a5784b20d42d18bf7a35370cf':
  Doc update: Update package summary for BT.

10 years agoam f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into...
Katie McCormick [Fri, 13 Dec 2013 00:58:35 +0000 (16:58 -0800)]
am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs

* commit 'f85470e6861e012c145dc04d70656757be611280':
  Doc update: Update package summary for BT.

10 years agoam fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs
Katie McCormick [Fri, 13 Dec 2013 00:55:59 +0000 (00:55 +0000)]
am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs

* commit 'fbbc1b791e0a26a56bc8d45622d06f06e020191a':
  Doc update: Update package summary for BT.

10 years agoMerge "Doc update: Update package summary for BT." into klp-docs
Katie McCormick [Fri, 13 Dec 2013 00:52:33 +0000 (00:52 +0000)]
Merge "Doc update: Update package summary for BT." into klp-docs

10 years agoAdd GCMParameterSpec to preloaded-classes
Kenny Root [Fri, 13 Dec 2013 00:37:45 +0000 (16:37 -0800)]
Add GCMParameterSpec to preloaded-classes

Needed for Bouncycastle 1.50 upgrade with art.

Change-Id: I901122c1ce21abba437a7537e70331724c3cbc9c

10 years agoIntroduce a Lifecycle for system services
Adam Lesinski [Fri, 6 Dec 2013 00:48:06 +0000 (16:48 -0800)]
Introduce a Lifecycle for system services

Provide an abstract class for system services to extend from,
similar to the android.app.Service.

This will allow services to receive events in a uniform way,
and will allow services to be created and started in the
correct order regardless of whether or not a particular
service exists.

Similar to android.app.Service, services are meant to implement
Binder interfaces as inner classes. This prevents services from
having incestuous access to each other and makes them use the
public API.

Change-Id: Iaacfee8d5f080a28d7cc606761f4624673ed390f

10 years agoDoc update: Update package summary for BT.
Katie McCormick [Tue, 26 Nov 2013 23:59:03 +0000 (15:59 -0800)]
Doc update: Update package summary for BT.

Fixes:

b/8584860

Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14

10 years agoDoc update: clarify version of flags.
Katie McCormick [Thu, 12 Dec 2013 22:42:55 +0000 (14:42 -0800)]
Doc update: clarify version of flags.

Fixes:

b/11999080

Change-Id: I0eda86d5162caab6809ff780387091544530dc32

10 years agoFix one and hide the other warnings from core/jni
Kristian Monsen [Thu, 12 Dec 2013 03:46:41 +0000 (19:46 -0800)]
Fix one and hide the other warnings from core/jni

Most of the warnings are unused parameter from skia functions.

Change-Id: I9df57718d117c26b96163f751ccb056ca86ac072

10 years agoam b1738b3a: am 7162b920: am 861f8d85: am a58967a9: Doc update: removed the word...
Katie McCormick [Thu, 12 Dec 2013 02:32:07 +0000 (02:32 +0000)]
am b1738b3a: am 7162b920: am 861f8d85: am a58967a9: Doc update: removed the word "new".

* commit 'b1738b3a272439c7e2c0d55875fa37f3c3acfddc':
  Doc update: removed the word "new".

10 years agoam 7162b920: am 861f8d85: am a58967a9: Doc update: removed the word "new".
Katie McCormick [Thu, 12 Dec 2013 02:28:41 +0000 (02:28 +0000)]
am 7162b920: am 861f8d85: am a58967a9: Doc update: removed the word "new".

* commit '7162b9200707d43bba7168e86073b32ca39c2cd2':
  Doc update: removed the word "new".

10 years agoam 861f8d85: am a58967a9: Doc update: removed the word "new".
Katie McCormick [Thu, 12 Dec 2013 02:25:56 +0000 (18:25 -0800)]
am 861f8d85: am a58967a9: Doc update: removed the word "new".

* commit '861f8d8503bf1c384b3fc39531b2ea6db563ebb3':
  Doc update: removed the word "new".

10 years agoam a58967a9: Doc update: removed the word "new".
Katie McCormick [Thu, 12 Dec 2013 02:23:04 +0000 (02:23 +0000)]
am a58967a9: Doc update: removed the word "new".

* commit 'a58967a9899e691a28fc8e277115838e2b0d0f67':
  Doc update: removed the word "new".

10 years agoDoc update: removed the word "new".
Katie McCormick [Thu, 12 Dec 2013 02:12:22 +0000 (18:12 -0800)]
Doc update: removed the word "new".

Change-Id: I8764d94e0f924feeae21a0230dc4f50eacf7754a

10 years agoam c95bb562: Add previous console on pstore to DropBox
Todd Poynor [Thu, 12 Dec 2013 00:49:42 +0000 (00:49 +0000)]
am c95bb562: Add previous console on pstore to DropBox

* commit 'c95bb562e8c67c258623fe70e8001a08e59b8c7d':
  Add previous console on pstore to DropBox

10 years agoAdd previous console on pstore to DropBox
Todd Poynor [Sat, 23 Nov 2013 01:15:49 +0000 (17:15 -0800)]
Add previous console on pstore to DropBox

Change-Id: I23c0213fe3d52280d7338ca62cb7e79b80a16cc6

10 years agoam b319cde4: am 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statemen...
Dirk Dougherty [Thu, 12 Dec 2013 00:08:25 +0000 (00:08 +0000)]
am b319cde4: am 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs

* commit 'b319cde435b6dd77eab7dbf788567cc5f8a02bcf':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.

10 years agoam 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recomm...
Dirk Dougherty [Thu, 12 Dec 2013 00:05:30 +0000 (00:05 +0000)]
am 312165a8: am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs

* commit '312165a843b6c30128493ba8dcf632d1496ade61':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.

10 years agoam f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remainin...
Dirk Dougherty [Thu, 12 Dec 2013 00:00:13 +0000 (16:00 -0800)]
am f93cc02f: am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs

* commit 'f93cc02f70d06060ad487fec868e565129c9282c':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.

10 years agoam c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB...
Dirk Dougherty [Wed, 11 Dec 2013 23:41:11 +0000 (23:41 +0000)]
am c6da5232: Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs

* commit 'c6da523207d3ddf7b9da98fcb5e461f286eb7aa4':
  Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.

10 years agoMerge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses...
Dirk Dougherty [Wed, 11 Dec 2013 23:38:19 +0000 (23:38 +0000)]
Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs

10 years agoRemove inaccurate statement that recommends remaining wih IAB v2 if you uses subscrip...
Dirk Dougherty [Wed, 11 Dec 2013 23:35:30 +0000 (15:35 -0800)]
Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3.

Change-Id: I9592f5364afd3c24ab047bb938bdaf6e8bf3b922

10 years agoam a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim...
Nick Kralevich [Wed, 11 Dec 2013 22:08:05 +0000 (22:08 +0000)]
am a6416309: am 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"

* commit 'a64163093e6e55f8bbb0153e783fb0ab635e9e60':
  Don't try to set service.bootanim.exit

10 years agoam dd914cc2: (-s ours) am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150...
Baligh Uddin [Wed, 11 Dec 2013 22:08:00 +0000 (22:08 +0000)]
am dd914cc2: (-s ours) am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam ac7737fc: (-s ours) am 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b...
Baligh Uddin [Wed, 11 Dec 2013 22:07:55 +0000 (22:07 +0000)]
am ac7737fc: (-s ours) am 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
Marco Nelissen [Wed, 11 Dec 2013 22:02:36 +0000 (22:02 +0000)]
am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"

* commit 'c680bab3315de2f6af14c1e9fcd3aaf63fa15848':
  Parse UUID string with Long.parseLong

10 years agoam 78168595: am 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidf...
Narayan Kamath [Wed, 11 Dec 2013 22:02:31 +0000 (22:02 +0000)]
am 78168595: am 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."

* commit '78168595070f04aaa0d788b90009b1402c354775':
  Add libutils dependency for libandroidfw host build.

10 years agoam 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libzi...
Narayan Kamath [Wed, 11 Dec 2013 22:02:25 +0000 (22:02 +0000)]
am 9f09408e: am 336bf2fb: am d21752df: Merge "Reimplement ZipFileRO in terms of libziparchive."

* commit '9f09408e3939c5afdb3f9dafc41afd249303ed7f':
  Reimplement ZipFileRO in terms of libziparchive.

10 years agoam d3dd83c6: am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory...
Elliott Hughes [Wed, 11 Dec 2013 22:02:20 +0000 (22:02 +0000)]
am d3dd83c6: am 5b9437df: am 4a72b306: Merge "fix possible buffer overrun and memory leak"

* commit 'd3dd83c67a216f91654aa7d007c92eb82f567528':
  fix possible buffer overrun and memory leak

10 years agoam aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add...
Scott Main [Wed, 11 Dec 2013 22:02:15 +0000 (22:02 +0000)]
am aec930b2: am f70d7b9a: am cf5ed42f: am df75bdcc: rewrite intent guide and add doc with intents supported by platform apps

* commit 'aec930b2c6c7e9ad2a7808a1636f7c0fae0164af':
  rewrite intent guide and add doc with intents supported by platform apps

10 years agoam 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
Nick Kralevich [Wed, 11 Dec 2013 22:00:56 +0000 (22:00 +0000)]
am 1e137549: am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"

* commit '1e137549fea552377b53c642518af0201e85cafe':
  Don't try to set service.bootanim.exit

10 years agoam 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import...
Baligh Uddin [Wed, 11 Dec 2013 22:00:51 +0000 (22:00 +0000)]
am 5d819bef: (-s ours) am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5d819bef3f4bf97c87032cc403e859b1d0d6797a':
  Import translations. DO NOT MERGE

10 years agoam 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translati...
Baligh Uddin [Wed, 11 Dec 2013 22:00:47 +0000 (22:00 +0000)]
am 6a8b1691: (-s ours) am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam efa5c88f: Merge "Don\'t try to set service.bootanim.exit"
Nick Kralevich [Wed, 11 Dec 2013 21:53:29 +0000 (13:53 -0800)]
am efa5c88f: Merge "Don\'t try to set service.bootanim.exit"

* commit 'efa5c88f37165d02e3e11882026c7660c879ff61':
  Don't try to set service.bootanim.exit

10 years agoam 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 11 Dec 2013 21:52:06 +0000 (13:52 -0800)]
am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '32aa82223a5e0e5475df81378d0e6715601b2cc2':
  Import translations. DO NOT MERGE

10 years agoam e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 11 Dec 2013 21:52:01 +0000 (13:52 -0800)]
am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 11 Dec 2013 21:46:35 +0000 (13:46 -0800)]
am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 60835d4b: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 11 Dec 2013 21:46:31 +0000 (13:46 -0800)]
am 60835d4b: (-s ours) Import translations. DO NOT MERGE

* commit '60835d4be46caff5d5b62ffb19031b580d42b504':
  Import translations. DO NOT MERGE

10 years agoMerge "Don't try to set service.bootanim.exit"
Nick Kralevich [Wed, 11 Dec 2013 21:46:08 +0000 (21:46 +0000)]
Merge "Don't try to set service.bootanim.exit"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 11 Dec 2013 21:32:53 +0000 (21:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoDon't try to set service.bootanim.exit
Nick Kralevich [Wed, 11 Dec 2013 21:10:55 +0000 (13:10 -0800)]
Don't try to set service.bootanim.exit

init has never allowed the bootanimation code to
set service.bootanim.exit, and has always generated the
dmesg error message

  <3>[   17.644615] init: sys_prop: permission denied uid:1003  name:service.bootanim.exit

Since setting this property has no effect and never worked, delete
the code which tries to do it.

Change-Id: Idacc5467d85479a8cf974702af8895011be585ea

10 years agoam 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
Marco Nelissen [Wed, 11 Dec 2013 21:02:37 +0000 (21:02 +0000)]
am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"

* commit '69b4670730ec557af6dc67f6c42aff20e5b0b86a':
  Parse UUID string with Long.parseLong

10 years agoam 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."
Narayan Kamath [Wed, 11 Dec 2013 21:02:27 +0000 (21:02 +0000)]
am 007f3cf5: am bb349cdb: Merge "Add libutils dependency for libandroidfw host build."

* commit '007f3cf55980e3615bf7fb4fcabde279dde02853':
  Add libutils dependency for libandroidfw host build.