GitLab

Merge commit '21ec779a' into eclair-mr2

* commit '21ec779a':
  Add stack unwinding directives to atomic-android-arm.S.

For bug 2182296.

Eclair branch Dr. No approved by: hiroshi

Merge commit '065694b3' into eclair-mr2

* commit '065694b3':
  init: devices: Remove pmem_gpu regions as they are not needed since we have an mmu

Merge commit '8234aa37' into eclair-mr2

* commit '8234aa37':
  init: Add qdsp6 video encoder, q6venc, device owned by system.audio

Change-Id: I2f8f0440d9a21230c7711cb6d9a20ec6887b7cb9
Signed-off-by: Dima Zavin <dima@android.com>

Change-Id: I86173e07163b70ce8990b8508afba44729c0d8ca
Signed-off-by: Dima Zavin <dima@android.com>

Merge commit 'fd110c7f' into eclair-mr2

* commit 'fd110c7f':
  rootdir: init.rc: Adjust background dirty writeout policy

* changes:
  rootdir: init.rc: Adjust background dirty writeout policy

Signed-off-by: San Mehat <san@google.com>

Also check that device is not already connected in "adb connect"

Change-Id: I5f84b56b63d8c6932f23791cac319fd6bc39d36c
Signed-off-by: Mike Lockwood <lockwood@android.com>

server do.

Change-Id: I16ce4ae656473055e7e244ccd4af7055959e3c1c

* changes:
  Make vmallocinfo readable by group log so we can put it in bugreports

Change-Id: I7b04795c029c51108132e7a9eaf46b97de06de6f
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>

Merge commit '46ef2b87' into eclair

* commit '46ef2b87':
  add free space on system and cache to free_storage_left log event

We'll do this in the product-specific init files.

Revert "rootdir: init.rc: *LATENCY EXPERIMENT* - Disable cgroups in favor of new scheduler policy support"

This reverts commit 35ad5f41.

Merge commit 'b084929f' into eclair

* commit 'b084929f':
  Make AudioPara4 world-readable

This way adb pull can get to it on user builds.

BUG=1869158

add O_TRUNC flag in open(), which will truncate the target file,
otherwise, copy will keep the old content of the target file.
Signed-off-by: Tom Zhu <ling.zhu@motorola.com>
Signed-off-by: San Mehat <san@google.com>

Change-Id: I6b920de4e7c86257cb56a75e570c01a42fb2d082

8 more lines should provide more crucial information in weird cases.

Signed-off-by: Ethan.Du <a7233c@motorola.com>
Signed-off-by: San Mehat <san@google.com>

* changes:
  Add NOTICE file and license tag for adb

This is done by ensuring that /init.goldfish.rc and /system/etc/init.goldfish.sh
are part of the system image, even if it lacks other emulator related bits.

* changes:
  Add support for Acer devices

Change-Id: I7045249f86e2b628c31c888e95eb5ba6f6c47251

* changes:
  add account field to the sync log event

Change-Id: Ib47e3e39609bac9cf34f2b9334aa95184b3db71d
Signed-off-by: Mike Lockwood <lockwood@android.com>

BUG=1716164

Change-Id: I6d16bc0dbdf9f3aff2080f8c7968ff3cb592811e

Change-Id: Id68b312e76215e8e217b42ca0301713dbddfee9e
Signed-off-by: Mike Lockwood <lockwood@android.com>

* changes:
  Improve error-handling when an expected token is missing.

We had been arbitrarily swallowing the next token, even if it wasn't
the one we were expecting. Now we only swallow it if it _is_ the one
we were expecting.