Commit Graph

3132 Commits

Author SHA1 Message Date
The Android Open Source Project 049a788284 am 3ebb3dad: Reconcile with ics-mr1-release
* commit '3ebb3dad6e8da55b2057d064c2c0275f478b4f61':
2012-03-21 08:26:53 -07:00
The Android Open Source Project 3ebb3dad6e Reconcile with ics-mr1-release
Change-Id: I5e32c5ab33c5beeab7576a1984dc0add942c590b
2012-03-21 08:23:48 -07:00
The Android Automerger c2db4ffb87 merge in ics-mr1-release history after reset to ics-mr1 2012-03-10 09:07:32 -08:00
The Android Automerger 4e580885d8 merge in ics-mr1-release history after reset to ics-mr1 2012-03-09 19:24:04 -08:00
The Android Automerger de64d60444 merge in ics-mr1-release history after reset to ics-mr1 2012-03-08 20:46:16 -08:00
Chia-chi Yeh 0fc8abe1f6 am e2e8bd93: am 5ebced39: init.rc: update the permission of /data/local.
* commit 'e2e8bd93becae10f1cc40bb28a581cb4a36d0154':
2012-03-08 14:30:22 -08:00
Chia-chi Yeh 0b32a75b7c am c8d1a0e1: am 5ebced39: init.rc: update the permission of /data/local.
* commit 'c8d1a0e18e008009fe75aa2cc7d3deace0479fce':
  init.rc: update the permission of /data/local.
2012-03-08 14:29:14 -08:00
Chia-chi Yeh c8d1a0e18e am 5ebced39: init.rc: update the permission of /data/local.
* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
  init.rc: update the permission of /data/local.
2012-03-08 14:27:08 -08:00
Chia-chi Yeh e2e8bd93be am 5ebced39: init.rc: update the permission of /data/local.
* commit '5ebced39093d1223566166b8cc6abfe6729c487d':
  init.rc: update the permission of /data/local.
2012-03-08 14:26:42 -08:00
Chia-chi Yeh 5ebced3909 init.rc: update the permission of /data/local.
Bug: 6131945
Change-Id: I3094a471dcfb02b786f47b6778c8fed3726325ec
2012-03-07 15:13:39 -08:00
Colin Cross 1a2f32c482 am d39f9d93: am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"
* commit 'd39f9d93788ed08f8e90d04bdac798e3f3595889':
  Fix typo in queue_property_triggers ident
2012-03-01 22:55:17 -08:00
Colin Cross d39f9d9378 am 9cec99ba: Merge "Fix typo in queue_property_triggers ident"
* commit '9cec99ba9c64d26e2fa34f310cba13ff119b4c55':
  Fix typo in queue_property_triggers ident
2012-03-01 22:48:45 -08:00
Colin Cross 9cec99ba9c Merge "Fix typo in queue_property_triggers ident" 2012-03-01 16:31:08 -08:00
Chris Dearman 469b7b2da8 Fix typo in queue_property_triggers ident
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: I5f18ccb0912b9bb89c9f5104f9505c610c109af8
2012-03-01 15:29:20 -08:00
Jean-Baptiste Queru 25443f80a2 am 1e28088f: am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"
* commit '1e28088f42f9d04e4ab3abf080f956774b1e78d5':
  Toolbox implementation of chown has a bad print
2012-02-28 15:16:22 -08:00
Jean-Baptiste Queru 72249325df am 428a6e3f: am 13438a93: Merge "logwrapper: reduce verbosity and fix usage"
* commit '428a6e3f562b043f74390806c49686d1f16fe99e':
  logwrapper: reduce verbosity and fix usage
2012-02-28 15:16:21 -08:00
Jean-Baptiste Queru 1e28088f42 am 5cc398ef: Merge "Toolbox implementation of chown has a bad print"
* commit '5cc398ef00b439bcf85b65c894433dd52362dff7':
  Toolbox implementation of chown has a bad print
2012-02-28 15:06:10 -08:00
Jean-Baptiste Queru 428a6e3f56 am 13438a93: Merge "logwrapper: reduce verbosity and fix usage"
* commit '13438a93a8904ae712655533ce63aa0d5b486aba':
  logwrapper: reduce verbosity and fix usage
2012-02-28 15:06:09 -08:00
Jean-Baptiste Queru 5cc398ef00 Merge "Toolbox implementation of chown has a bad print" 2012-02-28 14:59:56 -08:00
Jean-Baptiste Queru 13438a93a8 Merge "logwrapper: reduce verbosity and fix usage" 2012-02-28 14:14:12 -08:00
Tanguy Pruvot 1f28b775cf logwrapper: reduce verbosity and fix usage
- no info on normal process exit (0)
 - basename as tag, not the full path
 - fix usage, bad "-x" parameter vs "-d" in code

Change-Id: Ife72729eaee2a366bd4226f3fbe3ba074219c974
2012-02-28 13:55:57 -08:00
Ramanan Rajeswaran f1ab88c234 am 73c019b3: Add asus vendor id
* commit '73c019b30a7c70c50d2a854982143d5eb8c74f8c':
  Add asus vendor id
2012-02-27 11:59:20 -08:00
Ramanan Rajeswaran 73c019b30a Add asus vendor id
Change-Id: I6d10b1788903aba526af7f654b12c302c3e9fc89
2012-02-24 13:00:34 -08:00
Jean-Baptiste Queru 448980724d am 7c02a327: am 1ea9fce4: Merge "Extend toolbox with SE Android support."
* commit '7c02a327563bd0be2d5b7c6cb07f0c48ce87771e':
  Extend toolbox with SE Android support.
2012-02-24 11:38:42 -08:00
Jean-Baptiste Queru 7c02a32756 am 1ea9fce4: Merge "Extend toolbox with SE Android support."
* commit '1ea9fce46f9782a21071b683b183226cb3468a0f':
  Extend toolbox with SE Android support.
2012-02-24 11:33:38 -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 1ea9fce46f Merge "Extend toolbox with SE Android support." 2012-02-24 11:10:56 -08:00
Jean-Baptiste Queru 935530736d Merge "Extend init and ueventd for SE Android." 2012-02-24 10:29:40 -08:00
Stephen Smalley 8290d1083e Extend toolbox with SE Android support.
Add -Z option to ls and ps for displaying security contexts.
Modify id to display security context.
Add new SELinux commands: chcon, getenforce, getsebool, load_policy, restorecon, runcon, setenforce, setsebool.

Change-Id: Ia20941be4a6cd706fe392fed6e38a37d880ec5f1
2012-02-03 11:11:15 -05: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
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 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
Jean-Baptiste Queru 0458d37326 Merge "fastboot: set the language local string" 2012-01-27 10:13:52 -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 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 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
Johan Norberg 69ab6de333 Toolbox implementation of chown has a bad print
When the chown program fails it prints out an error message
and is describing itself as chmod. This has been corrected.

Change-Id: I2c489975f09343bdf66acbf7df6e7183c2daff78
Signed-off-by: christian bejram <christian.bejram@stericsson.com>
2012-01-20 17:28:42 -08:00
The Android Open Source Project 546dc10c1a Reconcile with ics-mr1-release
Change-Id: Ica26c90c34d9665dfd68e404893a306d43aface3
2012-01-20 10:25:51 -08:00
The Android Automerger 2eb08e4435 merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:29:45 -08:00
The Android Open Source Project 56acfe3504 Reconcile with ics-mr1-release
Change-Id: I7d6cd74bf255c517d04c5900a38145571297f66d
2012-01-19 13:07:14 -08:00
Andrew Hsieh daafb53148 am 4779e934: Add Intel\'s vendor ID to adb
* commit '4779e9344bb62208e4772ff6486b6df564f434b8':
  Add Intel's vendor ID to adb
2012-01-19 09:55:35 -08:00
Jean-Baptiste Queru abffc7f7a8 am fa7860a2: Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c
* commit 'fa7860a27ff79b5697ac059c4bedc4f7445500af':
  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-18 17:56:55 -08:00
Jean-Baptiste Queru fa7860a27f Merge changes Iff15ac5e,I52fce957,I6c2a1d56,I929ea38b,Ia0476219,Ia9a357de,Ifb82ae2c
* changes:
  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-18 15:37:04 -08:00