GitLab

am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1

* commit '032afc1d':
  Close a security hole - do not give world readable/writable access to /data/drm

Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1

* commit '07ad9f2a':
  Add USB Vendor ID for Fujitsu and Lumigon.

Change-Id: Icd013b362366815527834cbf54aa4ecac2b7750d

* commit 'f90b0e04':
  rootdir: convert all usages of $prop to ${prop}

* commit '84bf9af7':
  init: use init's property expansion code for setprop/write

* commit '78a1b1fe':
  init: delay importing files until after parsing the current file

* commit '5511c84a':
  init: export all androidboot cmd line values as ro.boot.xx props

* commit '3e7b7739':
  init: import the hardware specific init file in init.rc

* commit 'a6235eac':
  init: allow init file imports to use properties in names

* commit 'd7634c9c':
  init: initialize property area early at boot

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

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

If we process the import directive inline, then the ordering of the
commands for the "on xxx" sections would be a little unexpected. The
init.rc files do not really have an implied  order as to which section
appears and gets processed first. The init code itself provides that
ordering explicitly. For the user, the expectation is that if both the
current file and the imported file define a section (e.g. "on init"),
then the commands in the current file will be executed first, and then
the ones from the imported file(s).

The current implementation did not do that. It processed the import
directive inline, and thus the imported (i.e. dependent) files would
appear first in the command lists for the sections. This created
unintended side effects and the solution would have been to try and
put the import lines somewhere in the middle of the init file. This
would be difficult to notice and hard to extract the dependencies.

To solve this, we add the imports to a list for each file being parsed
and process the list after finishing parsing the file. This provides
predictable order for imports and provides a logical flow from the
user perspective: the currently parsed file gets to run its commands
before the files being imported.

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

Also, clean up how we initialize the ro.xx properties and process
the kernel command line.

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

This removes the hardcoding of the file import in init and instead
allows the init.rc file to fully control what is loaded.

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

Adds new property syntax in init files during init file filename
expansion during the import command:
${prop.name}

So, one can do:  import /init.${ro.hardware}.usb.rc

Should convert other usages of property names to use the new function.

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

The property service is still started later, but the property area
and the initial boot properties are initialized before the init.rc
file is processed. This allows init.rc files to have access to boot
properties during parsing.

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

* commit 'ae429828':
  Cherry-picked from c4f37eed in master. Do not merge.

* commit '74159657':
  Cherry-picked from c13daef7 on master. Do not merge.

Fix the build.

Conditionally compile code that is intended to run inside the emulator only.

Change-Id: Ie82e415b2ff52395616f85871dddb38e65b0ed55

Use QEMU pipe for ADB communication when running in emulator.

Change-Id: I7934b6272c2a9825d244ce76ff65dbce6e54ebff

This is now required by some projects.

Change-Id: If4015c6a9f2391b205d2886bcf7f6e51f371ce08

o related-to-bug: 5834297

Change-Id: I8e459610b4f69999be37364c2359b2bac82d4a2a

These are now required by some projects.

Change-Id: I0d51c950178504474d803620a6cd1c9f084804b5

Change-Id: Iaea0ecf6fc4429640a1d8811ec2034ea0f9eb48e

* commit '7cd3e0a3':
  Document ANativeWindow's buffer refcounting

Change-Id: I3f3a977f341cca1f9e0b4a0567fe5fb9f6dd7e0d

Change-Id: I5454e90afd1a1b7d4a75c503f8dca712dba33790

* commit 'b1dfffe6':
  Fix 'adb backup' on Windows

Use the same call sequence that 'adb pull' uses for creating the
output file.  adb_open_mode() apparently does not work on Windows
hosts.

Bug 5733007

Change-Id: I48d719c4657c93e19f6790cf1c6da610d49f5806

Change-Id: I90f80bed70319b9973996b74f78b421b87eef8e7

* commit 'ce48083f':
  Fixes ADB crash on Windows due to large number of connections. do not merge.

The reason for the crash is that ADB on Windows uses WaitForMultipleObjects to
wait on connection events. When number of connections exceeds 64, ADB crashes,
because WaitForMultipleObjects API doesn't support more than 64 handles. This
CL contains a fixer routine that allows waiting on an arbitrary number of
handles.

(cherry picked from commit ac52833e)

Change-Id: I8ad264765e5b38d01a31e42b445f97ea86e49948

* commit 'f9c1fcc5':
  Replace vendor specific NfcGoogle.apk with generic Nfc.apk