GitLab

When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

This change also creates two nested namespaces around zygote. The
first namespace is created when the zygote starts, and it holds a
single writable tmpfs, since rootfs is ro. The second namespace is
created quickly after forking, and is used to hold the private
user-specific bind mounts. (This design saves us from creating a
tmpfs-per-process.)

Bug: 7131382
Change-Id: Id80403ec956f0bff6997411cb1f82f273c76b85f

Using a /storage/sdcard0 symlink and a tmpfs staging area was used
to enable "/sdcard" paths for both zygote processes and the shell
user, but it breaks on devices with both emulated and physical
external storage.

Specifically, vold can't mount a physical sdcard onto the primary
storage symlink, and zygote can't re-bind-mount when secondary
storage is remounted after dropping privileges.

Bug: 7094858, 7064600
Change-Id: Id91e3b3e521a3b3e1bb5358920adc66a0a43917f

* commit 'e599c468':
  Remove unnecessary compiler pragma.

* commit 'cfeacbdd':
  Remove unnecessary compiler pragma.

am 86e036a8: am e6516a53: Merge "Fix an ugly bug where try/catch offsets weren\'t being mapped properly."

* commit '86e036a8':
  Fix an ugly bug where try/catch offsets weren't being mapped properly.

* commit 'e6516a53':
  Fix an ugly bug where try/catch offsets weren't being mapped properly.

* commit '93ee4913':
  Fix a bug where the max blowup of annotations was incorrect.

* commit 'f3b60d2f':
  Fix a bug where the max blowup of annotations was incorrect.

I'm not sure where the 1.34 number comes from but it's incorrect.
From the spec, the encoded_annotation is made up of a single byte
plus an unlimited number of uleb128 values. Each of these values
can double in width in the worst case. I received (personal) email
from one user who'd run into a case worse than the incorrect 1.34
limit.

Change-Id: I3b676e6d2b274aaa538ca61ce23945b3d49aff04

In dex files, there are several places where one object refers
to another object by its position in the file. The dex merger
is generally very careful to adjust these mappings when combining
dex files.

Unfortunately one of these cases was broken. Each try_item refers
to a corresponding encoded_catch_handler by its byte offset in a
list. Most of the time this byte offset is the same in the input
dex file and the output dex file. But encoded_catch_handlers are
variable-length because they use a variable-length uleb128 encoding
to address the type_idx being caught. When dex files are merged,
some exception types may go from having a small index to having
a large index, increasing the number of bytes required to encode
that index. This breaks our ability to directly copy over offsets
as we were doing previously.

Bug: http://code.google.com/p/android/issues/detail?id=36490
Change-Id: I3bdadf20899fdb5d4d074e69103b33c0404a31f8

am 8e98f776: am 3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."

* commit '8e98f776':
  Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.

am 3e46814d: Merge "Don\'t crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup."

* commit '3e46814d':
  Don't crash in dvmQuasiAtomicsShutdown if we never ran dvmQuasiAtomicsStartup.

dalvikvm --help would fail here:

  #0  __pthread_mutex_destroy (mutex=0x0) at pthread_mutex_destroy.c:28
  #1  0xf7b36e13 in dvmDestroyMutex (pMutex=0x0) at dalvik/vm/Thread.h:465
  #2  dvmQuasiAtomicsShutdown () at dalvik/vm/Atomic.cpp:188
  #3  0xf7b65781 in dvmShutdown () at dalvik/vm/Init.cpp:1889
  #4  0xf7b65f31 in ~ScopedShutdown (this=<synthetic pointer>, __in_chrg=<optimized out>) at dalvik/vm/Init.cpp:1317
  #5  dvmStartup (argc=11, argv=0x804b360, ignoreUnrecognized=false, pEnv=0x804b398) at dalvik/vm/Init.cpp:1548
  #6  0xf7b790e2 in JNI_CreateJavaVM (p_vm=0xffffc758, p_env=0xffffc75c, vm_args=0xffffc760) at dalvik/vm/Jni.cpp:3502
  #7  0x08048958 in main (argc=13, argv=0xffffc8b8) at dalvik/dalvikvm/Main.cpp:212

Change-Id: I8c833ca5ea454d9b2d1714a569fb728562088659

With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Remove unnecessary dlmalloc dl prefix #define.

Depends upon: https://android-review.googlesource.com/42351

Change-Id: Idc45cee9342efec0aab63d5172b3308a0fca3c4f

System services holding this permission have external storage bound
one level higher, giving them access to all users' files.

Bug: 7003520
Change-Id: Id95d6d5b2fa2ff75c0c94f18f81cb118f837f665

This reverts commit 4c7e2718.

This reverts commit 729eebbb.

To avoid downloading large OBB files separately for each user,
provide a shared view of /sdcard/Android/obb to all apps.  This new
shared view is read-only by default, but it's mounted writable if
an app requests the WRITE_EXTERNAL_OBB_STORAGE permission.

Bug: 7008879
Change-Id: Ibc6a3dbf360bf1b9d356bf52595201d155ff73b8

* commit '4014e152':
  Correctly handle switches on values in a high register

* commit 'a5731795':
  Correctly handle switches on values in a high register

* commit 'cc686898':
  Fix a bug where debugInfos' size wasn't being computed.

* commit 'f6104618':
  Fix a bug where debugInfos' size wasn't being computed.

* commit 'f76ab40f':
  Fix for 6994917 GC is slower since JOO33B per FrameworkPerf test

* commit 'ecda5d85':
  Fix for 6994917 GC is slower since JOO33B per FrameworkPerf test

This reverts commit 2f8d5e11.

* commit '6464661f':
  Fix build warning.

* commit 'bd561cbf':
  Trim pre-Zygote fork, fix under-estimate of heap limit.

* commit 'b48569ac':
  Fix build warning.

Change-Id: I1f9813c9dc1dfc388f82f37584fe60256b6a8b12

* commit 'a9dd9337':
  Trim pre-Zygote fork, fix under-estimate of heap limit.