118003 Commits

Author SHA1 Message Date
Greg Hackmann
153ec6cae7 am 3545433d: am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '3545433d052769417dcdd70bc59fbf31f9925ba4':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
2013-12-17 18:18:58 +00:00
Greg Hackmann
0b64fa7e4b am c978799c: Merge "Add /dev/rtc backend to SystemClock"
* commit 'c978799c4a7cc8339d560bb47a029861230fa2a6':
  Add /dev/rtc backend to SystemClock
2013-12-17 10:15:37 -08:00
Greg Hackmann
060ae1db7b am eb0ca2b7: Merge "Add timerfd backend to AlarmManagerService"
* commit 'eb0ca2b7bfd70fbbf2bd730b1c431faac21d0416':
  Add timerfd backend to AlarmManagerService
2013-12-17 10:15:33 -08:00
Greg Hackmann
3545433d05 am 9f4e67c5: Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings"
* commit '9f4e67c50b5c311adeaaf6135ef79214a46d0e26':
  Clean up native AlarmManagerService tabs/spaces and unused parameter warnings
2013-12-17 10:15:29 -08:00
Greg Hackmann
c978799c4a Merge "Add /dev/rtc backend to SystemClock" 2013-12-17 18:11:06 +00:00
Greg Hackmann
eb0ca2b7bf Merge "Add timerfd backend to AlarmManagerService" 2013-12-17 18:10:49 +00:00
Greg Hackmann
9f4e67c50b Merge "Clean up native AlarmManagerService tabs/spaces and unused parameter warnings" 2013-12-17 18:10:33 +00:00
Craig Mautner
38bcf6dc87 am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit '422d7003db8d26b5fa503aa294348d7b53621db1':
  Fix to NullPointerException on move back in ActivityStack.
2013-12-17 16:45:06 +00:00
Craig Mautner
422d7003db am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack."
* commit 'f431daa22811fdce9c4ec975d5d33121898b4f9b':
  Fix to NullPointerException on move back in ActivityStack.
2013-12-17 08:42:31 -08:00
Craig Mautner
f431daa228 Merge "Fix to NullPointerException on move back in ActivityStack." 2013-12-17 16:36:45 +00:00
Daniel 2 Olofsson
9cdf9e52d9 Fix to NullPointerException on move back in ActivityStack.
In ActivityTask.moveTaskToBackLocked NullPointerException may occur
when moving back with only current Activity in stack. This due to a
condition that may trigger despite a TaskRecord being null and then
attempt accessing the TaskRecord.mOnTopOfHome variable.

TaskRecord task may be set to null when no resumed activity remain.

Resolved by assuring that flag mOnTopOfHome is instead set to false
for current TaskRecord in case where there are no remaining activities
above home.

The above bug has already been corrected in the following commit,
ada62fca51d314cefe2c5da4e007df5b9abf320d, but it does not set the
cottect value to mTopOfHome for the current taks, see below.

Variable mOnTopOfHome will not be set to false in situations where
stack is of size 1 or less and task is null, perhaps from already
having finished current activity.

To avoid current TaskRecord maintaining value mOnTopOfHome to true
after launching Home this variable is set to false.

Impact should not be major due to correction earlier that makes sure
that there is always a TaskRecord.mOnTopOfHome set to true above Home
activity but if not correctly set for current task still gives a
possibility of bad behavior.

Change-Id: Ie86ad99c188aaa05b0de9d58eaa16c42b6fc4341
2013-12-17 11:35:23 +01:00
Scott Main
a759b3d2b4 am 3fca61f0: am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '3fca61f073b89136396022d78f444d0a50c1a0d3':
  add new training course for Interaction and Engagement
2013-12-17 02:47:50 +00:00
Scott Main
3fca61f073 am 75b8b3e0: am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit '75b8b3e008589c0a02c27d5baa6b3314a020f505':
  add new training course for Interaction and Engagement
2013-12-16 18:45:00 -08:00
Scott Main
75b8b3e008 am ed4b7faa: Merge "add new training course for Interaction and Engagement" into klp-docs
* commit 'ed4b7faa4c17d086233d0b3f86fe315ceee5778e':
  add new training course for Interaction and Engagement
2013-12-17 02:06:05 +00:00
Scott Main
ed4b7faa4c Merge "add new training course for Interaction and Engagement" into klp-docs 2013-12-17 02:03:40 +00:00
Greg Hackmann
b7bbca2d6a Add /dev/rtc backend to SystemClock
On devices without /dev/alarm, use the settimeofday() syscall and the
standard RTC_SET_TIME ioctl (which are collectively equivalent to the
ANDROID_ALARM_SET_RTC ioctl).

Change-Id: I3c1d741099e253186e43c9369b62603b214b9c9a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-16 16:23:52 -08:00
Greg Hackmann
a1d6f92f34 Add timerfd backend to AlarmManagerService
On devices without /dev/alarm, use a new backend based on timerfd.
timerfd has near-equivalent syscalls for the /dev/alarm ioctls we care
about, with two key differences:

1) /dev/alarm uses one fd for all clocks, while timerfd needs one fd per
clock type.

AlarmManagerService addresses this by replacing the fd (int) with an
opaque pointer (long) to the backend-specific state.

2) When the RTC changes, the /dev/alarm WAIT ioctl always returns, while
timerfd cancels (and signals events) only on specially-flagged RTC
timerfds.

The timerfd backend masks this by creating an extraneous RTC timerfd,
specifically so there's always something to signal on RTC changes.

Change-Id: I5aef867748298610347f6e1479dd8bf569495832
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2013-12-16 16:23:51 -08:00
Trevor Johns
987ac90d60 am ed8d921a: am eec66178: am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs
* commit 'ed8d921a2e8feae859bb1899356a936eb84fe50f':
  Docs: Clean up HCE dev guide
2013-12-16 23:02:44 +00:00
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
201c78745d am 9a1d3d50: am 31647391: am c53b7aad: fix typo bug: 12174614
* commit '9a1d3d50cf42db2778dd0e7833608d3293353395':
  fix typo bug: 12174614
2013-12-16 21:34:58 +00: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
Scott Main
8142898da2 add new training course for Interaction and Engagement
Change-Id: If0880399c495aa9233cd30aa119b2d48fccd3dd8
2013-12-16 13:18:24 -08:00
Elliott Hughes
c0d6028f58 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
2013-12-16 21:04:50 +00: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
4275cae408 am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"
* commit 'e998b6076532daaa9c2c621a09a04d67a75a5ad0':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
2013-12-16 20:52:13 +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
fbd6d5a8f8 am 09fdc159: am 3ddee4de: Merge "[bootanimation] Drop user loadable bootanimation.zip abiltiy."
* commit '09fdc159552c85032ce9860fc0d63b6eebeca82a':
  [bootanimation] Drop user loadable bootanimation.zip abiltiy.
2013-12-16 18:41:03 +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
c49273895e am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
* commit '1e609ac45df13fed93df81e805ea6d6485da3aa0':
  Doc update: clarify version of flags.
2013-12-16 18:33:42 +00: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
8f90e47694 am 28635ca3: am 44291d9c: Merge "Use StrictJarFile instead of JarFile for cert collection."
* commit '28635ca3e3815ca01417ef03dd9debd938e34307':
  Use StrictJarFile instead of JarFile for cert collection.
2013-12-16 15:23:50 +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
97b3e43ff1 am e2e15d6d: am a0ab49bb: Merge "Fix incorrect name in eglSwapBuffers log wrapper"
* commit 'e2e15d6da1936890117ad21fb6b18cce321c7d2b':
  Fix incorrect name in eglSwapBuffers log wrapper
2013-12-15 00:20:11 +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
Scott Main
d13afd69c0 update storage doc for secondary external storage in KK
and add some new sample code
and remove documentation for APIs below level 8
and add information about permission changes in KK
bug: 11907502

Change-Id: Id41c532fc2b05e59ab2cdf2b2a4ce368f7c2dba1
2013-12-13 16:42:42 -08:00
Kenny Root
31b9ec01ff am 62d509d2: am 37c69fdd: Merge "Use java.util.Objects instead on internal API"
* commit '62d509d24f91959b75219edd0ab1a6f22b82c600':
  Use java.util.Objects instead on internal API
2013-12-13 22:20:37 +00:00