Commit Graph

580 Commits

Author SHA1 Message Date
Richard Uhler
9cebc2bc77 am b8d1ee37: am 19db8c88: am ab91d03b: Merge "installd: Add support for SELF_PATCHOAT_NEEDED."
* commit 'b8d1ee37c4a6897442f5d381d5eb7162e04fcebd':
  installd: Add support for SELF_PATCHOAT_NEEDED.
2015-04-09 14:51:00 +00:00
Richard Uhler
ab91d03b0d Merge "installd: Add support for SELF_PATCHOAT_NEEDED." 2015-04-09 14:13:27 +00:00
Mark Salyzyn
82f393aad6 am d029e95a: am 1b0a8702: am ad436ab5: Merge "dumpstate: scrub APANIC"
* commit 'd029e95a58ea0927ebd3431d9991cd316e568002':
  dumpstate: scrub APANIC
2015-04-08 22:07:20 +00:00
Mark Salyzyn
f423b57dd9 dumpstate: scrub APANIC
Bug: 19525200
Change-Id: Ia2d2857cac953fb4ceafb66ddf775d89d7a777b1
2015-04-08 10:51:51 -07:00
Richard Uhler
c92fb6247d installd: Add support for SELF_PATCHOAT_NEEDED.
Change-Id: Ib9a6373f98474f1242367b5285086251a9d580e5
2015-04-07 16:39:29 -07:00
Jeff Sharkey
580e51458e am eb3704a5: am 9e99fce8: am 1cd030be: Merge "Switch installd to compile as C++."
* commit 'eb3704a58e62c0f85cfea776df1040b677263c80':
  Switch installd to compile as C++.
2015-04-07 21:53:19 +00:00
Jeff Sharkey
19803807cd Switch installd to compile as C++.
This is the minimal change needed to switch it over to C++, which
paves the way for using more robust utilities like std::string.

Change-Id: I80ed6280146875eb6ddbbb340c05450388ca13f0
2015-04-07 14:01:43 -07:00
Jeff Sharkey
e23a13299a Valid APK paths now include expanded storage.
Apps on expanded storage live at /mnt/expand/<uuid>/app/com.example,
so we need to relax one more directory level.

Bug: 19993667
Change-Id: I347ec7b92435ea69e632ed5d5fdfabe38ce0b56e
2015-04-07 14:01:12 -07:00
Fyodor Kupolov
7897031f3e am b58e6cbf: am 4914f85f: am 8f43f77d: Merge "Use AID_SYSTEM as uid when creating oat dir"
* commit 'b58e6cbfa726add05bbe5e31e8ca13815ccf2049':
  Use AID_SYSTEM as uid when creating oat dir
2015-04-07 20:49:09 +00:00
Fyodor Kupolov
8eed7e6a9b Use AID_SYSTEM as uid when creating oat dir
Previously AID_INSTALL was used, which was causing permission denied errors
when PackageManager was trying to recursively rename staging directory

Bug: 19550105
Bug: 20087446
Change-Id: I3a9e3056c1fbc1ce0077a3ce52cf77ea6b5085ee
2015-04-07 11:22:00 -07:00
Jeff Sharkey
c0bae30131 Merge "Valid APK paths now include expanded storage." 2015-04-07 04:24:27 +00:00
Jeff Brown
969baf52d9 Merge "Add support for int64, float, double types to service command." 2015-04-07 03:50:29 +00:00
Jeff Brown
d46898fed0 Add support for int64, float, double types to service command.
Comes in handy for invoking transactions that require these types.

Change-Id: I8f14519a2531ab2ec7f3218ecda6d1868f6dd7b3
2015-04-06 19:42:43 -07:00
Jeff Sharkey
7d78005a27 Valid APK paths now include expanded storage.
Apps on expanded storage live at /mnt/expand/<uuid>/app/com.example,
so we need to relax one more directory level.

Bug: 19993667
Change-Id: I347ec7b92435ea69e632ed5d5fdfabe38ce0b56e
2015-04-06 17:44:27 -07:00
Elliott Hughes
62b58afc21 am 7b5f82d8: am 46072d58: am a60ff367: Merge "Remove useless \'svcmgr_handle\' (which had wrong type)."
* commit '7b5f82d8d726e4bcd21c19340c0743a728bc0253':
  Remove useless 'svcmgr_handle' (which had wrong type).
2015-04-06 23:53:49 +00:00
Elliott Hughes
a60ff367a4 Merge "Remove useless 'svcmgr_handle' (which had wrong type)." 2015-04-06 23:13:32 +00:00
Elliott Hughes
0b41ad5d6e Remove useless 'svcmgr_handle' (which had wrong type).
Also use the 'ptr' union member rather than 'handle'.

Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Change-Id: I68e5336cd3af3bc61dbddd2b33d7e1512c0c329c
2015-04-03 22:46:56 -07:00
Elliott Hughes
177861d98f am 2d4cf62a: am 8d9f899a: am 031fec0b: Merge "ServiceManager: Print kernel/userspace binder version"
* commit '2d4cf62a2cdfbfbbca5757eb7dd1498d118bf7c9':
  ServiceManager: Print kernel/userspace binder version
2015-04-04 00:39:46 +00:00
Serban Constantinescu
018cf41a15 ServiceManager: Print kernel/userspace binder version
This patch adds extra logging for the binder version in case the userspace
and kernel versions differ.

Change-Id: I9859b29099726cfcfe5ca23d88ed2e101a06af1a
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
2015-04-03 17:02:48 -07:00
Fyodor Kupolov
b3fb52f7d8 am bce77997: am ebca76c2: am 9cad1985: Merge "Fix errors caused by unused variables"
* commit 'bce7799786ae712bba9b58f1f99cd12ee05b5cf3':
  Fix errors caused by unused variables
2015-04-03 14:52:38 +00:00
Fyodor Kupolov
35eefd2fa7 am a46d5e4b: am 63750cb6: am 4eb88f88: Merge "Support for storing OAT files in app directory"
* commit 'a46d5e4b9a598330e2a79395dbd201ab88aded00':
  Support for storing OAT files in app directory
2015-04-03 14:52:20 +00:00
Fyodor Kupolov
26ff93c1a7 Fix errors caused by unused variables
Change-Id: Ie52ae0e9a642504ee7b78c6bc54b61549cfb0342
2015-04-02 17:03:11 -07:00
Fyodor Kupolov
4eb88f8839 Merge "Support for storing OAT files in app directory" 2015-04-02 23:11:01 +00:00
Mark Salyzyn
f386c961ea am a231a128: am 0f9bf17a: am 23b204e1: Merge "servicemanager: service_manager missing include for string.h"
* commit 'a231a1287815e80a5ab11e30254005b81254d891':
  servicemanager: service_manager missing include for string.h
2015-04-01 22:09:31 +00:00
Mark Salyzyn
13df5f5f8f servicemanager: service_manager missing include for string.h
service_manager.c gets string.h inherited from
private/android_filesystem_config.h it should
not rely on this in the future. The intent is
to move fs_config function into libcutils and
thus deprecate any need for string.h in this
include file.

Bug: 19908228
Change-Id: Icc95ee02bf02c596463868b1330d209d1bd5c58a
2015-04-01 11:11:11 -07:00
Andreas Gampe
a053c841df am 059e9c02: am 8c60cec0: am 5881c8dd: Merge "Installd: Support dex2oat threads system property"
* commit '059e9c023eb025472db6775f9c2a95191dd6c2bf':
  Installd: Support dex2oat threads system property
2015-03-31 03:43:53 +00:00
Andreas Gampe
8d7af8b241 Installd: Support dex2oat threads system property
Check dalvik.vm.dex2oat-threads in installd and pass to dex2oat.

Bug: 19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
2015-03-30 18:45:03 -07:00
Fyodor Kupolov
88ce4ff7a9 Support for storing OAT files in app directory
Changes to installd:
- dexopt now allows oat_dir param for custom output directory
- Added helper method calculate_oat_file_path for calculating oat file
  output location based on oat_dir and apk_path.

Bug: 19550105
Change-Id: I6b079207310583adeb6dad918a58034a059e34c4
2015-03-30 13:48:22 -07:00
John Reck
c1c024a50c am 3e785e2e: am 88c52865: am 0faebfb2: Merge "Add trace_event_clock_sync to atrace"
* commit '3e785e2ef93b068630d0ffb5178a5f38cc249a3d':
  Add trace_event_clock_sync to atrace
2015-03-27 00:43:31 +00:00
John Reck
469a194051 Add trace_event_clock_sync to atrace
Change-Id: I8adce15210d82df09ff3a39ddd8df617aeb16a42
2015-03-26 16:57:30 -07:00
Richard Uhler
59d996fb0d am da08fc67: am b84a3dde: am bc5aceb1: Merge "Store odex files in oat/<isa>/ directory."
* commit 'da08fc672ff9643ada87a38fb98c7bd604b678ad':
  Store odex files in oat/<isa>/ directory.
2015-03-26 16:28:29 +00:00
Richard Uhler
009b877132 Store odex files in oat/<isa>/ directory.
Previously odex files were stored alongside the dex location as:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/<isa>/base.odex

This changes where odex files are stored, adding an "oat" directory:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/oat/<isa>/base.odex

See also the corresponding changes in platform/art and platform/build.

Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
2015-03-25 11:11:05 -07:00
Mathieu Chartier
ab62d4a4a7 am a290b4b9: am b4cf4d7d: am 6dad1713: Merge "Use verify-at-runtime if debug.usejit is true"
* commit 'a290b4b9121dab04c2989ab88017b8286075914b':
  Use verify-at-runtime if debug.usejit is true
2015-03-23 23:24:13 +00:00
Mathieu Chartier
6dad171304 Merge "Use verify-at-runtime if debug.usejit is true" 2015-03-21 00:14:27 +00:00
Mathieu Chartier
d4a7b459f4 Use verify-at-runtime if debug.usejit is true
Bug: 19735273
Change-Id: Ib65b50dbde00184544a1341f351a0fe0ef504d32
2015-03-20 16:05:18 -07:00
Nick Kralevich
4796bc3b27 am 4b9d0b9b: am f3201498: Merge "dumpstate: add O_CLOEXEC"
* commit '4b9d0b9b676afec086bf579015b2f74623b357fd':
  dumpstate: add O_CLOEXEC
2015-03-19 19:11:11 +00:00
Nick Kralevich
cd67e9f059 dumpstate: add O_CLOEXEC
Add O_CLOEXEC to various file descriptor calls, to avoid
leaking file descriptors to dumpstate's child processes.

Bug: 18342188
Change-Id: I74c47a98dfddc29c618067ad53d879b98ed1d87a
2015-03-19 11:32:02 -07:00
Andreas Gampe
7ecaa00987 am 53cab935: am 1fc747d2: am 5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '53cab935d54b6ca013c6a236e09d9160a6aa7f54':
  Installd: Pass debuggable flag
2015-03-10 22:04:23 +00:00
Andreas Gampe
1fc747d20c am 5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '5a25a63de2693177b15817fb19b684ca7bfec582':
  Installd: Pass debuggable flag
2015-03-10 02:10:06 +00:00
Andreas Gampe
598c25e23f Installd: Pass debuggable flag
Pass the debuggable flag from the package manager to dex2oat.

Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
2015-03-09 15:13:24 -07:00
Nick Kralevich
8f1ef92edc am f11b58f2: am fcf1689c: am 5fec7915: Merge "service_manager: reorder permission checks for find"
* commit 'f11b58f296039a0bf90336e4c38c014f11542092':
  service_manager: reorder permission checks for find
2015-03-05 22:43:39 +00:00
Nick Kralevich
fcf1689c1a am 5fec7915: Merge "service_manager: reorder permission checks for find"
* commit '5fec79156d749322dcc0376da1d6cf4d9ee9ccf4':
  service_manager: reorder permission checks for find
2015-03-05 21:48:25 +00:00
Nick Kralevich
b27bbd18bb service_manager: reorder permission checks for find
Reorder the find permission checks. This avoids generating misleading
SELinux denials when a service doesn't exist, or when a service is
prohibited to isolated apps.

The original reason for structuring the code this way is explained
in https://android-review.googlesource.com/#/c/100530/4/cmds/servicemanager/service_manager.c@172
The concern at the time was to avoid leaking a situation where
a caller could probe for the existance of a service. This turns out
to be unnecessary. The same return value is used for both a
permission denied and a service not found. The only side effect
is the generation of an SELinux audit log, which likely won't be
accessible to the calling application.

Change-Id: I9760e1821ed16102fa5f9bec07f8c34944565be9
2015-03-05 10:58:40 -08:00
Christopher Ferris
123edd9f81 resolved conflicts for merge of 04e13acd to master
Change-Id: I9bbc9907a5cbde8b374398493bc0dc6b056ea734
2015-02-26 11:01:57 -08:00
Christopher Ferris
69a141e07f am 9d68ed0e: Merge "Add timeout for dump_file."
* commit '9d68ed0ecd3a101c13a163cfe730b13b1564b442':
  Add timeout for dump_file.
2015-02-26 18:40:42 +00:00
Christopher Ferris
9d68ed0ecd Merge "Add timeout for dump_file." 2015-02-26 18:35:02 +00:00
Mark Salyzyn
59b0b568d0 resolved conflicts for merge of d6c8ae9c to master
Change-Id: I3cbb6ed0958b4328aca1798c7fe6080c31555a3a
2015-02-26 10:05:40 -08:00
Mark Salyzyn
2f655daeea am bb67beca: Merge "dumpstate: add pstore read"
* commit 'bb67beca35e7d570ede193a316a92022fbc2f810':
  dumpstate: add pstore read
2015-02-26 17:29:07 +00:00
Mark Salyzyn
2262c16372 dumpstate: add pstore read
Call logcat -L to pull any LAST Android logs. If the kernel is not
configured for PSTORE and PSTORE_PMSG, the hopes are the empty
content will pressure vendors to slice up and configure support.

Change-Id: I5fddfa1e0f59f24fccc30b257ba68af8a8cf8640
2015-02-26 07:41:41 -08:00
Christopher Ferris
54bcc5ffd5 Add timeout for dump_file.
It turns out dump_file is used on a number of /proc and system files.
In one case, the read of a file stalled and caused a bugreport to
hang forever. It's still possible if there is a kernel bug that this
could stall forever, but less likely.

Also, change the return type of nanotime to uint64_t.

Testing:
- Created a named fifo and verified that dump_file fails with a timeout.
- Created a large /data/anr/traces.txt to verify that large files still
  dump properly and that the additional NONBLOCK parameter doesn't cause
  a problem.
- Created a dummy /data/tombstones/tombstone_00 to verify that the
  dump of these files still works.
- Compared a dump using the old dumpstate to the new dumpstate to verify
  nothing obviously different.

Bug: 19117030
Change-Id: I0d3dd27583c853cdaccd2fd278748cb5f9ccd4fb
2015-02-25 19:59:29 -08:00