drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,878 Commits 1 Branch 0 Tags
Commit Graph

117878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Trevor Johns
ed8d921a2e am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit 'eec66178668d22910d3889e62087b3797ebf6dd2':
  Docs: Clean up HCE dev guide
 2013-12-16 14:59:19 -08:00
Trevor Johns
eec6617866 am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs 
* commit '73c1681b2f557dfba09a2e1a071dec190dd05e36':
  Docs: Clean up HCE dev guide
 2013-12-16 22:56:38 +00:00
Trevor Johns
73c1681b2f Merge "Docs: Clean up HCE dev guide" into klp-docs 2013-12-16 22:43:48 +00:00
Trevor Johns
7643785aa8 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>
 2013-12-16 14:37:26 -08:00
Scott Main
9a1d3d50cf am 31647391: am c53b7aad: fix typo bug: 12174614 
* commit '316473915d6f41523c21d7077093c4071ebb4283':
  fix typo bug: 12174614
 2013-12-16 13:31:45 -08:00
Scott Main
316473915d am c53b7aad: fix typo bug: 12174614 
* commit 'c53b7aad505b9d3130ad56fe72989704015858a3':
  fix typo bug: 12174614
 2013-12-16 21:29:18 +00:00
Scott Main
c53b7aad50 fix typo 
bug: 12174614

Change-Id: I9a37c3b86c89254ad2a994531cf0bd1a3d31c85f
 2013-12-16 13:22:08 -08:00
Elliott Hughes
a012fee3c3 am 5d6332e3: Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 
* commit '5d6332e3744e37ced079e5360f1fa3e0e5681d57':
  AArch64: Use long for pointers in MediaDrm and MediaMuxer
 2013-12-16 13:01:19 -08:00
Elliott Hughes
5d6332e374 Merge "AArch64: Use long for pointers in MediaDrm and MediaMuxer" 2013-12-16 20:58:02 +00:00
Christopher Tate
e998b60765 am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 
* commit '6040bd47f41fd56ee608f6a80a0babe942ea1df3':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
 2013-12-16 12:49:55 -08:00
Christopher Tate
6040bd47f4 Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)" 2013-12-16 20:44:33 +00:00
Nick Kralevich
09fdc15955 am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 
* commit '3ddee4dec9b7ae2265c356f5809eae73e1ef8796':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
 2013-12-16 10:36:39 -08:00
Katie McCormick
1e609ac45d am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit '4e6c5408273882fc297142456c0ad5bbcb5f2f6a':
  Doc update: clarify version of flags.
 2013-12-16 10:29:57 -08:00
Nick Kralevich
3ddee4dec9 Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy." 2013-12-16 18:28:42 +00:00
Katie McCormick
4e6c540827 am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs 
* commit 'c8b93fd9727d5ac408f492b22364c1d50c5bc97a':
  Doc update: clarify version of flags.
 2013-12-16 18:28:00 +00:00
Katie McCormick
c8b93fd972 Merge "Doc update: clarify version of flags." into klp-docs 2013-12-16 18:25:12 +00:00
Narayan Kamath
28635ca3e3 am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection." 
* commit '44291d9c2722e0d22dc6f909585f4302abdce205':
  Use StrictJarFile instead of JarFile for cert collection.
 2013-12-16 07:20:26 -08:00
Robert Craig
cee6a096b1 [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>
 2013-12-16 09:42:51 -05:00
Mårten Kongstad
4482e7cb67 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
 2013-12-16 12:42:36 +01:00
Narayan Kamath
44291d9c27 Merge "Use StrictJarFile instead of JarFile for cert collection." 2013-12-16 11:29:46 +00:00
Jesse Hall
e2e15d6da1 am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper" 
* commit 'a0ab49bb52f44eac97f81117d6864edd6a2e0487':
  Fix incorrect name in eglSwapBuffers log wrapper
 2013-12-14 16:16:24 -08:00
Jesse Hall
a0ab49bb52 Merge "Fix incorrect name in eglSwapBuffers log wrapper" 2013-12-15 00:11:21 +00:00
Kenny Root
62d509d24f am 37c69fdd: Merge "Use java.util.Objects instead on internal API" 
* commit '37c69fdd826f3973966430adc1abfbefc19bc16e':
  Use java.util.Objects instead on internal API
 2013-12-13 14:17:29 -08:00
Kenny Root
37c69fdd82 Merge "Use java.util.Objects instead on internal API" 2013-12-13 22:12:52 +00:00
Kenny Root
e6585b32ea Use java.util.Objects instead on internal API 
Not needed since java.util.Objects implements all the needed
functionality.

Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
 2013-12-13 13:40:30 -08:00
Narayan Kamath
1f0299a9cb 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
 2013-12-13 16:21:58 +00:00
Kristian Monsen
13b648ebff 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
 2013-12-12 22:38:21 -08:00
Kristian Monsen
584ace0d3f Merge "Fix one and hide the other warnings from core/jni" 2013-12-13 06:32:03 +00:00
Kenny Root
2a288babae am fc2f459c: Merge "Add GCMParameterSpec to preloaded-classes" 
* commit 'fc2f459c522448331b79c388e9f7b19f72650586':
  Add GCMParameterSpec to preloaded-classes
 2013-12-12 17:13:38 -08:00
Kenny Root
fc2f459c52 Merge "Add GCMParameterSpec to preloaded-classes" 2013-12-13 01:08:26 +00:00
Katie McCormick
08e0142fb7 am f85470e6: am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs 
* commit 'f85470e6861e012c145dc04d70656757be611280':
  Doc update: Update package summary for BT.
 2013-12-12 16:58:35 -08:00
Katie McCormick
f85470e686 am fbbc1b79: Merge "Doc update: Update package summary for BT." into klp-docs 
* commit 'fbbc1b791e0a26a56bc8d45622d06f06e020191a':
  Doc update: Update package summary for BT.
 2013-12-13 00:55:59 +00:00
Katie McCormick
fbbc1b791e Merge "Doc update: Update package summary for BT." into klp-docs 2013-12-13 00:52:33 +00:00
Kenny Root
e1263de835 Add GCMParameterSpec to preloaded-classes 
Needed for Bouncycastle 1.50 upgrade with art.

Change-Id: I901122c1ce21abba437a7537e70331724c3cbc9c
 2013-12-13 00:40:00 +00:00
Katie McCormick
f2041ac56e Doc update: Update package summary for BT. 
Fixes:

b/8584860

Change-Id: Ic85436f90b46508e6a182e3fc51365f5bfb8da14
 2013-12-12 15:42:00 -08:00
Katie McCormick
8b8194b500 Doc update: clarify version of flags. 
Fixes:

b/11999080

Change-Id: I0eda86d5162caab6809ff780387091544530dc32
 2013-12-12 14:48:39 -08:00
Kristian Monsen
f5fabdf83d Fix one and hide the other warnings from core/jni 
Most of the warnings are unused parameter from skia functions.

Change-Id: I9df57718d117c26b96163f751ccb056ca86ac072
 2013-12-11 21:58:53 -08:00
Katie McCormick
7162b92007 am 861f8d85: am a58967a9: Doc update: removed the word "new". 
* commit '861f8d8503bf1c384b3fc39531b2ea6db563ebb3':
  Doc update: removed the word "new".
 2013-12-11 18:25:56 -08:00
Katie McCormick
861f8d8503 am a58967a9: Doc update: removed the word "new". 
* commit 'a58967a9899e691a28fc8e277115838e2b0d0f67':
  Doc update: removed the word "new".
 2013-12-12 02:23:04 +00:00
Katie McCormick
a58967a989 Doc update: removed the word "new". 
Change-Id: I8764d94e0f924feeae21a0230dc4f50eacf7754a
 2013-12-11 18:17:28 -08:00
Dirk Dougherty
312165a843 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.
 2013-12-11 16:00:13 -08:00
Dirk Dougherty
f93cc02f70 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.
 2013-12-11 23:41:11 +00:00
Dirk Dougherty
c6da523207 Merge "Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3." into klp-docs 2013-12-11 23:38:20 +00:00
Dirk Dougherty
103c212691 Remove inaccurate statement that recommends remaining wih IAB v2 if you uses subscriptions. Subscriptions are supported in v3. 
Change-Id: I9592f5364afd3c24ab047bb938bdaf6e8bf3b922
 2013-12-11 15:35:30 -08:00
Nick Kralevich
1e137549fe am efa5c88f: Merge "Don\'t try to set service.bootanim.exit" 
* commit 'efa5c88f37165d02e3e11882026c7660c879ff61':
  Don't try to set service.bootanim.exit
 2013-12-11 13:53:29 -08:00
Baligh Uddin
5d819bef3f am 32aa8222: (-s ours) am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '32aa82223a5e0e5475df81378d0e6715601b2cc2':
  Import translations. DO NOT MERGE
 2013-12-11 13:52:06 -08:00
Baligh Uddin
6a8b169118 am e30461c0: (-s ours) am 60835d4b: (-s ours) Import translations. DO NOT MERGE 
* commit 'e30461c07676496e9f848c6ea35e70583cec5949':
  Import translations. DO NOT MERGE
 2013-12-11 13:52:01 -08:00
Baligh Uddin
32aa82223a am 0a102150: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '0a102150448747bcedcd3276740e1adb8130ae03':
  Import translations. DO NOT MERGE
 2013-12-11 13:46:35 -08:00
Baligh Uddin
e30461c076 am 60835d4b: (-s ours) Import translations. DO NOT MERGE 
* commit '60835d4be46caff5d5b62ffb19031b580d42b504':
  Import translations. DO NOT MERGE
 2013-12-11 13:46:31 -08:00
Nick Kralevich
efa5c88f37 Merge "Don't try to set service.bootanim.exit" 2013-12-11 21:46:08 +00:00