openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,232 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

3232 Commits

Author SHA1 Message Date
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
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 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
The Android Automerger 2eb08e4435 merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:29:45 -08:00
Nick Kralevich 5890fe3314 Don't allow adb to run as root in user builds. 
Change-Id: I4fbd7beb7f76c68fead1a89b745f0dfb931b4597
 2012-01-19 15:06:14 -08:00
Nick Kralevich bd9206bc73 Move permission checking code to it's own function. 
Change-Id: Ibe46ca3043791f3b3815080f9e23ac307b1f5900
 2012-01-19 15:02:41 -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
Nick Kralevich abc12070d0 Merge "Don't read /data/local.prop on user builds" 2012-01-18 15:41:47 -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
Andrew Hsieh 4779e9344b Add Intel's vendor ID to adb 
Change-Id: I81da3ea11bfd44395f6895fe51e477ff1e7fa25b
 2012-01-18 14:30:11 -08:00
Nick Kralevich 0dbda7e1c5 Don't read /data/local.prop on user builds 
Creating a root owned /data/local.prop is one of the most common
ways to root an Android device. /data/local.prop is only intended
to assist developers on debuggable devices, and is never
intended to be used on production devices.

Change-Id: Ifcfa21c2ee9914b0b54445218b4cf0fea0a98e9c
 2012-01-18 13:38:34 -08:00
Nick Kralevich 38f368c1b3 Don't parse properties from unsafe files. 
Don't set properties from files that are unsafe (world-writable
or group-writable)

Change-Id: I8da539c6446b10596be1d7c2014e4b9aea13e3fd
 2012-01-18 13:22:38 -08:00
Wu, Hao f60e863828 adb,fastboot: add USB support for Intel Vendor ID 
This patch adds Intel USB Vendor ID into the support
list for adb and fastboot.

Signed-off-by: Wu, Hao <hao.wu@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
 2012-01-17 12:08:06 -08:00
Steve Block 2ac29d0250 Rename LOG_ASSERT to ALOG_ASSERT 
Change-Id: Iff15ac5e7ab226d437c08d23f18fd54e6793e65c
 2012-01-17 17:56:20 +00:00
Steve Block 8aeb6e244a Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 
Change-Id: I52fce957db06c281e2618daa4e2ecba19974f2eb
 2012-01-17 17:56:20 +00:00
Steve Block 4f07a1f826 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) 
Change-Id: I6c2a1d56dadb7e5c69e478f4d8c7d9f2127db2af
 2012-01-17 17:56:20 +00:00
Steve Block 4163b45949 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) 
Change-Id: I929ea38bc6fe6efeefa7870c8e7e4c19cd0029b3
 2012-01-17 17:56:19 +00:00
Steve Block 9786ec417f Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) 
Change-Id: Ia0476219b71ece949595515ee07ea072ed349d73
 2012-01-17 17:56:19 +00:00
Steve Block 66b68757f6 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) 
Change-Id: Ia9a357dec5ad12eea93fd03401a3b02b38e4e94f
 2012-01-17 17:56:18 +00:00
Steve Block 61fbcbe976 Rename (IF_)LOG() to (IF_)ALOG() 
Change-Id: Ifb82ae2c242becaffa3cf19e548b526e6616c2c7
 2012-01-17 17:56:18 +00:00
David 'Digit' Turner ee508560cc Merge "libcutils: Use proper private header to access C library's <time.h> extension" 2012-01-14 04:36:06 -08:00
The Android Automerger b8625abd9c merge in ics-mr1-release history after reset to ics-mr1 2012-01-13 16:19:04 -08:00
Benoit Goby efa5c400e9 am 37a5ecfb: resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp 
* commit '37a5ecfb84673673ba19893a7dfdb51d8c6406bd':
  HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE
 2012-01-13 12:08:12 -08:00
Benoit Goby 37a5ecfb84 resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp 
Change-Id: I7fee3ba108c72450a7f19dee036068cf3783e2fd
 2012-01-13 12:02:17 -08:00
Benoit Goby f134ee366f Merge "HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE" into ics-mr1 2012-01-13 11:46:51 -08:00
Jean-Baptiste Queru f124435c46 am 82dd6af8: am e7b1f132: Merge "rmmod: fix full path syntax" 
* commit '82dd6af84676f1ea6f67ce6fbd2c5cea7a8aa601':
  rmmod: fix full path syntax
 2012-01-13 11:30:24 -08:00
Jean-Baptiste Queru 82dd6af846 am e7b1f132: Merge "rmmod: fix full path syntax" 
* commit 'e7b1f132c2a324af89080bc43968b7222b40ddfa':
  rmmod: fix full path syntax
 2012-01-13 11:27:28 -08:00
Jean-Baptiste Queru e7b1f132c2 Merge "rmmod: fix full path syntax" 2012-01-13 07:47:26 -08:00