ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3213 commits 1 branch 0 tags 217 MiB
Commit graph

3213 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
David 'Digit' Turner
7913bc05be libcutils: Use proper private header to access C library's <time.h> extension 
The strftime_tz() function is not a standard C library function and should not
appear in <time.h>. Instead, it is being moved to <bionic_time.h>, a private
header only available to platform libraries.

Change-Id: I4dc18939b9380725dfaa20c9e417296363bc52f4
 2012-01-13 13:38:40 +01:00
Scott Anderson
7e4c303fe0 Fix hd command so it doesn't error out on EOF 
hd would error out on files that were not a multiple of its read
buffer size (4096).  For example:
Read error on init.rc, offset 17040 len 4096, No such file or directory

The fix is to stop reading on EOF instead of treating it as an
error.

Signed-off-by: Scott Anderson <saa@google.com>

(cherry picked from commit a9fac4155f)

Change-Id: Ib2af725fc39e96c2f81559f61979d451604d4817
 2012-01-12 15:17:07 -08:00
The Android Automerger
4a404c113e merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:02:11 -08:00
Benoit Goby
01c76f5400 HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE 
Export androidboot.modelno command line parameter as ro.boot.modelno
property, so that we can set the USB iProduct string to the correct
value on Stingray.

Bug: 5853250
Change-Id: Idc413f15dc4d9d02027589d1b11bdf50e0a79ccc
 2012-01-12 13:24:19 -08:00
Glenn Kasten
828bf0cdf4 Use audio_format_t consistently 
Change-Id: I7eb489b1c1cbe9bfadd43cd7645da86b90fab652
 2012-01-12 13:20:35 -08:00
Scott Anderson
e437f552d2 Merge "Add md5 command to toolbox." 2012-01-12 12:06:52 -08:00
Tanguy Pruvot
ec4db51f88 rmmod: fix full path syntax 
rmmod /system/modules/multitouch.ko
rmmod: delete_module '/multitouch' failed (errno 2)

Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>
 2012-01-12 20:44:02 +01:00
The Android Open Source Project
877e39608d am 863c9311: Reconcile with ics-mr1-release 
* commit '863c9311d3f3912f02931265906b08ac780f2a1d':
 2012-01-12 09:00:18 -08:00
The Android Open Source Project
863c9311d3 Reconcile with ics-mr1-release 
Change-Id: I490a0a05c5e5e7696f8ebd402992047099a4877f
 2012-01-12 08:56:56 -08:00
Scott Anderson
d0455c952d Add md5 command to toolbox. 
This command outputs the MD5 for specified files.  The output is
in the same form as the md5sum command on Linux.

Change-Id: Ie0e6faf678469ac886bba8b46d98c0e54976a1ed
Signed-off-by: Scott Anderson <saa@google.com>
 2012-01-11 18:13:26 -08:00
The Android Automerger
cffb062ceb merge in ics-mr1-release history after reset to ics-mr1 2012-01-11 16:30:02 -08:00
James Dong
dae26c6ac4 am 3e9c9ac5: am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1 
* commit '3e9c9ac5ee7a36653b90cb86eb6445496b536c16':
  Close a security hole - do not give world readable/writable access to /data/drm
 2012-01-11 16:19:37 -08:00
James Dong
3e9c9ac5ee am 032afc1d: Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1 
* commit '032afc1d52289f486538c9ed53f17b9889ea94df':
  Close a security hole - do not give world readable/writable access to /data/drm
 2012-01-11 16:18:11 -08:00
James Dong
032afc1d52 Merge "Close a security hole - do not give world readable/writable access to /data/drm" into ics-mr1 2012-01-11 16:16:07 -08:00
Xavier Ducrohet
a33c6ee92b am e0b55791: am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon. 
* commit 'e0b557915123b7ad022ff5d0a7a3d4dd2ee7c2fe':
  Add USB Vendor ID for Fujitsu and Lumigon.
 2012-01-11 12:05:16 -08:00
Xavier Ducrohet
e0b5579151 am 07ad9f2a: Add USB Vendor ID for Fujitsu and Lumigon. 
* commit '07ad9f2a127b2836c7d45a503a5f3ef7517218f3':
  Add USB Vendor ID for Fujitsu and Lumigon.
 2012-01-11 12:03:31 -08:00
Xavier Ducrohet
07ad9f2a12 Add USB Vendor ID for Fujitsu and Lumigon. 
Change-Id: Icd013b362366815527834cbf54aa4ecac2b7750d
 2012-01-11 11:55:45 -08:00
Dima Zavin
ed8d4a9c59 am f4d9bc4f: am f90b0e04: rootdir: convert all usages of to 
* commit 'f4d9bc4ffec8e878429a1341dfff33bc02a59a0e':
  rootdir: convert all usages of $prop to ${prop}
 2012-01-11 09:36:53 -08:00
Dima Zavin
7574a68414 am 37080d00: am 84bf9af7: init: use init\'s property expansion code for setprop/write 
* commit '37080d0045009c6161ea0fb52272b6c920fa0da7':
  init: use init's property expansion code for setprop/write
 2012-01-11 09:36:52 -08:00