ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,506 Commits 2 Branches 0 Tags 54 MiB
Commit Graph

643 Commits

Author SHA1 Message Date
Mike Lockwood 754f16fcf4 Merge "Fix installd command line parser" 2014-11-21 05:02:51 +00:00
Elliott Hughes 8d84b6f9f5 am ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS." 
* commit 'ba4a43c6c78547444446181b4fae20a5d61d35ff':
  Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
 2014-11-20 23:00:26 +00:00
Greg Hackmann e80d32c3c2 atrace: make fs-specific sysfs entries optional 
The availability of these sysfs entries will vary based on the kernel's
supported filesystems, so don't block the disk category if some of them
are missing.

Bug: 18467498

Change-Id: I96200f1b5cf3f1a8fa8186602552adc96ddffc04
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2014-11-20 21:10:45 +00:00
Elliott Hughes ba4a43c6c7 Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS." 2014-11-20 20:58:53 +00:00
Elliott Hughes 9a4e7f492e Kill INCLUDE_SYS_MOUNT_FOR_STATFS. 
Change-Id: I692179cae9d476dd5a0b5fa92813b61934dd7c87
 2014-11-20 12:54:21 -08:00
Narayan Kamath 091ea779d4 Add an installd command to mark the end of boot. 
bug: 18280671

(cherry picked from commit b1a6c2f95a)

Change-Id: I97542875ffff1b68ab324e9b04fb9266c82633cc
 2014-11-19 14:43:05 +00:00
Ian Rogers 35e5423d4d am 11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant" 
* commit '11bf9e5c2f90101d56d918e1b3fe780b873e5566':
  Add support for dalvik.vm.isa.<instruction set>.variant
 2014-11-14 00:30:33 +00:00
Dmitriy Ivanov 741625a17e resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp 
Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba
 2014-11-11 16:08:29 -08:00
Narayan Kamath b1a6c2f95a Add an installd command to mark the end of boot. 
bug: 18280671

Change-Id: I6b3aeaf143ab3b78881f163ec5c17b9bf20172ed
 2014-11-10 17:04:12 +00:00
Ian Rogers 16a95b267a Add support for dalvik.vm.isa.<instruction set>.variant 
Bug: 18056890
Change-Id: Ia266fa9f2a79158ced82016106aa1cd2529259c9
 2014-11-08 16:58:13 -08:00
Igor Murashkin cd647d01e5 am 106e5820: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev 
* commit '106e582053121f1934c33a6c98d35377e8ae384a':
  installd: Set priority to background for dexopting
 2014-11-06 02:55:23 +00:00
Igor Murashkin 106e582053 Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev 2014-11-06 02:43:56 +00:00
Igor Murashkin 9e87a80140 installd: Set priority to background for dexopting 
This fixes jank caused by dex2oat while installing an application in the
background.

Bug: 17497551
Change-Id: I5a69b00c0fd76ae22a0d1adb242bef6c18a75743
 2014-11-05 15:21:12 -08:00
Serguei Katkov 62bb385728 Fix installd command line parser 
Parser does not take into account that the last argument can be empty.
In this case it will skip end of line marker and continue parsing.

Change-Id: I2d029a69ed22cef497893e592ff3275ced97f85f
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
 2014-11-05 13:39:43 +06:00
Mark Salyzyn ea14602e6e am 9cea6ccb: dumpstate: report device uptime mmc performance 
* commit '9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c':
  dumpstate: report device uptime mmc performance
 2014-11-05 00:15:47 +00:00
Mark Salyzyn 9cea6ccbd8 dumpstate: report device uptime mmc performance 
Bug: 18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121
 2014-11-04 09:39:27 -08:00
Patrick Auchter de0cdcd42c am 70ec2941: atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing 
* commit '70ec2941530766bdca09ef2983a3ff794c028ee6':
  atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing
 2014-10-28 07:21:22 +00:00
Patrick Auchter 70ec294153 atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing 
Both Sync Manager tracing and kernel sync tracing were using "sync" to
enable tracing and since Sync Manager was found first, this prevented
enabling kernel sync tracing.

To fix this, use "syncman" to enable Sync Manager tracing.

Change-Id: Id3b799e01e5041c582cd752c8c40d3e36954f821
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2014-10-27 13:07:58 -07:00
Arve Hjønnevåg 54d613e33c am bf46706f: Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev 
* commit 'bf46706f366f0446e60971e32acfcd221b7f19cf':
  dumpstate: Add trusty version if driver is found
 2014-10-20 22:07:49 +00:00
Arve Hjønnevåg 2db0f5f31c dumpstate: Add trusty version if driver is found 
Change-Id: I7780ea8e1d777c222a73408f70d8a6d49dee1d92
 2014-10-16 16:11:07 -07:00
Robin Lee 664a72d3ac am 91c395f6: am 60fd3fee: Migrate CA certificates to all users 
* commit '91c395f6c344682f1ae5926766d4d7247dee6df4':
  Migrate CA certificates to all users
 2014-10-15 23:57:04 +00:00
Robin Lee 0adea3b792 am 60fd3fee: Migrate CA certificates to all users 
* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
  Migrate CA certificates to all users
 2014-10-15 19:26:36 +00:00
Robin Lee 60fd3feeca Migrate CA certificates to all users 
Copies the /data/misc/keychain/cacert-* directories to all users on
the device, whereas previously they were simply copied to user 0.

This is a shallow copy so anything that wasn't supposed to be there
will disappear.

Bug: 17811821
Change-Id: Iae5909ab8d5efdb83c9c8fdf0e10ab7060d022cc
 2014-10-15 19:04:33 +00:00
Christopher Ferris 5653d5de0d am a91968fd: Merge "Accept socket connection before tracing." into lmp-dev 
* commit 'a91968fd099378d1673c7443be16adcb97ee40af':
  Accept socket connection before tracing.
 2014-10-02 13:38:38 +00:00
Christopher Ferris f625a249b9 am a91968fd: Merge "Accept socket connection before tracing." into lmp-dev 
* commit 'a91968fd099378d1673c7443be16adcb97ee40af':
  Accept socket connection before tracing.
 2014-10-02 01:16:58 +00:00
Christopher Ferris ed9354fc84 Accept socket connection before tracing. 
Sometimes dumping threads takes a long time and bugreport times
out. This change will cause us to accept the bugreport socket connection
before dumping threads and should avoid the failed to connect to dumpstate
service problems we've seen.

Bug: 17758374
Change-Id: I80afa0353cf1c340873f481a8d1d7faffff54120
 2014-10-01 17:35:01 -07:00
Narayan Kamath 7f8ecd6dba am cde4b13a: Merge "Allow more than one dex2oat extra option" 
* commit 'cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335':
  Allow more than one dex2oat extra option
 2014-10-01 11:18:25 +00:00
Narayan Kamath 28da32889b am cde4b13a: Merge "Allow more than one dex2oat extra option" 
* commit 'cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335':
  Allow more than one dex2oat extra option
 2014-10-01 11:15:12 +00:00
Lorenzo Colitti 63a8e04d2d am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev 
* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126':
  Include the VPN server IP address in the VPN state file.
 2014-09-23 15:50:59 +00:00
Lorenzo Colitti 7a99e281dd am d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev 
* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126':
  Include the VPN server IP address in the VPN state file.
 2014-09-23 02:53:42 +00:00
Lorenzo Colitti a9e8374c72 Include the VPN server IP address in the VPN state file. 
This will be used by LegacyVpnRunner to create a throw route
pointing at it.

Bug: 17462989
Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
 2014-09-19 13:27:56 +09:00
Yevgeny Rouban b0d8d00b29 Allow more than one dex2oat extra option 
All extra options are provided as one argument to dex2oat.
The patch splits all options to individual ones.

Change-Id: Ied65bb9cf38b114611e88a8d5d86305021700d0b
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Signed-off-by: Yevgeny Rouban <yevgeny.y.rouban@intel.com>
 2014-09-17 10:58:35 +00:00
Dan Albert 4355c0c986 am e1e3d278: Merge "Clean cruft out of makefiles." 
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
  Clean cruft out of makefiles.
 2014-09-12 16:22:03 +00:00
Dan Albert 9e8b528926 resolved conflicts for merge of 07c9557f to lmp-dev-plus-aosp 
Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476
 2014-09-12 09:00:50 -07:00
Jeff Brown 6f3e466b14 am 70b9e6c8: Merge "Make dumpstate vibrate immediately." into lmp-dev 
* commit '70b9e6c8f3221bbbeefc85c70746541a5b318afc':
  Make dumpstate vibrate immediately.
 2014-09-12 05:36:59 +00:00
Dan Albert b79dfe6721 Clean cruft out of makefiles. 
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).

Change-Id: I157309d702e59152adfa3450939082248ae4c043
 2014-09-11 18:49:47 -07:00
Chih-Hung Hsieh 99d9fb15b4 Fix warnings on unused variables and parameters. 
BUG: 17474723
Change-Id: If40f5e765090cfb970e4129b78b1e74cf8bad217
 2014-09-11 16:57:59 -07:00
Jeff Brown 1dc94e3156 Make dumpstate vibrate immediately. 
Previously, the vibration was not performed until after stacks
were gathered which takes a long time.  Moved the vibration
to happen earlier so we provide better user feedback for the
three-button salute when collecting a bug report.

Deleted some dead code for playing begin/end sounds.

Improved the timing measurement code to help track down why
bug reports are so slow.  (They take over a minute now which
can cause us to lose valuable diagnostic information.)

Bug: 17474152
Change-Id: Iac73f7993d7dc85196aad96f459b22fd4a710f94
 2014-09-11 14:19:04 -07:00
Christopher Ferris 500c086a7e am 5ef471c5: Merge "Use time() instead of clock() for timeouts." into lmp-dev 
* commit '5ef471c5f986a52c681a29856c38f72127cdf8ac':
  Use time() instead of clock() for timeouts.
 2014-09-09 21:56:14 +00:00
Christopher Ferris e2c86c71c2 Use time() instead of clock() for timeouts. 
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.

Bug: 17154069

(cherry picked from commit 89d4949f86)

Change-Id: I42f0f24ee53ef99955fd482a1089e39d491f3bd5
 2014-09-09 13:36:52 -07:00
Christopher Ferris 5ef471c5f9 Merge "Use time() instead of clock() for timeouts." into lmp-dev 2014-09-09 20:29:15 +00:00
Christopher Ferris 89d4949f86 Use time() instead of clock() for timeouts. 
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.

Bug: 17154069
Change-Id: Ib383329f9db269445d71a100553b08e71fddda3f
 2014-09-09 13:10:49 -07:00
Jeff Sharkey 0ffb91383f am 464e539c: Merge "Add new system APK locations." into lmp-dev 
* commit '464e539cd3e931aaca99a67d0addc6d68bd96b3d':
  Add new system APK locations.
 2014-09-09 16:44:52 +00:00
Jeff Sharkey 770180a4dd Add new system APK locations. 
Add /system/priv-app and /oem/app paths to system paths.  Also allow
rmdex on system apps, and quietly ignore when it was already removed.

Also relax logging when clearing code cache, since it's optional.

Bug: 17205122
Change-Id: I4fc4d0f63a3596937c4defbd64e1f8a1c563f02d
 2014-09-09 08:22:58 -07:00
Nick Kralevich 2a8bb978d5 am 51eec3b9: Merge "Fix relabeling of secondary user package directories." 
* commit '51eec3b98788039afc5fd7ffe76612c7f8d9b39c':
  Fix relabeling of secondary user package directories.
 2014-09-08 20:55:32 +00:00
Stephen Smalley 8ac2a648b6 Fix relabeling of secondary user package directories. 
When relabeling secondary user package directories, we need to use
the uid of the directory rather than the primary package UID;
otherwise, levelFrom=user will not work correctly.

Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-09-08 15:51:55 -04:00
Brian Carlstrom ad2a4083fe am 8c1642ad: Merge "Remove obsolete prunedexcache" 
* commit '8c1642ad4ea8fbeb7d03f30e5f50e03c28d40065':
  Remove obsolete prunedexcache
 2014-08-29 11:39:54 +00:00
Alex Light 8b17ac6bd6 Remove obsolete prunedexcache 
Bug: 16875245

(cherry picked from commit 5f727f8694)

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
 2014-08-28 16:54:54 -07:00
Alex Light 5f727f8694 Remove obsolete prunedexcache 
Bug: 16875245

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
 2014-08-28 23:30:52 +00:00
Jeff Sharkey 18a9457edd am 7903c6a2: Merge "Make clear data stricter." into lmp-dev 
* commit '7903c6a263354506ace10fc32aa65c231b64f62b':
  Make clear data stricter.
 2014-08-27 18:26:20 +00:00
Jeff Sharkey 7903c6a263 Merge "Make clear data stricter." into lmp-dev 2014-08-27 17:58:35 +00:00
Jeff Sharkey 3316fe472f Make clear data stricter. 
It should nuke everything under the data directory.  PMS will come
around and generate the lib symlink after we're finished.

Bug: 16739202
Change-Id: Ib70af2e1450e3bed6781fb497b9cc67e1e594c49
 2014-08-27 10:46:28 -07:00
Calin Juravle 7330016a75 am 97477d20: Set compiler filter flag to true when vmSafeMode is present. 
* commit '97477d203eaf0c3235bbe2415356f20a0431cada':
  Set compiler filter flag to true when vmSafeMode is present.
 2014-08-27 16:33:27 +00:00
Calin Juravle 4f60ac2bbc Add vm_safe_mode to dexopt. 
The flag enforces interpret-only flag for dex2oat.

Bug: 12457423

(cherry picked from commit b1efac1035)
(cherry picked from commit 97477d203e)

Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
 2014-08-27 16:16:05 +01:00
Calin Juravle 97477d203e Set compiler filter flag to true when vmSafeMode is present. 
Bug: 12457423
Change-Id: I33345c5cce76681d8a6592ebae8c9f96a9f0f8bd
 2014-08-27 16:10:03 +01:00
Calin Juravle 2d509c0113 am 7de2bde3: Merge "Add vm_safe_mode to dexopt." into lmp-dev 
* commit '7de2bde3c4c3a6ecc7e6f21e3f3322688b718c4a':
  Add vm_safe_mode to dexopt.
 2014-08-26 19:28:57 +00:00
Calin Juravle 7de2bde3c4 Merge "Add vm_safe_mode to dexopt." into lmp-dev 2014-08-26 19:10:06 +00:00
Calin Juravle 188fb813c1 am 20558f11: Merge "Pass isa features flag to dex2oat." into lmp-dev 
* commit '20558f1154abcf3360fd972f6d2c80bb80f78502':
  Pass isa features flag to dex2oat.
 2014-08-26 17:51:57 +00:00
Calin Juravle e9eb12c291 Pass isa features flag to dex2oat. 
Bug: 16716262

(cherry picked from commit 8fc7315a67)

Change-Id: I3cb1d82604612bc7212bcbdeef685bc05b695b6a
 2014-08-26 18:48:30 +01:00
Calin Juravle 20558f1154 Merge "Pass isa features flag to dex2oat." into lmp-dev 2014-08-26 17:34:57 +00:00
Calin Juravle b1efac1035 Add vm_safe_mode to dexopt. 
The flag enforces interpret-only flag for dex2oat.

Bug: 12457423
Change-Id: Ifdafcc1afa32996577fa44c5682eeb58c79772ac
 2014-08-26 18:10:40 +01:00
Calin Juravle 8fc7315a67 Pass isa features flag to dex2oat. 
Bug: 16716262
Change-Id: Ifbc3a1520bc177aa87855edb60c36346f24c77cd
 2014-08-26 18:10:36 +01:00
Andres Morales 03d45ded3c am 47c166a9: Merge "Fix deadlock when killing adb bugreport" into lmp-dev 
* commit '47c166a9ad740707f86719e0de56e20c73f407c1':
  Fix deadlock when killing adb bugreport
 2014-08-25 17:49:18 +00:00
Andres Morales 47c166a9ad Merge "Fix deadlock when killing adb bugreport" into lmp-dev 2014-08-25 17:31:50 +00:00
Andres Morales 2e671bbdb7 Fix deadlock when killing adb bugreport 
Leave default signal handler (terminate) for parent process,
add SIG_IGN as signal handler for children and let them
go down when the parent gets SIGPIPE.

Bug: 17109154
Change-Id: Id33db3e97a32f289eb2a9a1a0ca8acbe3dcd285d
 2014-08-22 12:10:44 -07:00
Calin Juravle 01f481649d am c597b6dd: Fix validation of system paths in installd. 
* commit 'c597b6dd895dbb2b28c757ce7a2651b3cdc9b00c':
  Fix validation of system paths in installd.
 2014-08-22 14:54:28 +00:00
Calin Juravle f53c08befc Fix validation of system paths in installd. 
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.

The CL fixes the validation to accept at most on subdirectory.

Bug: 17109858

(cherry picked from commit c597b6dd89)

Change-Id: Ic5f15d1864c6af9f4c4b07dc27244ebbb521ad5e
 2014-08-22 15:33:30 +01:00
Calin Juravle c597b6dd89 Fix validation of system paths in installd. 
System apps are now installed under their own directory
(system_app_dir/app_dir/app.apk). The new path doesn't pass installd
validation because of obsolete checks which verify that the path does
not contain subdirectories past the system_app_dir.

The CL fixes the validation to accept at most on subdirectory.

Bug: 17109858
Change-Id: I13abb52c0016610ff436f6a26bb6b3b85dc4dfb0
 2014-08-22 14:52:53 +01:00
Calin Juravle c542d1141d am 67cfe0c0: Merge "Allow apk path to contain one subdirectory." into lmp-dev 
* commit '67cfe0c0660c36ca385ad0eeb1352a2df721b49c':
  Allow apk path to contain one subdirectory.
 2014-08-22 13:15:53 +00:00
Calin Juravle 9d76156266 Allow apk path to contain one subdirectory. 
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.

Bug: 16888084

(cherry picked from commit fd88ff2edd)

Change-Id: I1002529b0c35852c67540d3165d1444523460592
 2014-08-22 14:04:45 +01:00
Calin Juravle 67cfe0c066 Merge "Allow apk path to contain one subdirectory." into lmp-dev 2014-08-22 12:58:11 +00:00
Colin Cross 368e2eceb7 am 61a4eecb: Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev 
* commit '61a4eecbe615bc94944161c4cf4aa590dfca1b2e':
  atrace: avoid unnecessary writes to trace_clock
 2014-08-21 03:06:23 +00:00
Calin Juravle fd88ff2edd Allow apk path to contain one subdirectory. 
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.

Bug: 16888084
Change-Id: Iba579d075a9c6d7de047e7ffef95441498257086
 2014-08-20 15:37:54 +01:00
Colin Cross b1ce49b2ed atrace: avoid unnecessary writes to trace_clock 
Writing to trace_clock erases the trace buffer, even if the value
hasn't changed.  This prevents use of --async_start and --async_dump
to leave background tracing running and dump after an even that
needs debugging, because --async_dump writes to trace_clock and
resets the buffer before it can read it.

Read and parse the current value from trace_clock before writing,
and skip the write if the value isn't changing.

Change-Id: Ia2ec5bb654fb0bd179771b511ff261731ba47dca
 2014-08-20 14:28:47 -07:00
Colin Cross 7477a8a0a3 am b1f0f288: Merge changes I4cfb3138,I45356c29 into lmp-dev 
* commit 'b1f0f288e30c0448cabd46d19c60b3bd0d272f74':
  atrace: add memory reclaim tracing
  atrace: Add IRQ events
 2014-08-19 01:48:59 +00:00
Colin Cross 580407f107 atrace: add memory reclaim tracing 
Add "memreclaim" to trace direct reclaim, shrink slab cycles, and
kswapd waking up and sleeping.

Change-Id: I4cfb313820a3a9aa5a9d07a39c42db41c24304a6
 2014-08-18 17:48:16 -07:00
Dan Willemsen f440d398fa atrace: Add IRQ events 
Add "irq" to trace irq and softirq events.

Change-Id: I45356c2912a1fa130667ada7b21e9fb54ddcfba5
 2014-08-18 17:47:56 -07:00
Jeff Brown 9612a31003 am c8c5e4c6: Merge "Add trace tag for power management." into lmp-dev 
* commit 'c8c5e4c66b858fc41bdb696421eb13c3ea65a238':
  Add trace tag for power management.
 2014-08-16 03:14:00 +00:00
Jeff Brown c8c5e4c66b Merge "Add trace tag for power management." into lmp-dev 2014-08-15 21:23:40 +00:00
Brian Carlstrom 46ab27e624 am e18987ef: Disable verification based on vold.decrypt. [frameworks/native] 
* commit 'e18987efb5e39ca1bed15527b7b82bde55c99669':
  Disable verification based on vold.decrypt. [frameworks/native]
 2014-08-15 17:20:38 +00:00
Brian Carlstrom e18987efb5 Disable verification based on vold.decrypt. [frameworks/native] 
Bug: 15165413
Change-Id: Ie70bf4e1348b7b8b2454cf9b498b272416d61c34
 2014-08-15 09:57:55 -07:00
Brian Carlstrom f7765c4a17 Disable verification based on vold.decrypt. [frameworks/native] 
Bug: 15165413

(cherry picked from commit e18987efb5)

Change-Id: Ie55ef400c9d1f231b3be64248c756ac798a11ffe
 2014-08-15 10:05:32 -07:00
Jeff Brown 3200b0bf50 Add trace tag for power management. 
Also added a couple of other existing missing tags in atrace.

Bug: 17004602
Change-Id: I6f697a2a15922bd4695acfa203d45eaae40cd00e
 2014-08-14 19:24:47 -07:00
Andreas Gampe f12e678d4b am 1a22eb7b: Merge "Change an accidental ALOGE to an ALOGV" 
* commit '1a22eb7ba1062ed1ee35cdb9d797019699cbce8b':
  Change an accidental ALOGE to an ALOGV
 2014-08-11 20:00:46 +00:00
Andreas Gampe 1a22eb7ba1 Merge "Change an accidental ALOGE to an ALOGV" 2014-08-11 18:01:48 +00:00
Narayan Kamath 93b1b9a42c am 82e98c21: Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup" 
* commit '82e98c21f8606e0de8c6beb4372bc4ae9f52b515':
  Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
 2014-08-11 17:36:11 +00:00
Brian Carlstrom 3b14e5b1f3 Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup 
Bug: 15927194

(cherry picked from commit 0378aaf257)

Change-Id: I462b5ac256c4d091ed4023cf4b97dd6a4abcaa5f
 2014-08-11 18:31:03 +01:00
Alex Light a7915d437c Change an accidental ALOGE to an ALOGV 
Change-Id: If07bcef597dd9e531ce6d92c7780ba6ad5090f9a
 2014-08-11 10:07:02 -07:00
Brian Carlstrom 0378aaf257 Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup 
Bug: 15927194
Change-Id: Id8bc188de68d62fd5f91a99aaaa6c8f2dea06abd
 2014-08-08 22:10:06 -07:00
Brian Carlstrom 41cd9eb424 Disable compilation based on vold.decrypt. [frameworks/native] 
Bug: 15165413

(cherry picked from commit 538998f204)

Change-Id: Idae36efa1cb3fb99b51fa0a79b6bb037981d1c71
 2014-08-06 21:59:35 -07:00
Brian Carlstrom 9a87db6e1f Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native] 
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit cf51ba1360)

Change-Id: I6613c9710878d56ed8c121e0caded76a64430f76
 2014-08-06 21:59:32 -07:00
Alex Light 43c5d30795 Make system use patchoat to relocate during runtime. 
Make installd understand a patchoat directive and carry it out.

Bug: 15358152

(cherry picked from commit 7365a10689)

Change-Id: Id84a15e626ddde63876914068d3d9aa037abc65b
 2014-08-06 16:27:55 -07:00
Brian Carlstrom 021843c78d am 8ce28672: Merge "Make system use patchoat to relocate during runtime." 
* commit '8ce28672106956eeff6d0ed2d1d826ec192e58ee':
  Make system use patchoat to relocate during runtime.
 2014-08-05 21:00:09 +00:00
Alex Light 7365a10689 Make system use patchoat to relocate during runtime. 
Make installd understand a patchoat directive and carry it out.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
 2014-08-05 10:22:10 -07:00
Brian Carlstrom 755d35f5fa am 74b3ecf4: Merge "Disable compilation based on vold.decrypt. [frameworks/native]" 
* commit '74b3ecf485254d8cb4ae2b1d4d5221454738a58d':
  Disable compilation based on vold.decrypt. [frameworks/native]
 2014-08-04 18:37:31 +00:00
Brian Carlstrom 6461ddb4e1 am 9c49e21d: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]" 
* commit '9c49e21d80cb55b7d77fdf118f06b88100141678':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
 2014-08-04 18:37:26 +00:00
Brian Carlstrom 538998f204 Disable compilation based on vold.decrypt. [frameworks/native] 
Bug: 15165413
Change-Id: Ibc39ab82e02e42345c6e2667ac45884f2e0cf7a4
 2014-08-04 11:25:45 -07:00
Lorenzo Colitti d4c3d38957 Improve network connectivity dumping. 
1. Explicitly dump IP addresses.

   Currently, some IP addresses are dumped using netcfg, but that
   only dumps the first IPv4 address on each interface. Instead,
   call ip -4 addr and ip -6 addr explicitly to dump all IPv4 and
   IPv6 addresses on the system.

2. Disable dumping /proc/net/{ipv6,}route, because:

 - We already dump all IPv4 and IPv6 routes in the tables that
   we use.
 - /proc/net/route is confusing because it only includes routes
   in the main table, which are all but unused. It's also in
   unreadable host-byte-order hex.
 - /proc/net/ipv6_route is confusing because it includes routes
   from all tables but does not say what table they are in.

3. Instead of dumping the contents of /proc/net/arp , use
   "ip -4 neigh show" and "ip -6 neigh show" to dump the
   neighbour caches for both IPv4 and IPv6.

Bug: 16663736
Change-Id: Id3e509b877ab7b00eb2399b6a9868b12245da2f0
 2014-07-31 01:56:12 +00:00
Brian Carlstrom cf51ba1360 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native] 
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Iff27dc2904f4f0d7c25a684cd6ba16a597f252fd
 2014-07-30 14:36:35 -07:00
Christopher Ferris 7dc7f3221f Add dumping of tombstones to dumpstate. 
Dump only those tombstones modified within the last half an hour.

Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
 2014-07-23 19:18:07 -07:00
Christopher Ferris 1fe6107b66 Add dumping of tombstones to dumpstate. 
Dump only those tombstones modified within the last half an hour.

Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
 2014-07-23 16:33:01 -07:00
Elliott Hughes d2a049220a Always #include <sys/...>, not <linux/...>. 
(cherry picked from commit 1e4ee9afd2)

Change-Id: Ie005774484f98bb33c8f867cddb778ac04a1d4ea
 2014-07-18 18:19:54 -07:00
Elliott Hughes 119b765a05 Fix implicit declaration of function 'prctl' in installd. 
(cherry picked from commit ec535c5ba5)

Change-Id: I3da977d85ce544b23ff00934fdbd201d683e9210
 2014-07-18 17:30:32 -07:00
Elliott Hughes 1e4ee9afd2 Always #include <sys/...>, not <linux/...>. 
Change-Id: I9a3f574e0dd1d3ba39312254513b8b193b610c09
 2014-07-18 17:54:09 -07:00
Elliott Hughes ec535c5ba5 Fix implicit declaration of function 'prctl' in installd. 
Change-Id: I469ee15a0a8a79d005b15aad5097b6c13c20ab7e
 2014-07-18 17:29:15 -07:00
Colin Cross 0d6180f122 dumpstate: fix dumping traces for vm processes on 64-bit 
dumpstate was not dumping any stack traces for vm processes because
it was failing the string compare for /system/bin/app_process.
64-bit devices use app_process32 and app_process64 instead of
app_process, and zygote64 alongside zygote.  Change the string
matching to be prefix matching.

(cherry picked from commit 8eb25d552b)

Change-Id: I6b1568161fae278f0e6107990e5b750cf0ca902b
 2014-07-17 12:42:14 -07:00
Colin Cross 8eb25d552b dumpstate: fix dumping traces for vm processes on 64-bit 
dumpstate was not dumping any stack traces for vm processes because
it was failing the string compare for /system/bin/app_process.
64-bit devices use app_process32 and app_process64 instead of
app_process, and zygote64 alongside zygote.  Change the string
matching to be prefix matching.

Change-Id: I6970e1b1fedfcd601f8db6af62852422fcb71d59
 2014-07-16 19:03:49 -07:00
Jeff Sharkey c796b681e5 Offer to delete code cache directories. 
Bug: 16187224
Change-Id: Ia860b051a34ffdfb4f6e0ea19f90cb73509c4eee
 2014-07-15 21:49:51 -07:00
Riley Spahn 2a0e40945b Add MAC for remaining service_manager functionality. 
Add SELinux MAC for the list and find functionality
to service_manager. By default the list action uses
the service_manager_type attribute as its target
object.

(cherry picked from commit c67e6307ca)

Change-Id: Iaf14b21346822a6b544091a0f4a9949117934b9a
 2014-07-15 10:11:33 -07:00
Matthew Xie f3381cf1a6 dump bluedroid kernel status do not merge 
Change-Id: I4617f770088f86ceda2caf58bd1fdae81b3e31df
(cherry picked from commit ed3b9a0977)
 2014-07-14 20:53:32 +00:00
Nick Kralevich 652c485467 service_manager: check binder passed lengths 
1) Pass length through to str8 function.
2) Fix implicit function definition warning.
3) Check for NULL from bio_get_string16 functions.

Bug: 15886919
Bug: 15888753

(cherry picked from commit 7d42a3c31b)

Change-Id: I1f826b88826561ea126d811c087ba30623141511
 2014-07-14 10:19:55 -07:00
Riley Spahn c67e6307ca Add MAC for remaining service_manager functionality. 
Add SELinux MAC for the list and find functionality
to service_manager. By default the list action uses
the service_manager_type attribute as its target
object.

Change-Id: I7630f21a9f3232ae3d6d8b9a1119230b40899aef
 2014-07-14 12:35:23 -07:00
Nick Kralevich 7d42a3c31b service_manager: check binder passed lengths 
1) Pass length through to str8 function.
2) Fix implicit function definition warning.
3) Check for NULL from bio_get_string16 functions.

Bug: 15886919
Bug: 15888753
Change-Id: I78a401d55b84f382ab83911be32b8d501998aa82
 2014-07-12 16:34:01 -07:00
Robin Lee 16cec83a66 am 8098af6e: am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'" 
* commit '8098af6ea29e9d28a6314d12963cef3107de9c18':
  Rename 'mkuser' command to 'mkuserconfig'
 2014-07-09 17:36:12 +00:00
Robin Lee 8098af6ea2 am 7c5be65f: Merge "Rename \'mkuser\' command to \'mkuserconfig\'" 
* commit '7c5be65f2819bf0328715bc405483788dd7a81f2':
  Rename 'mkuser' command to 'mkuserconfig'
 2014-07-09 17:31:58 +00:00
Brian Carlstrom fe91d89b4f am d441dbc6: am cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/native]" 
* commit 'd441dbc6436dbf8cb13f0b784c7d16f022b7586e':
  Make dex2oat heap size product configurable [frameworks/native]
 2014-07-09 15:07:38 +00:00
Sreeram Ramachandran c88da7cc21 resolved conflicts for merge of 928e05b1 to master 
Change-Id: I1d1e623a1f95baa4375a87242ce71ea789884649
 2014-07-09 08:05:04 -07:00
Brian Carlstrom d441dbc643 am cbb9d0d7: Merge "Make dex2oat heap size product configurable [frameworks/native]" 
* commit 'cbb9d0d74008e460963a3c3094f654c50a04a295':
  Make dex2oat heap size product configurable [frameworks/native]
 2014-07-09 12:36:58 +00:00
Sreeram Ramachandran 928e05b12b am 0d2bee0c: Merge "Dump all the correct routing tables." 
* commit '0d2bee0c0baec56ec98867d7e044602097525248':
  Dump all the correct routing tables.
 2014-07-09 00:13:15 +00:00
Nick Kralevich 1aa9565ce1 am f9cfae24: Merge "Remove inline access control in service_manager." 
* commit 'f9cfae24123bae199a07bee2dd1c307906c6e6d0':
  Remove inline access control in service_manager.
 2014-07-07 23:09:27 +00:00
Brian Carlstrom cbb9d0d740 Merge "Make dex2oat heap size product configurable [frameworks/native]" 2014-07-07 17:50:18 +00:00
Brian Carlstrom e46a75a0f6 Make dex2oat heap size product configurable [frameworks/native] 
Bug: 15919420
Change-Id: I0e629ff4f7541f0dde7380e0dbc8dab1c13df7bd
 2014-07-08 15:12:07 -07:00
Sreeram Ramachandran 2b3bba34ae Dump all the correct routing tables. 
The list of tables is maintained in /data/misc/net/rt_tables by netd.

Change-Id: I55475c08c5e43bcf61af916210e680c47480ac32
 2014-07-08 16:29:45 -07:00
Robin Lee 7c5be65f28 Merge "Rename 'mkuser' command to 'mkuserconfig'" 2014-07-04 08:02:36 +00:00
Nick Kralevich f9cfae2412 Merge "Remove inline access control in service_manager." 2014-07-02 20:49:53 +00:00
Nick Kralevich 0830ce19ae resolved conflicts for merge of 1aa9565c to master 
Change-Id: I30582926ab2d2e2b97cb95aaedcd54ba51832aba
 2014-07-07 16:27:42 -07:00
Brian Carlstrom 1da16cebe6 am a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size" 
* commit 'a5726eb954588bd27ffa55a5193e7c0f8bd9eac3':
  Use current max product dalvik.vm.heapsize as default dex2oat heap size
 2014-06-27 23:02:11 +00:00
Brian Carlstrom 3aa138617b Use current max product dalvik.vm.heapsize as default dex2oat heap size 
Bug: 15919420
Change-Id: I7ea3bbfe787026f272e50690ab3b84f894600191
 2014-06-27 14:15:19 -07:00
Riley Spahn 1244edcb85 Remove inline access control in service_manager. 
Remove the hardcoded tuples of UIDs and the services that
each is allowed to register. We will rely only on permissions
from SELinux.

Change-Id: I1c44555a6e274814282398865b30ee938f40dabb
 2014-06-26 15:48:21 -07:00
Brian Carlstrom 53e0776d96 Use current max product dalvik.vm.heapsize as default dex2oat heap size 
Bug: 15919420

(cherry picked from commit 3aa138617b)

Change-Id: I569ba111c6163e94dd1b09b21ef374f05d263e72
 2014-06-27 14:19:36 -07:00
Dan Stoza e49ba8e2ed GLConsumer: Stop using default constructor params 
Removes the dependency on default constructor parameters for
GLConsumer so that a different constructor prototype can safely be
added.

Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
 2014-06-24 13:09:19 -07:00
Narayan Kamath b410863d6a am 9bc8c62e: am 357df19b: Merge "Exclude subdirectories when pruning the dex cache." 
* commit '9bc8c62ea4d86d948af7a2aade8b0b5502a84b6a':
  Exclude subdirectories when pruning the dex cache.
 2014-06-24 12:32:45 +00:00
Narayan Kamath 9bc8c62ea4 am 357df19b: Merge "Exclude subdirectories when pruning the dex cache." 
* commit '357df19b14b8387a480ed68dd6ea92eeb1aa4edc':
  Exclude subdirectories when pruning the dex cache.
 2014-06-24 12:13:30 +00:00
Narayan Kamath 357df19b14 Merge "Exclude subdirectories when pruning the dex cache." 2014-06-24 06:22:45 +00:00
Narayan Kamath 1e57e4af8a Exclude subdirectories when pruning the dex cache. 
This requires a companion package manager change to prune
each instruction specific dex cache individually.

bug: 15677279

Change-Id: I5891981512bde20e49bff65b1842c28886f2b177
 2014-06-20 17:46:58 +01:00
Brian Carlstrom 314f2f7751 am 724473b3: am 71f9956a: Merge "Fix obsolete argument name" 
* commit '724473b359d63bf707bd1fe04abdc82edc5fd22d':
  Fix obsolete argument name
 2014-06-17 20:05:05 +00:00
Brian Carlstrom 724473b359 am 71f9956a: Merge "Fix obsolete argument name" 
* commit '71f9956a23885e64626828a1afa8c512e29be8cc':
  Fix obsolete argument name
 2014-06-17 20:00:17 +00:00
Brian Carlstrom 71f9956a23 Merge "Fix obsolete argument name" 2014-06-17 05:00:50 +00:00
Brian Carlstrom 7195fcc218 Fix obsolete argument name 
Change-Id: I8030f055ee49dc86d4592f36791edddfc0d60a31
 2014-06-16 13:28:03 -07:00
Narayan Kamath 24730ee621 am 395a6a64: am 8c9bcff8: Merge "Add an installd command to prune dex files." 
* commit '395a6a642dc3f7c2fe99080bbfcb31a20cb2fba9':
  Add an installd command to prune dex files.
 2014-06-16 13:31:37 +00:00
Narayan Kamath 395a6a642d am 8c9bcff8: Merge "Add an installd command to prune dex files." 
* commit '8c9bcff892ae30897a971c3b97305e70db5b5bd3':
  Add an installd command to prune dex files.
 2014-06-16 13:28:01 +00:00
Nick Kralevich f40c1fe5ae am 3dd3de03: Merge "installd: change profile files to 0660" 
* commit '3dd3de03de17546d785ed2a741fc645c1a0fcad5':
  installd: change profile files to 0660
 2014-06-12 23:12:43 +00:00
Wink Saville e9ecca2758 Merge "Merge kwd to master" 2014-06-12 21:07:47 +00:00
Nick Kralevich 9f12f80d4a am 18c9394c: Merge "Add SELinux checks when adding a service." 
* commit '18c9394ce1a4869eb5cf91eece02a4e944e2eebc':
  Add SELinux checks when adding a service.
 2014-06-12 21:06:37 +00:00
Riley Spahn 69154df9ef Add SELinux checks when adding a service. 
Add a MAC check to the svc_can_register function in
service_manager. The types are defined in
external/sepolicy/service.te and the mapping from service
names is defined in external/sepolicy/service_contexts.
Currently uses the property context backend to parse the
contexts file.

Bug: 12909011
Change-Id: I5d90a614263c60571c7c70c2882e6fa929911ca5
 2014-06-12 20:46:24 +00:00
Wink Saville 653e1cf46a Merge kwd to master 
Change-Id: Idb607c0aa32f80fe4fe1539aedea7a221e9e7f04
 2014-06-11 15:24:52 -07:00
Calin Juravle 14be6fa62e am 17e1d2ca: am 7281ca65: Merge "Pass --top-k-profile-threshold to dex2oat if available." 
* commit '17e1d2ca97a711ab539044912bb985a10ccbc9fd':
  Pass --top-k-profile-threshold to dex2oat if available.
 2014-06-11 21:37:57 +00:00
Calin Juravle 17e1d2ca97 am 7281ca65: Merge "Pass --top-k-profile-threshold to dex2oat if available." 
* commit '7281ca65d00171b846497abca357a005a401e16b':
  Pass --top-k-profile-threshold to dex2oat if available.
 2014-06-11 08:53:49 +00:00
Nick Kralevich 0db0f97d87 installd: change profile files to 0660 
Profiling information leaks data about how people interact
with apps, so we don't want the data to be available
to other apps. Only the app and system_server need access.

Don't create the /data/dalvik-cache/profiles directory. init.rc
does it for us now.

Change-Id: Ic1b44009faa30d704855e97631006c4b990a4ad3
 2014-06-12 14:54:43 -07:00
Narayan Kamath 8c9bcff892 Merge "Add an installd command to prune dex files." 2014-06-10 21:26:11 +00:00
Calin Juravle 7281ca65d0 Merge "Pass --top-k-profile-threshold to dex2oat if available." 2014-06-10 21:26:11 +00:00
Nick Kralevich a3db3622c5 am f40c1fe5: am 3dd3de03: Merge "installd: change profile files to 0660" 
* commit 'f40c1fe5ae6afb9ce1fb179c3b0686d22ca98469':
  installd: change profile files to 0660
 2014-06-12 23:17:36 +00:00
Nick Kralevich f15b30a47c am 9f12f80d: am 18c9394c: Merge "Add SELinux checks when adding a service." 
* commit '9f12f80d4af350789a64f5c30531ce790d9b6ea3':
  Add SELinux checks when adding a service.
 2014-06-12 21:09:29 +00:00
Robin Lee 7c8bec0179 Rename 'mkuser' command to 'mkuserconfig' 
Brings the name more in line with what it actually does.

Change-Id: I0adb14deb1a035abdbe51714356bd0c94ccf04c5
 2014-06-10 18:59:55 +01:00
Narayan Kamath 3aee2c5c74 Add an installd command to prune dex files. 
This is a straightforward port of logic from
PackageManagerService#pruneDexFiles.

bug: 14407732

Change-Id: I892cff027ddcbb1a4fb37a7af5ecf1697049a188
 2014-06-10 15:21:18 +01:00
Calin Juravle 4fdff46166 Pass --top-k-profile-threshold to dex2oat if available. 
Also, don't pass --profile-file if the file is empty.
Bug: 12877748

Change-Id: I587d198e64da709930e2cea50a87fed1525281e5
 2014-06-10 14:33:15 +01:00
Robin Lee 8400b2c6dd am 04eb4227: am c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0" 
* commit '04eb4227b0ee880141d6ffbf170e79b78affea15':
  Migrate keychain directories to /data/misc/user/0
 2014-06-09 14:46:58 +00:00
Robin Lee 04eb4227b0 am c4193f1f: Merge "Migrate keychain directories to /data/misc/user/0" 
* commit 'c4193f1fef52314b451f55cce48ce44f94b875b6':
  Migrate keychain directories to /data/misc/user/0
 2014-06-09 12:51:06 +00:00
Robin Lee c4193f1fef Merge "Migrate keychain directories to /data/misc/user/0" 2014-06-09 12:44:34 +00:00
Calin Juravle 95081df451 am fb617aa8: am 06642342: Merge "Don\'t always add profile-file option to dex2oat" 
* commit 'fb617aa82ad2b6671aa1bc37afa115418cd9091c':
  Don't always add profile-file option to dex2oat
 2014-06-09 10:05:06 +00:00
Calin Juravle fb617aa82a am 06642342: Merge "Don\'t always add profile-file option to dex2oat" 
* commit '066423423f04bf1c5972b1d611e01e2e17df3727':
  Don't always add profile-file option to dex2oat
 2014-06-09 09:56:31 +00:00
Calin Juravle 57c69c3964 Don't always add profile-file option to dex2oat 
Add profile-file option to dex2oat only if the profiler is active and
the file exists.

Bug: 12877748
Bug: 15275634
Change-Id: Icef76514c912c88311ed108f2be7a6329131f741
 2014-06-06 15:13:06 +01:00
wsmlby 80b3d8fce2 Merge "Add dual mode to flatland" 2014-06-05 21:16:47 +00:00
wsmlby 57c9a00616 Add dual mode to flatland 
Change-Id: I3544e12c9c911cfdd73fa20d038068c9eccb4161
 2014-06-05 14:12:41 -07:00
Robin Lee 958ad9181a am 53b49268: am 8adb5a82: Merge "Add installd command to create /data/misc user dir" 
* commit '53b4926828fae0e78b467d49a6084b324bcbdcb7':
  Add installd command to create /data/misc user dir
 2014-06-05 17:56:59 +00:00
Robin Lee 53b4926828 am 8adb5a82: Merge "Add installd command to create /data/misc user dir" 
* commit '8adb5a822d44ed43aa0ec9a8948a7820fdfcd375':
  Add installd command to create /data/misc user dir
 2014-06-05 17:53:31 +00:00
Robin Lee 07053fcb61 Migrate keychain directories to /data/misc/user/0 
With new CA certificates being stored in /data/misc/user/<userid>/
existing ones need to be moved into the same place.

After this update only the owner user will have custom trusted CAs; all
other users will revert to the default set.

Change-Id: I14a4cd6048685902ad5dd3b53494b03fadc41c04
 2014-06-05 17:35:50 +00:00
Robin Lee 095c763dd9 Add installd command to create /data/misc user dir 
New command 'mkuser <id>' sets up a user directory in /data/misc/user/,
readable by all apps within that user and writeable by the local system
process.

Change-Id: I5ddde8c4a80f606e723bb41aa64581a0720842d5
 2014-06-05 14:34:15 +00:00
Eric Laurent 9882be8960 add sound trigger native service 
Change-Id: I5d6fe1ecacca3a941317f841009322bafdf6adcd
 2014-06-03 08:20:07 -07:00
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