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
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
Anwar Ghuloum
4bc054019d
Fix parameter ordering for installd's dex2oat execl.
...
Change-Id: Ibd6fd46c6ec3137874f9a3d5eea134bc804e039a
2014-03-11 15:42:58 -07:00
Andy McFadden
e98151e004
Remove "screenshot"
...
This is the old screenshot utility, which relies on direct access
to the framebuffer device. It was replaced a long time ago by
"screencap", which talks to SurfaceFlinger (and includes a fallback
that tries to use the FB dev).
Change-Id: Id75a574bc78033761070b64d528fed06e23a0189
2014-03-11 11:21:21 -07:00
Dave Allison
544b09523b
am 13c6fb10
: am 1649c77e
: Merge "ART profiler"
...
* commit '13c6fb1026531635f409f111d78d561592d2ede9':
ART profiler
2014-03-08 07:28:20 +00:00
Dave Allison
13c6fb1026
am 1649c77e
: Merge "ART profiler"
...
* commit '1649c77ed29eada5de32ace97033b9d898e9a6eb':
ART profiler
2014-03-08 01:56:32 +00:00
Dave Allison
d93707342a
ART profiler
...
Add args to the installd commands for profiler usage.
Make installd create the profile files and allow apps
to write to them.
The profile files are in /data/dalvik-cache/profiles. This
central location is needed due to permissions issues with
dex2oat reading from an app's data directory. The solution
is to put the profile file in a directory owned by the
install user and make the file writeable by the shared group
id of for the app. The app can read and write to these files
only in the profiles directory. The 'system' user also needs
to be able to read the files in order to determine the amount
of change to the file over time.
Bug: 12877748
Change-Id: I9b8e59e3bd7df8a1bf60fa7ffd376a24ba0eb42f
Conflicts:
cmds/installd/commands.c
2014-03-07 12:35:52 -08:00
Mathieu Chartier
62d0f901fd
Don't pass in empty arg to dex2oat.
...
We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.
(cherry picked from commit f53dbfeda3
)
Change-Id: Ia2d60b895391bf83b5d250c20ddb8a4917d347a6
2014-03-05 17:56:31 -08:00
Mathieu Chartier
1d84e25648
am 3c39e03c
: Merge "Don\'t pass in empty arg to dex2oat."
...
* commit '3c39e03c08094ce65608cae8a45dd726cf10b5c3':
Don't pass in empty arg to dex2oat.
2014-03-06 01:05:22 +00:00
Mathieu Chartier
f53dbfeda3
Don't pass in empty arg to dex2oat.
...
We would occassionally pass in an empty arg "" instead of a NULL.
This caused problems since dex2oat isn't made to handle empty args.
Change-Id: Ibb1aed64a4aa17459b2a75a5a2abcf13c7fa8ac7
2014-03-05 16:58:48 -08:00
Brian Carlstrom
cd44310a13
am c9e60374
: am e19c99aa
: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
...
* commit 'c9e60374f5144e94103e5b866570be114aa165c8':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
2014-03-05 22:33:26 +00:00
Brian Carlstrom
c9e60374f5
am e19c99aa
: Merge "Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags"
...
* commit 'e19c99aad605c395f53bf39ae1a27e298e7e33ce':
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
2014-03-05 20:09:46 +00:00
Brian Carlstrom
0ae8e39ebc
Add dalvik.vm.dex2oat-flags to mimic dalvik.vm.dexopt-flags
...
Change-Id: Ic048ed654ea0ae38c9684e5fa5b14742b6b83305
2014-03-04 14:11:55 -08:00
Narayan Kamath
87eb08dc07
am ad0f05be
: am b98c4761
: Merge "Correcting include path in installd test project\'s Android.mk"
...
* commit 'ad0f05bed95dc816a5b1e4bea23b0736458c1857':
Correcting include path in installd test project's Android.mk
2014-02-28 16:23:59 +00:00
Narayan Kamath
ad0f05bed9
am b98c4761
: Merge "Correcting include path in installd test project\'s Android.mk"
...
* commit 'b98c4761e0c80a8d8138910e0a5e5fc8baff8282':
Correcting include path in installd test project's Android.mk
2014-02-28 16:19:30 +00:00
Ramin Zaghi
7400742285
Correcting include path in installd test project's Android.mk
...
installd project has moved from frameworks/base to frameworks/native
and so its test project's c_include path defined in Android.mk
has to match the change.
Change-Id: I597125ff659f51edbd9fc95371790e2d567c78be
2014-02-28 15:41:57 +00:00
Xia Wang
b7925f1364
Build the benchmark test to /data/local/tmp/ for automated test
...
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
2014-02-26 18:04:50 -08:00
Dianne Hackborn
20c7adbfaa
am b37b312b
: am 7d86b454
: Merge "frameworks/native: move idmap to frameworks/base"
...
* commit 'b37b312b829c7ab5107c2f96d0a95a557f67a831':
frameworks/native: move idmap to frameworks/base
2014-02-14 02:00:17 +00:00
Dianne Hackborn
b37b312b82
am 7d86b454
: Merge "frameworks/native: move idmap to frameworks/base"
...
* commit '7d86b45472898373bbe3ef03286b66d71ea82b79':
frameworks/native: move idmap to frameworks/base
2014-02-14 01:54:37 +00:00
Dianne Hackborn
7d86b45472
Merge "frameworks/native: move idmap to frameworks/base"
2014-02-14 01:45:28 +00:00
Nick Kralevich
165c8bdfb5
am 0e4d2885
: am 2044ac43
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '0e4d2885a34d31f5dbe5a08bdb654953abaf82a2':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-13 00:16:04 +00:00
Nick Kralevich
0e4d2885a3
am 2044ac43
: Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
...
* commit '2044ac43e53b517526b3c70dc4fbc60ffc01693f':
Convert all selinux_android_restorecon and _setfilecon calls to new API.
2014-02-12 23:15:07 +00:00
Nick Kralevich
2044ac43e5
Merge "Convert all selinux_android_restorecon and _setfilecon calls to new API."
2014-02-12 23:09:45 +00:00
Colin Cross
07a4728150
frameworks/native: move idmap to frameworks/base
...
idmap depends on libandroidfw, so it should go in frameworks/base.
Change-Id: Ieee30ba9d8170d3118acc89f0617981228a6974b
2014-02-11 18:04:03 -08:00
Dianne Hackborn
297097957f
am 6e5fdb15
: am 6c14f0ad
: Merge "Runtime resource overlay, iteration 2"
...
* commit '6e5fdb1551ca7d117bf7e1acca133a077a8701f0':
Runtime resource overlay, iteration 2
2014-02-11 21:49:02 +00:00
Dianne Hackborn
6e5fdb1551
am 6c14f0ad
: Merge "Runtime resource overlay, iteration 2"
...
* commit '6c14f0ad82be418c742e56fe586657ea0f394b05':
Runtime resource overlay, iteration 2
2014-02-11 21:41:23 +00:00
Dianne Hackborn
6c14f0ad82
Merge "Runtime resource overlay, iteration 2"
2014-02-11 21:27:36 +00:00
Dianne Hackborn
667c3a19d8
am 99188064
: am 340aa8cb
: Merge "New command line tool \'idmap\'"
...
* commit '99188064fd3b2d4ca85b02afefa4adb2562f8940':
New command line tool 'idmap'
2014-02-11 20:41:09 +00:00
Dianne Hackborn
99188064fd
am 340aa8cb
: Merge "New command line tool \'idmap\'"
...
* commit '340aa8cbd4afbb68b16f369336cc1c202582f021':
New command line tool 'idmap'
2014-02-11 20:35:42 +00:00
Dianne Hackborn
340aa8cbd4
Merge "New command line tool 'idmap'"
2014-02-11 20:29:56 +00:00
Stephen Smalley
26288202e7
Convert all selinux_android_restorecon and _setfilecon calls to new API.
...
libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.
Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.
Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-02-07 09:36:11 -05:00
Arve Hjønnevåg
ba91e5af45
am 8641112a
: am 4e7fd950
: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
...
* commit '8641112a1c3d4ff3ed68131d07eed01b715ac906':
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
2014-02-04 02:10:18 +00:00
Arve Hjønnevåg
8641112a1c
am 4e7fd950
: Merge "Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set."
...
* commit '4e7fd9506103dcc9750788caf1f94b8d1348f37b':
Use 64 bit binder interface if TARGET_USES_64_BIT_BINDER _or_ TARGET_IS_64_BIT is set.
2014-02-04 02:01:45 +00:00