Commit Graph

8388 Commits

Author SHA1 Message Date
Elliott Hughes 56b28f6b2c Merge "RefBase: make Renamer destructor virtual" 2014-08-05 00:30:25 +00:00
Elliott Hughes d24240fb4f Merge "Fixed the pacing logic in bootchart data collection." 2014-08-06 17:15:22 +00:00
Ukri Niemimuukko 00e56a248d RefBase: make Renamer destructor virtual
This patch makes the Renamer class destructor virtual and fixes
the incorrect constructor initialization list ordering.

These issues and related compiler warnings have been suppressed
by the build system which uses the gcc –isystem command
line option, unless a project explicitly adds the include the path
system/core/include to Android.mk and uses the templates.

Change-Id: Iff76a655eb8bd547adfe994c7315a005e98aed41
Signed-off-by: Ukri Niemimuukko <ukri.niemimuukko@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
2014-08-06 00:12:06 -07:00
Elliott Hughes 29c5a78fdc Merge "Fix build of adb with gcc-4.9." 2014-08-05 00:30:25 +00:00
Alexander Ivchenko 5372333885 Fix build of adb with gcc-4.9.
Without this patch we get:

system/core/adb/commandline.c:1629:16: error: array subscript is above
array bounds [-Werror=array-bounds]

Change-Id: I494eb8b4d0e8082f8ff57bdd33d8d46c8c481c6f
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
2014-08-06 16:07:17 +04:00
Duane Sand 734f50c2fe [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
Temporarily use generic C-coded libpixelflinger & memset on mips32r6.

Change-Id: I629b11ba955eaba323cba1df96c39f75f4d24d62
2014-07-31 16:21:16 -07:00
Elliott Hughes 39a8ade7ee Merge "Fix sdcard truncates." 2014-07-30 23:37:06 +00:00
Elliott Hughes 853574ddc7 Fix sdcard truncates.
Use truncate64 instead of truncate so we don't truncate (ho ho) the offset.

(cherrypick of 4568565e85bf2e1ea11b2e09d72e244088c05dbc.)

Bug: https://code.google.com/p/android/issues/detail?id=74039
Change-Id: I63711ccd299e3ebc475563b1999817d1919571ab
2014-07-31 12:20:14 -07:00
Bo (Andover) Zhang 3700373c67 Fixed the pacing logic in bootchart data collection.
Ideally bootchart collects system data every BOOTCHART_POLLING_MS ms.
However, the current bootchart pacing logic would collect data every
time the main loop in init.c is executed. This results in:

1. Multiple data samples being taken consecutively or prematurely. In
many cases, these data samples have the same timestamp (in jiffies).
The off-line data processing tool would complain about dividing by
zero "interval" and bail out.

2. Because of the ineffective pacing, bootchart data collection would
terminate prematurely. The total duration of data collection is usually
much shorter than what the user specifies.

The fix is to check whether BOOTCHART_POLLING_MS ms has elapsed
before taking a new data sample. For this purpose, /proc/uptime
is used to get the time values, consistent with the precision of
bootchart timestamps.

Change-Id: I106bf91dbda01059b719df6c73b8bd1cd54a64f0
Signed-off-by: Bo (Andover) Zhang <zhang@broadcom.com>
2014-07-29 21:09:01 -04:00
Mark Salyzyn cddc97cb3a Merge "debuggerd: tombstone: suppress logger request for logd process" 2014-07-29 22:52:28 +00:00
Dmitriy Ivanov e7ec28bba7 Merge "Exclude bionic private headers from include path" 2014-07-29 17:36:25 +00:00
Dmitriy Ivanov 9516139c03 Exclude bionic private headers from include path
Change-Id: I8b1269a739a690af91c63fa0f7f8f01d2d43bb97
2014-07-31 10:21:00 -07:00
Mark Salyzyn 45ae446cab debuggerd: tombstone: suppress logger request for logd process
Change-Id: I619880342ee6febd1a6cc98d2a4f536120efc1c8
2014-07-28 15:16:05 -07:00
Simon Ye dc22c3c7a8 Move host 'get-state' service up so that it works.
Due to previous bad merge, the get-state service was moved out of the
ADB_HOST #ifdef block.

Change-Id: Id4b72a051ff04104659925e63a02eb340db2f807
2014-07-28 11:44:46 -07:00
Elliott Hughes 47a123895b Merge "Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break." 2014-07-25 21:16:27 +00:00
Elliott Hughes d235288553 Fix adb "ptsname is not thread-safe; use ptsname_r instead" build break.
Change-Id: I633dc4d6d421862473e7267cc0d2c1b0933392e0
2014-07-29 11:32:16 -07:00
Elliott Hughes f630473387 Merge "Fix "ptsname is not thread-safe; use ptsname_r instead" build break." 2014-07-28 22:45:44 +00:00
Elliott Hughes 84cfd1092d Fix "ptsname is not thread-safe; use ptsname_r instead" build break.
Change-Id: I8fdca8e85056e99e943bdcf93a48574d76addcdc
2014-07-29 11:06:53 -07:00
Elliott Hughes bce3c0c7bd Merge "Clarify init's write command." 2014-07-24 20:55:36 +00:00
Elliott Hughes afc08ce392 Clarify init's write command.
Bug: https://code.google.com/p/android/issues/detail?id=73996
Change-Id: I4f8d3927d17a4021a2436c2859aa732479c5a118
2014-07-25 14:57:47 -07:00
Tim Murray 721f189a05 Merge "fix adb build on Darwin" 2014-07-24 20:55:36 +00:00
Tim Murray 1efcdeffe5 fix adb build on Darwin
bug 16172793

Change-Id: Ia34b7148afc4c909f29037df91c04d6fd29a731e
2014-07-24 18:33:12 -07:00
Elliott Hughes 525080910e Merge "Silence healthd warnings." 2014-07-23 22:55:49 +00:00
Elliott Hughes 82044f843c Silence healthd warnings.
Change-Id: I339cf62ce93cb268e00ba26f1c310d0586899476
2014-07-24 17:19:46 -07:00
Tim Murray 6698ebf928 Merge "Fix Darwin build caused by -Wunused-parameter." 2014-07-24 22:07:52 +00:00
Tim Murray b37009fa77 Fix Darwin build caused by -Wunused-parameter.
bug 16172793

Change-Id: I1d0514c00085cb5d18ebdd064e96885d6eaa1e59
2014-07-24 17:22:09 -07:00
Elliott Hughes d629c7892f Merge "Remove <cutils/tztime.h>." 2014-07-23 22:55:49 +00:00
Elliott Hughes f2e4b411e6 Remove <cutils/tztime.h>.
Change-Id: I043c6686361bda9e85b82408511bf241a42b9229
2014-07-24 16:13:39 -07:00
Mark Salyzyn 74ee1c05d4 Merge "logcat: test: logrotate flags" 2014-07-23 22:55:49 +00:00
Mark Salyzyn d03caa23dd logcat: test: logrotate flags
- test -f -n and -r flags
- fix issue with parse error for sizes in bytes (no multiplier)

Bug: 16147190
Change-Id: Iadf2fd903d5e881d02f1d2b491441cc8090ee1c9
2014-07-24 22:14:11 +00:00
Tim Murray 4795ce0660 Merge "Update makefiles for host clang." 2014-07-24 20:55:36 +00:00
Tim Murray 06fce9db05 Update makefiles for host clang.
bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-24 12:18:22 -07:00
Nick Kralevich 6bc762b2a1 Merge "Add SELinux MAC to debuggerd." 2014-07-23 18:45:08 +00:00
Stephen Smalley 69b800391c Add SELinux MAC to debuggerd.
debuggerd allows uid-0 processes to dump tombstones or backtraces
of any process, and uid-system processes to dump backtraces of any
processes.  Restrict these operations via SELinux based on the
client context, the target process context, and the action.

Depends on I8e120d319512ff207ed22ed87cde4e0432a13dda for the
corresponding policy definitions.

Change-Id: Ib317564e54e07cc21f259e75124b762ad17c6e16
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-07-24 16:01:56 -04:00
Elliott Hughes bf300e1e04 Merge "Correction to TRACE format strings" 2014-07-23 18:04:01 +00:00
Marcus Oakland d33308752f Correction to TRACE format strings
When built with "#define FUSE_TRACE 1" numerous TRACE statements
failed to compile because of mismatches between format strings and
types (uint64_t and size_t). These have been corrected by using the
format strings from the inttype.h header file, or %zu.

Change-Id: I36cd6f8da0790f1218d7dbaaa5b3bbfa4df7fdee
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-07-24 11:30:19 -07:00
Elliott Hughes c9343cfe40 Merge "Refresh toolbox." 2014-07-23 17:53:27 +00:00
Elliott Hughes fd4c6b0a3a Refresh toolbox.
Use more upstream NetBSD, and update those things that were already NetBSD.

Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have
changes marked by __ANDROID__.

Bug: 16493461
Change-Id: I99762bfe02caa0945ea4a184670888a4b5435a1d
2014-07-24 17:20:51 -07:00
Nick Kralevich 66083ae834 Merge "sdcard: ensure installd fs upgrade has completed" 2014-07-24 20:55:36 +00:00
Nick Kralevich 506edb5f7c sdcard: ensure installd fs upgrade has completed
Before running the sdcard daemon, make sure that installd has
completed all upgrades to /data that it needs to complete.
This avoids race conditions between installd and the sdcard daemon.

Maybe fixes bug 16329437.

(cherrypicked from commit 8d28fa71fc)

Bug: 16329437
Change-Id: I5e164f08009c1036469f8734ec07cbae9c5e262b
2014-07-25 09:44:29 -07:00
Neil Fuller e91d9d80d1 Merge "Prevent the accidental closure of fd[0] for missing zip files." 2014-07-23 19:33:25 +00:00
Neil Fuller b1a113f618 Prevent the accidental closure of fd[0] for missing zip files.
Bug: 16530747
Change-Id: I3593f2bc4d56a2f91252ea795c90ce3c78e1ec06
2014-07-25 16:06:20 +01:00
Colin Cross 8d9d362b0c Merge "adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC." 2014-07-25 00:30:15 +00:00
DanielMo 43222b3f0a adb: Add USB vendor ID for SONIM TECHNOLOGIES, INC.
Change-Id: Id66997709fec55b1efd389abf2efa644b9a8ccf4
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-07-25 11:17:55 +08:00
Tim Murray c894ced183 Merge "Fix fastboot for Darwin." 2014-07-24 22:43:23 +00:00
Tim Murray bd87944805 Fix fastboot for Darwin.
bug 16172793

Change-Id: Ib58446effc13a6e465d176da141b025d36841b8f
2014-07-24 19:27:37 -07:00
Stephen Hines 73290cd136 Merge "Remove invalid 64-bit host objects." 2014-07-22 16:35:00 +00:00
Stephen Hines 03cc1f747c Remove invalid 64-bit host objects.
Bug: 16408818

These targets are no longer in use, since we have a proper way to create both
32-bit and 64-bit host libraries in a single build now.

Change-Id: Icd09f795acd220de5b5e956a8d8e1b4ab4864fa9
2014-07-22 13:36:16 -07:00
Elliott Hughes 2fd1fec619 Merge "Switch to NetBSD's kill(1)." 2014-07-22 16:25:43 +00:00
Elliott Hughes 5054c0db70 Switch to NetBSD's kill(1).
Change-Id: Idd1635673e01758b5a7d34f1fdfbb695296c6164
2014-07-22 10:46:15 -07:00