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

6849 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elliott Hughes
687ec9b5e1 am a166bea1: am f5447b0e: Merge "Fix a sporadic build breakage." 
* commit 'a166bea18ffd304163bddec4701904d91541f527':
  Fix a sporadic build breakage.
 2014-01-03 21:14:46 +00:00
Elliott Hughes
a166bea18f am f5447b0e: Merge "Fix a sporadic build breakage." 
* commit 'f5447b0eb9cd2157f4935477f05d4c92dcda37c8':
  Fix a sporadic build breakage.
 2014-01-03 13:12:12 -08:00
Elliott Hughes
f5447b0eb9 Merge "Fix a sporadic build breakage." 2014-01-03 21:08:01 +00:00
Colin Cross
42fb1783a6 am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID" 
* commit '4600d80cef73af052cbba25c7af0d7abfda6e08b':
  Modify BYD's USB Vendor ID
 2014-01-03 21:01:24 +00:00
Colin Cross
4600d80cef am e1095e1d: Merge "Modify BYD\'s USB Vendor ID" 
* commit 'e1095e1da12de9d6dc219f497f7c19d1c1f7a41b':
  Modify BYD's USB Vendor ID
 2014-01-03 12:58:31 -08:00
Colin Cross
e1095e1da1 Merge "Modify BYD's USB Vendor ID" 2014-01-03 20:53:22 +00:00
Nick Kralevich
4af0c74e94 am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config" 
* commit '8be1ccff87cad2a71a4db2f3f827b428e0d26d81':
  adb: configure /system file permission with fs_config
 2014-01-03 19:05:58 +00:00
Nick Kralevich
8be1ccff87 am fcf3d207: Merge "adb: configure /system file permission with fs_config" 
* commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87':
  adb: configure /system file permission with fs_config
 2014-01-03 11:04:02 -08:00
Nick Kralevich
fcf3d207c5 Merge "adb: configure /system file permission with fs_config" 2014-01-03 18:58:13 +00:00
Narayan Kamath
95986aae91 Fix a sporadic build breakage. 
The issue here is that the makefile sets LOCAL_LDFLAGS
and asks for -llog without declaring a dependency on it.
This will cause build breakages if liblog hasn't already
been built yet.

Change-Id: Ia38761cda44a38b6c2a88902d6108cbe64a328ce
 2014-01-03 15:40:37 +00:00
Narayan Kamath
a0342af79d am 2264bd23: am 4958d85d: Merge "Change a debug log to a verbose log." 
* commit '2264bd23a69874ac4f2de125c25b46485c5a544e':
  Change a debug log to a verbose log.
 2014-01-03 09:44:22 +00:00
Narayan Kamath
2264bd23a6 am 4958d85d: Merge "Change a debug log to a verbose log." 
* commit '4958d85d23c03fdde6b3b44793aa2738caef9717':
  Change a debug log to a verbose log.
 2014-01-03 01:42:57 -08:00
Narayan Kamath
4958d85d23 Merge "Change a debug log to a verbose log." 2014-01-03 09:30:29 +00:00
Nick Kralevich
ceb1c5cdf0 am 49264407: am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message" 
* commit '49264407de7b033fb30cdf3fac8919d75b5ea206':
  toolbox-ls: re-introduce clobbered error message
 2014-01-03 05:43:59 +00:00
Nick Kralevich
49264407de am 7139b0c7: Merge "toolbox-ls: re-introduce clobbered error message" 
* commit '7139b0c7f8b3c86c866096cb8621a0d866af1614':
  toolbox-ls: re-introduce clobbered error message
 2014-01-02 21:18:04 -08:00
Nick Kralevich
7139b0c7f8 Merge "toolbox-ls: re-introduce clobbered error message" 2014-01-03 05:13:28 +00:00
Liang Cheng
20d33f4d99 adb: configure /system file permission with fs_config 
adbd changes the permissions of files uploaded by copying
owner's permission to group and other. This causes kernel
load failure if any changes are made to kernel modules
followed by ``adb push'' or ``adb sync'' because file mode
644 would become 666.

The change uses fs_config to get the target mode of files.

In addition, the SELinux file label is set incorrectly
on synced files. Set the label properly.

Change-Id: I354db848f39adfbf189d7e8d3b028e8d763c772f
Signed-off-by: Liang Cheng <licheng@nvidia.com>
Bug: 12264775
 2014-01-02 20:26:18 -08:00
William Roberts
ded3464a10 toolbox-ls: re-introduce clobbered error message 
commit 403b1955 clobbered the error message on lstat()
calls.

Change-Id: Idbd24b648e3a85079b8f8541c0798bf944485ca1
 2014-01-03 02:52:34 +00:00
Elliott Hughes
090928b11b am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily." 
* commit 'a345b25371aa49ebaa4f3b36bb664ba4cf600e60':
  Switch ARM back to libcorkscrew temporarily.
 2014-01-02 23:33:33 +00:00
Elliott Hughes
a345b25371 am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily." 
* commit 'dfc48139c9afc8366184a1a7bc2f3762c0c82ea2':
  Switch ARM back to libcorkscrew temporarily.
 2014-01-02 15:31:13 -08:00
Elliott Hughes
dfc48139c9 Merge "Switch ARM back to libcorkscrew temporarily." 2014-01-02 23:26:51 +00:00
Elliott Hughes
3c67fe9039 Switch ARM back to libcorkscrew temporarily. 
We're seeing major stack trace generation performance
regression and want to find out whether it's libunwind.

Bug: 12181612
Change-Id: I3866ea956859f5cbdfe4f1ee6f20a2b6d39962c4
 2014-01-02 15:25:21 -08:00
Nick Kralevich
3df76c0c73 am 6bec36ec: am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls." 
* commit '6bec36ecc92af488f0193e03c386eaab409ca17c':
  Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
 2014-01-02 21:04:21 +00:00
Nick Kralevich
6bec36ecc9 am 5b8abdf6: Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls." 
* commit '5b8abdf6278a4142736d918d1371d10c54c91db3':
  Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.
 2014-01-02 13:03:03 -08:00
Nick Kralevich
5b8abdf627 Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls." 2014-01-02 20:58:35 +00:00
Narayan Kamath
a1ff801e5f Change a debug log to a verbose log. 
Unlike ALOGV, messages from ALOGD are logged on
all configurations. Not finding an entry in a zip
file is a "normal" occurrence so using an ALOGD
message for it amounts to spam.

Change-Id: I2c60d11e8a750be5106afd65c3c5e335f53f01b6
 2014-01-02 19:41:00 +00:00
Colin Cross
21ff8257c6 am bb96da43: am 268cc540: Merge "ueventd: fix a busy loop while reading uevents" 
* commit 'bb96da432b129cfa2a680910cda00b6c469caeee':
  ueventd: fix a busy loop while reading uevents
 2013-12-28 20:16:15 +00:00
Colin Cross
bb96da432b am 268cc540: Merge "ueventd: fix a busy loop while reading uevents" 
* commit '268cc54089cbdeb0c2ea955448bb16a0858c4538':
  ueventd: fix a busy loop while reading uevents
 2013-12-28 12:13:22 -08:00
Colin Cross
268cc54089 Merge "ueventd: fix a busy loop while reading uevents" 2013-12-28 20:09:53 +00:00
Colin Cross
fed48bb6de am 6604f2d1: am 2dcc2759: Merge "Run the console service shell in the shell domain." 
* commit '6604f2d1ef5e78e7f129f94abe7a763dd0e0dd1d':
  Run the console service shell in the shell domain.
 2013-12-27 20:23:09 +00:00
Colin Cross
6604f2d1ef am 2dcc2759: Merge "Run the console service shell in the shell domain." 
* commit '2dcc275936aefbb5badf3b4822d492260077144d':
  Run the console service shell in the shell domain.
 2013-12-27 12:21:24 -08:00
Colin Cross
2dcc275936 Merge "Run the console service shell in the shell domain." 2013-12-27 20:16:49 +00:00
Colin Cross
7fa9afedc1 am 3ccdf0bb: am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4 
* commit '3ccdf0bbb2bd51530fa674e454ad7a5b279e127c':
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h
 2013-12-27 00:28:53 +00:00
Colin Cross
3ccdf0bbb2 am c3e314a9: Merge changes Ie4b641cd,I5502b71d,I68086ce4 
* commit 'c3e314a93c4ee76f1fd46444e52aab3abe70565f':
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h
 2013-12-26 16:26:26 -08:00
Colin Cross
c3e314a93c Merge changes Ie4b641cd,I5502b71d,I68086ce4 
* changes:
  libion: add apache license header to ion_test.c
  libion: initial unit tests
  libion: update ion_test.h
 2013-12-27 00:22:55 +00:00
Stephen Smalley
5e1461dc90 Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls. 
If checkreqprot == 1, SELinux only checks the protection flags passed
by the application, even if the kernel internally adds PROT_EXEC for
READ_IMPLIES_EXEC personality flags.  Switch to checkreqprot == 0
to check the final protection flags applied by the kernel.

Change-Id: Ic39242bbbd104fc9a1bcf2cd2ded7ce1aeadfac4
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2013-12-23 16:29:25 -05:00
Stephen Smalley
610653fe93 Run the console service shell in the shell domain. 
This allows it to be permissive in userdebug/eng builds
but confined/enforcing in user builds.

Change-Id: Ie322eaa0acdbefea2de4e71ae386778c929d042b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2013-12-23 14:11:44 -05:00
Colin Cross
735ead6e68 libion: add apache license header to ion_test.c 
Change-Id: Ie4b641cd62b56f713178932cc5c08083c0d2452a
 2013-12-19 19:31:46 -08:00
Colin Cross
363441b120 libion: initial unit tests 
Change-Id: I5502b71d0c7c24d7fd59e4880033657f840b341a
 2013-12-19 19:31:46 -08:00
Colin Cross
b04f75ab12 libion: update ion_test.h 
Update ion_test.h to include a padding word to keep the same
struct size on 32-bit and 64-bit.

Change-Id: I68086ce49ca4cc4ed8e251752eaed331a35fbbd2
 2013-12-19 19:31:19 -08:00
Colin Cross
85d5d61144 am c4f4e5e2: am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd 
* commit 'c4f4e5e2550d730b56a9d27693d23f07a601d5c0':
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
 2013-12-19 22:01:07 +00:00
Colin Cross
c4f4e5e255 am cd8b953e: Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd 
* commit 'cd8b953ede50f68dff5ea049e72aee130dc4a3cb':
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
 2013-12-19 13:55:17 -08:00
Colin Cross
cd8b953ede Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9dd 
* changes:
  libion: update to latest uapi header
  libion: return -errno from ion_close
  libion: add include for size_t
  libion: add NULL checks
  libion: clean up whitespace
  libion: move ion.h into local include directory
 2013-12-19 21:49:48 +00:00
Colin Cross
697c1c32cd am 949e2a7c: am dfe747ad: Merge "ion: update struct and type definitions to match kernel header" 
* commit '949e2a7c28e61aa1ef43ce7ae59a709fb25af1af':
  ion: update struct and type definitions to match kernel header
 2013-12-19 21:23:07 +00:00
Colin Cross
949e2a7c28 am dfe747ad: Merge "ion: update struct and type definitions to match kernel header" 
* commit 'dfe747ada3ec58d104d0ea57bf4f86692cd8a4fe':
  ion: update struct and type definitions to match kernel header
 2013-12-19 13:21:44 -08:00
Colin Cross
dfe747ada3 Merge "ion: update struct and type definitions to match kernel header" 2013-12-19 21:18:51 +00:00
Nick Kralevich
a0ce4e2880 am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets." 
* commit '98fdcfa9817bf54a8695c57366f4ff047ceddb85':
  adb: Check sender's socket id when receiving packets.
 2013-12-19 18:40:45 +00:00
Nick Kralevich
98fdcfa981 am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets." 
* commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc':
  adb: Check sender's socket id when receiving packets.
 2013-12-19 10:38:02 -08:00
Nick Kralevich
67cb61ee5a Merge "adb: Check sender's socket id when receiving packets." 2013-12-19 18:33:56 +00:00
Brian Carlstrom
b37b53bf07 am 87942c9a: am b3bfe881: Merge "Make libutils Looper independent of frameworks/native" 
* commit '87942c9aace72daf1efb7f912c95c98efefb4edc':
  Make libutils Looper independent of frameworks/native
 2013-12-19 07:20:44 +00:00