Commit graph

3259 commits

Author SHA1 Message Date
Jean-Baptiste Queru
6439693eff am 3b04bde9: am ee79b455: am 93553073: Merge "Extend init and ueventd for SE Android."
* commit '3b04bde991d57765a830e06c6f5bb094722583bd':
  Extend init and ueventd for SE Android.
2012-02-24 11:17:43 -08:00
Jean-Baptiste Queru
3b04bde991 am ee79b455: am 93553073: Merge "Extend init and ueventd for SE Android."
* commit 'ee79b455a904558f74d63a99ade8f3f1197a5de5':
  Extend init and ueventd for SE Android.
2012-02-24 11:15:22 -08:00
Jean-Baptiste Queru
ee79b455a9 am 93553073: Merge "Extend init and ueventd for SE Android."
* commit '935530736d6849c37c0e5c5e01b7e02245481f16':
  Extend init and ueventd for SE Android.
2012-02-24 11:11:48 -08:00
Jean-Baptiste Queru
935530736d Merge "Extend init and ueventd for SE Android." 2012-02-24 10:29:40 -08:00
Nick Kralevich
274c31ab6b fix "logcat -c ; logcat -d" hang.
Change-Id: I1dc3633fc7228a6ff8ed0da4572f40055a28ceb2
2012-02-23 14:48:51 -08:00
Rebecca Schultz Zavin
afd9123946 Add ion helper library
This library contains helper functions for using ion

Change-Id: I7d7f76d6d3f36cd94d67797a38099a94214392b1
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-02-23 12:18:31 -08:00
Anatol Pomazau
c8ba5366da Implement 'fastboot format' command
Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

 - get size of partition
 - create an empty filesystem image
 - erase the partition
 - flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: I8529bc3485739487f0d91312f7c0ab1a6e5d8b44
2012-02-17 16:29:58 -08:00
Anatol Pomazau
fc656103db Fix 'extra tokens at end of #endif directive' warning
Change-Id: I464ede415e64cf7db845bb441754120974bcf855
2012-02-13 18:12:18 -08:00
Mike Lockwood
ca2074b78d Revert "Implement 'fastboot format' command"
until Windows support is done

This reverts commit 452e11885a.
2012-02-13 09:57:19 -08:00
Anatol Pomazau
452e11885a Implement 'fastboot format' command
Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

 - get size of partition
 - create an empty filesystem image
 - erase the partition
 - flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: Ifa42deaa66c3cb96ff786a73c3fadad92658f395
2012-02-11 11:02:40 -08:00
Dianne Hackborn
0b7fc8bb03 Merge "New user definitions for isolated sandboxes." 2012-02-09 18:07:23 -08:00
Nick Kralevich
4ae7716072 do more checks on packages.list
Change-Id: I16d6eab5e674c860be915fde2da7877994bed314
2012-02-09 11:22:33 -08:00
Dianne Hackborn
ca185abcb5 New user definitions for isolated sandboxes.
Change-Id: I302f89c102bc35dcd70168748e205b41fdbf6576
2012-02-09 11:19:00 -08:00
Guang Zhu
a8185a622e Revert "New NativeDaemonConnector protocol adds a seqnum."
Reverting because it seems to break `adb reboot`

This reverts commit dc58e73071.

Change-Id: Ib8cc4379254694398cbb7f3e7a64c20e1ed8c1ba
2012-02-07 19:26:54 -08:00
Robert Greenwalt
dc58e73071 New NativeDaemonConnector protocol adds a seqnum.
Allows for one socket to be multiplexed for multiple requests.
bug:5864209

Change-Id: I934c88da25d95e093371f455442bdf2f0ed7a4f4
2012-02-07 16:00:07 -08:00
Anatol Pomazau
6f53225ef9 Revert "Implement 'fastboot format' command"
This reverts commit 230d160a71
2012-02-03 18:20:02 -08:00
Anatol Pomazau
230d160a71 Implement 'fastboot format' command
Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

 - get size of partition
 - create an empty filesystem image
 - erase the partition
 - flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: I8529bc1dc64237f1f0d91312f7c0ab1a6e5d8b44
2012-02-03 16:07:18 -08:00
Anatol Pomazau
7806e56485 Merge "Revert "Implement 'fastboot format' command"" 2012-02-03 11:18:43 -08:00
Anatol Pomazau
21311f87c6 Revert "Implement 'fastboot format' command"
This reverts commit 049dff53ef
2012-02-03 10:57:46 -08:00
Anatol Pomazau
e9f6e00c19 Merge "Implement 'fastboot format' command" 2012-02-03 10:13:31 -08:00
The Android Open Source Project
776fd990aa am 4802f781: am 48aca55f: Reconcile with ics-mr1-release
* commit '4802f78191f0056e184f0c62ffa682866e86decb':
2012-02-01 10:05:38 -08:00
The Android Open Source Project
4802f78191 am 48aca55f: Reconcile with ics-mr1-release
* commit '48aca55f665393d3389073d8b4299a6a30f41c6d':
2012-02-01 10:01:06 -08:00
The Android Open Source Project
48aca55f66 Reconcile with ics-mr1-release
Change-Id: Ib960fbb7d51a45d540149e6a21d50c3e1d17dd3b
2012-02-01 08:50:52 -08:00
Stephen Smalley
e46f9d510d Extend init and ueventd for SE Android.
Add SE Android support for init and ueventd.

init:
- Load policy at boot.
- Set the security context for service daemons and their sockets.
- New built-in commands: setcon, setenforce, restorecon, setsebool.
- New option for services: seclabel.

ueventd:
- Set the security context for device directories and nodes.

Change-Id: I98ed752cde503c94d99dfa5b5a47e3c33db16aac
2012-02-01 07:49:08 -05:00
Nick Kralevich
91a8efd210 Merge "Restrict zygote to system user." 2012-01-31 08:46:21 -08:00
The Android Open Source Project
0a1c57151e am aee9fc1e: Reconcile with ics-mr1-release
* commit 'aee9fc1e4a44004a2d0b76dcf4f33cb544d29189':
2012-01-30 13:38:50 -08:00
The Android Open Source Project
aee9fc1e4a Reconcile with ics-mr1-release
Change-Id: Ieaacd272ef768930f444735139215730b1c218b6
2012-01-30 13:37:06 -08:00
Jean-Baptiste Queru
0fe24c96be am 142e895a: am e83cd37e: am 0458d373: Merge "fastboot: set the language local string"
* commit '142e895a1d5030a4e032f08fa5814ebd42b964b6':
  fastboot: set the language local string
2012-01-27 21:09:21 -08:00
Jean-Baptiste Queru
142e895a1d am e83cd37e: am 0458d373: Merge "fastboot: set the language local string"
* commit 'e83cd37e58b00fb6b9eb50464067864ca0cb2ff7':
  fastboot: set the language local string
2012-01-27 14:00:21 -08:00
Jean-Baptiste Queru
e83cd37e58 am 0458d373: Merge "fastboot: set the language local string"
* commit '0458d373261d89979529853fa63cdd998b12e04a':
  fastboot: set the language local string
2012-01-27 13:58:04 -08:00
Nick Kralevich
e7fd911fd4 Restrict zygote to system user.
CVE-2011-3918: Address denial of service attack against Android's
zygote process. This change enforces that only UID=system can
directly connect to zygote to spawn processes.

Change-Id: I89f5f05fa44ba8582920b66854df3e79527ae067
2012-01-27 13:06:53 -08:00
Jean-Baptiste Queru
0458d37326 Merge "fastboot: set the language local string" 2012-01-27 10:13:52 -08:00
Anatol Pomazau
049dff53ef Implement 'fastboot format' command
Some filesystems (e.g. ext4) require flushing an initial
fs image, right after erasing it the partition is unusable.

Doing erase,flush emptyfs is a little bit scaring so we have a
separate command that performs it as atomic step:

 - get size of partition
 - create an empty filesystem image
 - erase the partition
 - flush empty fs to the partition

This command applicable only for ext4 filesystem and checks the
partition type before formatting it.

Change-Id: I8529bc1dc64698f1f0d91312f7c0ab1a6e5d8b44
2012-01-25 13:55:39 -08:00
The Android Automerger
0148e603d8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-24 13:33:52 -08:00
Xavier Ducrohet
46f86f11d4 am 0c054095: am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.
* commit '0c05409510037fd7372c3fe7ab240ebf33b15831':
  Add USB vendor IDs for Quanta, INQ and Sony.
2012-01-24 11:32:19 -08:00
Xavier Ducrohet
0c05409510 am 746f3243: Add USB vendor IDs for Quanta, INQ and Sony.
* commit '746f3243f6d30ab51a36dcfea76eac3ba29ac625':
  Add USB vendor IDs for Quanta, INQ and Sony.
2012-01-24 11:29:50 -08:00
Xavier Ducrohet
746f3243f6 Add USB vendor IDs for Quanta, INQ and Sony.
Change-Id: I224e067d9a64e8e9e7afbad0760a4b07f965bf83
2012-01-24 11:18:50 -08:00
Jean-Baptiste Queru
38412163da am 70580b20: am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"
* commit '70580b20bc8485002df0b3e89e42754c8c9796ff':
  adb,fastboot: add USB support for Intel Vendor ID
2012-01-24 08:49:05 -08:00
Jean-Baptiste Queru
70580b20bc am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID"
* commit '149ae11fb63818b470156e1652abfad0e08d486d':
  adb,fastboot: add USB support for Intel Vendor ID
2012-01-24 08:42:49 -08:00
Jean-Baptiste Queru
149ae11fb6 Merge "adb,fastboot: add USB support for Intel Vendor ID" 2012-01-24 07:50:12 -08:00
mgross
c840653efd fastboot: set the language local string
Set the language local string to 0x409 (English US / en-us) such that
fastboot will successfully read the usb descriptor serial number string.
The usbdevfs ioctl fails when the wIndex is not initialized with the
local for the unicode of the usb descriptor string.  usbdevfs is an
obsolete interface and fastboot probably needs a re-write to use libusb
like what is in adb.

Change-Id: I3687f84643f53c736f14b3ae7793185d9b5cccc0
Signed-off-by: Mark D Horn <mark.d.horn@intel.com>
2012-01-23 13:12:23 -08:00
Nick Kralevich
b2d8f896b6 Don't statically compile run-as
Bug: 5904033
Change-Id: Ie815f09a2bf51ad583ded82f652d162a7f70b87e
2012-01-23 11:10:06 -08:00
The Android Open Source Project
6ca9d204cd am 546dc10c: Reconcile with ics-mr1-release
* commit '546dc10c1a7c6fb348507899d3629af01b4e4c43':
2012-01-20 16:37:59 -08:00
The Android Open Source Project
1eb99caa73 am 56acfe35: Reconcile with ics-mr1-release
* commit '56acfe3504249002cb46ab2fe06d420884034444':
2012-01-20 15:52:24 -08:00
Andrew Hsieh
a8748d3b2a am daafb531: am 4779e934: Add Intel\'s vendor ID to adb
* commit 'daafb531484a35a63e229e14d8a81b412e506670':
  Add Intel's vendor ID to adb
2012-01-20 15:52:03 -08:00
Jean-Baptiste Queru
540298e871 am abffc7f7: (-s ours) am fa7860a2: Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c
* commit 'abffc7f7a8c61a4e0202e9398e4d1565408a1ada':
  Rename LOG_ASSERT to ALOG_ASSERT
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
  Rename (IF_)LOG() to (IF_)ALOG()
2012-01-20 15:52:01 -08:00
Glenn Kasten
d21b89db1e Merge "Use audio_format_t consistently" 2012-01-20 14:50:35 -08:00
The Android Open Source Project
546dc10c1a Reconcile with ics-mr1-release
Change-Id: Ica26c90c34d9665dfd68e404893a306d43aface3
2012-01-20 10:25:51 -08:00
Jeff Brown
cb256e7f08 Merge "Set HAVE_LOCALTIME_R to 1 when defined." 2012-01-19 19:52:17 -08:00
Jeff Brown
e66293900b Set HAVE_LOCALTIME_R to 1 when defined.
SQLite 3.7.10 tests the value of the HAVE_LOCALTIME_R macro
if it is defined, so we set it to 1.

Change-Id: I8c34ec362813018f86aea57d1b36b7639d0dd96d
2012-01-19 16:31:57 -08:00