Commit Graph

324 Commits

Author SHA1 Message Date
Elliott Hughes
3e54077d42 am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit 'e77cb9317de54ea0041eeef7966b818257158f64':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:08:06 +00:00
Elliott Hughes
e77cb9317d am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:04:28 +00:00
Elliott Hughes
259c25080d am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
* commit '03e2f8fa13a791d744758ec9ffe27f52cab730d0':
  Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:02:16 +00:00
Elliott Hughes
03e2f8fa13 Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC." 2014-05-29 00:59:01 +00:00
Brian Carlstrom
28ec03035d am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit 'e67810fd7a00ffa92337c6f3aa6114136ce12613':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:27 +00:00
Brian Carlstrom
e67810fd7a am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '97a51ad44ae3dcf4976076382923ddcae16233ee':
  Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:43 +00:00
Brian Carlstrom
856bc78efc Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175

(cherry picked from commit c4ac3124ff)

Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
2014-05-28 14:48:36 -07:00
Brigid Smith
750aa9743c Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
Bug: 15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
2014-05-28 14:42:09 -07:00
Brian Carlstrom
c4ac3124ff Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175
Change-Id: Id3892a32848fb22fbf4c2861218b51f68e830b34
2014-05-28 14:31:47 -07:00
Santos Cordon
203fe88ed8 DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit 3fb4de7193)
2014-05-28 04:50:04 +00:00
Nick Kralevich
2f9a3e73bf am 449e0dbe: am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
* commit '449e0dbe94126553c96cece21da54b40a6880f11':
  Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:41:41 +00:00
Nick Kralevich
449e0dbe94 am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
* commit 'fc1b9fa3178d1452629d75e2afa1a9d72f03fc1c':
  Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:38:20 +00:00
Nick Kralevich
fc1b9fa317 am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
* commit 'b66ee6c32d87961d5b9f0be97b5fdccb928fd453':
  Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:35:38 +00:00
Stephen Smalley
3a98389263 Ensure that app lib symlinks are correctly labeled when created.
At present, the app lib symlinks are created before setting
the package directory security context, and therefore default
to system_data_file.  Upon a later restorecon_recursive,
they are relabeled to the same type as the package directory,
e.g. app_data_file.  Avoid this inconsistency by setting the
package directory security context before creating the symlink
so that it inherits the same security context.

Change-Id: I1ee6ccd8a2aa63a4d2efda67f313c97932235911
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-05-13 12:59:40 -04:00
Narayan Kamath
fc4e378877 am 44df726a: am cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit '44df726a6cf4fe1119e146c9a18c78966a6305d3':
  Add instruction-set arguments to installd commands.
2014-05-01 14:05:10 +00:00
Narayan Kamath
44df726a6c am cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit 'cb079c899ac9d9c5ec90840249821f58c817406c':
  Add instruction-set arguments to installd commands.
2014-05-01 14:00:54 +00:00
Narayan Kamath
1b40032077 Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.

(cherry picked from commit 791781bfb8)

Change-Id: I43396b16f6eaecacf0fb7d052526fc5a239167ac
2014-05-01 11:38:02 +01:00
Nick Vaccaro
bd81c258c2 am 45fcfb48: am 85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging
* commit '45fcfb48ef9e65747e7a3f35e1a4da232f6e161a':
  dumpstate: increase poll timeout waiting for SIGQUIT logging
2014-04-30 23:35:03 +00:00
Nick Vaccaro
45fcfb48ef am 85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging
* commit '85453ecc90a94564e586f0f97c9ec2c0cf831501':
  dumpstate: increase poll timeout waiting for SIGQUIT logging
2014-04-30 20:35:15 +00:00
Nick Vaccaro
85453ecc90 dumpstate: increase poll timeout waiting for SIGQUIT logging
Increased the maximum time dumpstate will wait for SIGQUIT process
to finish dumping its thread stacks to the logfile to 5 seconds.

Bug: 14057177
Change-Id: I0b43004512855d202f2fe0ea7b0e934e77a3a070
2014-04-30 11:28:31 -07:00
Narayan Kamath
791781bfb8 Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.

Change-Id: Ie480841b3e917dabe23ad4d5f4a0b08990500a51
2014-04-30 09:39:37 +01:00
Bill Yi
e4f00b2aae Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD 2014-04-29 11:34:19 -07:00
Brian Carlstrom
aaa22fd38c am 58ea37fe: am 108ed9fa: Merge "Fix incorrect odex path handling"
* commit '58ea37fe26fc733db478e606374f08d8a9d070cc':
  Fix incorrect odex path handling
2014-04-28 22:10:01 +00:00
Brian Carlstrom
58ea37fe26 am 108ed9fa: Merge "Fix incorrect odex path handling"
* commit '108ed9fa946ec516c0d853927c76ebbfca1dcb23':
  Fix incorrect odex path handling
2014-04-28 22:06:09 +00:00
Chih-Wei Huang
0e8ae16f08 Fix incorrect odex path handling
It's wrong to just concatenate the apk_path and .odex.
The bug prevents the prebuilt odex being used since Kitkat.

The patch is copied from the code of JellyBean.

Change-Id: I0ce8a877e3df8ae1ab9a0e3aeeef2d5253efc223
2014-04-28 14:08:16 -07:00
Mohamad Ayyash
dd306d43ed Merge "atrace: Add f2fs sync and ext4 write tracepoints." 2014-04-15 22:10:10 +00:00
Mohamad Ayyash
26dbcbe013 atrace: Add f2fs sync and ext4 write tracepoints.
Change-Id: I76fa32f7d80aaeafc26494d9018b7a004e7dc3d2
2014-04-11 17:31:31 -07:00
Nick Kralevich
db1d823b4c am 236ed6d3: am 82fb5809: Merge "restorecon the profile directory."
* commit '236ed6d3d376b12573cca6878d3b5013371f5bc8':
  restorecon the profile directory.
2014-04-09 19:49:43 +00:00
Nick Kralevich
236ed6d3d3 am 82fb5809: Merge "restorecon the profile directory."
* commit '82fb58095524c833b0470c4b236aa8a70acf2a0f':
  restorecon the profile directory.
2014-04-09 19:46:14 +00:00
Stephen Smalley
a240733137 restorecon the profile directory.
This is required so that it will be assigned the correct SELinux
security context on first creation by installd.

Bug: 13927667
Change-Id: I4857d031f9e7e60d48b8c72fcb22a81b3a2ebaaa
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-04-09 19:08:20 +00:00
Nick Kralevich
96668903e4 am 4b3d6e31: am 3ebb877e: Merge "Modify installd\'s restorecon function."
* commit '4b3d6e310016140026b0b6c9dca757bf37d6d26a':
  Modify installd's restorecon function.
2014-03-31 20:26:29 +00:00
Nick Kralevich
4b3d6e3100 am 3ebb877e: Merge "Modify installd\'s restorecon function."
* commit '3ebb877e52a2661de56c3f44827f33824e735730':
  Modify installd's restorecon function.
2014-03-31 20:20:44 +00:00
Robert Craig
da30dc7336 Modify installd's restorecon function.
Changes above with PMS and below with libselinux
have resulted in a few changes to the restorecon data
api. This change is needed in order to support the new
way to issue a recursive restorecon of certain
/data/data directories.

The restorecondata function has also been modified to
find all users on the device for a given package name
(argument to the function) and to issue a separate
recursive restorecon call for each.

Change-Id: Ie440cba2c96f0907458086348197e1506d31c1b6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-28 14:32:07 -04:00
Nick Kralevich
9cddbd258d am d9ee7dee: am b1a8c016: Merge "Send libselinux logging to logcat."
* commit 'd9ee7dee2cf42c0e672c7ac85c0252a22d3e5f08':
  Send libselinux logging to logcat.
2014-03-26 16:36:38 +00:00
Nick Kralevich
d9ee7dee2c am b1a8c016: Merge "Send libselinux logging to logcat."
* commit 'b1a8c016371282a3cd3b113e6b2c0310372babf2':
  Send libselinux logging to logcat.
2014-03-26 15:55:46 +00:00
Stephen Smalley
7abb52bcaf Send libselinux logging to logcat.
Otherwise we can't readily see log messages from libselinux calls
made by installd.

Change-Id: I319b30c181470468fe19dd5fbe9251ef03f1163b
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-03-26 09:31:25 -04:00
Xia Wang
d0d4366475 am a0da27d5: am 9c7db080: Build the benchmark test to /data/local/tmp/ for automated test
* commit 'a0da27d546865d075322c410121e9c3101cec449':
  Build the benchmark test to /data/local/tmp/ for automated test
2014-03-25 03:53:59 +00:00
Xia Wang
a0da27d546 am 9c7db080: Build the benchmark test to /data/local/tmp/ for automated test
* commit '9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
  Build the benchmark test to /data/local/tmp/ for automated test
2014-03-25 03:46:32 +00:00
Xia Wang
6d05ef2310 am 9c7db080: Build the benchmark test to /data/local/tmp/ for automated test
* commit '9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
  Build the benchmark test to /data/local/tmp/ for automated test
2014-03-24 18:39:57 +00:00
Xia Wang
9c7db08049 Build the benchmark test to /data/local/tmp/ for automated test
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit b7925f1364)
2014-03-24 18:13:19 +00:00
Nick Kralevich
bb9c93bb6e am 5d58e309: am 1bf30245: Merge "Extend installd to support SELinux restorecon function."
* commit '5d58e3092d70231da57140a7d9d9fbb87fd4b8e6':
  Extend installd to support SELinux restorecon function.
2014-03-19 20:41:51 +00:00
Nick Kralevich
5d58e3092d am 1bf30245: Merge "Extend installd to support SELinux restorecon function."
* commit '1bf30245cbb8be7279fadcf4071cecc8db91789f':
  Extend installd to support SELinux restorecon function.
2014-03-19 20:29:27 +00:00
Robert Craig
e9887e46ce Extend installd to support SELinux restorecon function.
Implement new restorecondata function which will allow
the relabeling of /data/data and /data/user directories.
This is needed in the case of certain OTAs. Not every
boot will apply this relabeling however. Consult change
I77bf2a0c4c34b1feef6fdf4d6c3bd92dbf32f4a1 for
clarification on this issue.

Change-Id: I05e8b438950ddb908e46c9168ea6ee601e6d674f
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2014-03-19 17:37:48 +00:00
Dan Stoza
2c22093c1c Merge "Remove deprecated BufferQueue constructor" 2014-03-17 18:46:14 +00:00
Mark Salyzyn
993146092f am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
  native frameworks: 64-bit compile issues
2014-03-13 23:12:09 +00:00
Dan Stoza
6780a2d6a5 Remove deprecated BufferQueue constructor
Bug: 13415624
Change-Id: I1c17833511b5961af5a9bbb9cc3d627ce558d424
2014-03-13 11:31:43 -07:00
Mark Salyzyn
d4dabf872a am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
* commit 'cdbf28b3f7f5327f4cb0eb95b8326bf4c24c87ba':
  native frameworks: 64-bit compile issues
2014-03-13 15:26:10 +00:00
Mark Salyzyn
92dc3fc52c native frameworks: 64-bit compile issues
- Fix format (print/scanf)
- Suppress unused argument warning messages (bonus)

Change-Id: I05c7724d2aba6da1e82a86000e11f3a8fef4e728
2014-03-12 13:12:44 -07:00
Anwar Ghuloum
d105876a6c am 85864b87: am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."
* commit '85864b8724b3908d2f5aa861276ce5e80d7f820e':
  Fix parameter ordering for installd's dex2oat execl.
2014-03-12 19:57:05 +00:00
Anwar Ghuloum
85864b8724 am 06ed9491: Merge "Fix parameter ordering for installd\'s dex2oat execl."
* commit '06ed9491418ce84e4272bf4201545fa6cfe3932e':
  Fix parameter ordering for installd's dex2oat execl.
2014-03-11 23:43:19 +00:00