Commit graph

7398 commits

Author SHA1 Message Date
Nick Kralevich
349f894e52 Merge "don't load property_contexts from /data" 2014-01-19 18:29:01 +00:00
Christopher Ferris
10c51a3875 am f95d880f: am 884116c8: am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"
* commit 'f95d880fe7e9a8860038a5c8391b89cfbeb0ce76':
  Attempt to fix Mac build
2014-01-18 23:56:34 +00:00
Christopher Ferris
f95d880fe7 am 884116c8: am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"
* commit '884116c84aecd9d6685398e2735d6422909bb104':
  Attempt to fix Mac build
2014-01-18 23:54:03 +00:00
Christopher Ferris
884116c84a am 719b0198: am 1db584b8: Merge "Attempt to fix Mac build"
* commit '719b0198a324582cbf2c01236bb03746475a52e0':
  Attempt to fix Mac build
2014-01-18 23:52:11 +00:00
Christopher Ferris
719b0198a3 am 1db584b8: Merge "Attempt to fix Mac build"
* commit '1db584b899dffca884c3842c07da189f7c9af470':
  Attempt to fix Mac build
2014-01-18 15:50:37 -08:00
Christopher Ferris
1db584b899 Merge "Attempt to fix Mac build" 2014-01-18 23:47:21 +00:00
Nick Kralevich
dc3a42bb11 don't load property_contexts from /data
Bug: 12613118
Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13
2014-01-18 15:28:11 -08:00
Brian Carlstrom
db5911a08a Attempt to fix Mac build
Change-Id: I1364255bfed7788a35531962508bad804b8d5b7f
2014-01-18 13:55:54 -08:00
Nick Kralevich
f7ce02d3e4 am eb665350: am 55537633: am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""
* commit 'eb665350d13d36f8974da332674adf5df58859f3':
  Fix "adb push /sdcard/filename"
2014-01-18 01:14:36 +00:00
Nick Kralevich
eb665350d1 am 55537633: am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""
* commit '555376331f436fb519c182677c22d8299ead5523':
  Fix "adb push /sdcard/filename"
2014-01-18 01:12:08 +00:00
Nick Kralevich
555376331f am 78af6c4c: am 0a72d293: Merge "Fix "adb push /sdcard/filename""
* commit '78af6c4c946fec01b232c92d40eb6fd202490e3e':
  Fix "adb push /sdcard/filename"
2014-01-18 01:08:47 +00:00
Nick Kralevich
78af6c4c94 am 0a72d293: Merge "Fix "adb push /sdcard/filename""
* commit '0a72d2930adcd3b3504448f71b25ebb88c2cc3cf':
  Fix "adb push /sdcard/filename"
2014-01-17 17:05:19 -08:00
Nick Kralevich
0a72d2930a Merge "Fix "adb push /sdcard/filename"" 2014-01-18 01:01:11 +00:00
Nick Kralevich
72917837e6 Fix "adb push /sdcard/filename"
Don't assume that calling chown(filename, getuid(), getgid())
will always succeed. In the case of /sdcard, a file you create
will be owned by root, so the chown call will fail.

Instead, use uid=gid=-1 so that the chown call is truly a no-op.

Ignore the results of calling chmod. Again, for /sdcard, the
chmod call will never succeed, because the file isn't owned by
the shell user.

Bug: 12441485
Change-Id: I11eaf1d6f6049c1158afc29754fbb7af2baf2c78
2014-01-17 16:16:42 -08:00
Elliott Hughes
5dbb002217 am 1571dac4: am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."
* commit '1571dac49fee8d7304a082a787aed15520ed48b4':
  Fix 'r' for LP64.
2014-01-17 20:11:24 +00:00
Christopher Ferris
64ca5ade85 am 758c8636: am 6ecdff5b: am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."
* commit '758c8636c6804f67db0b05617ff37f0a0d0ba859':
  Add PROT_* constants not found on windows.
2014-01-17 20:11:23 +00:00
Christopher Ferris
6c625f6717 resolved conflicts for merge of 47fa9064 to master
Change-Id: I53fb8ff2dfbefe6246385e624c5c3525cc6f4253
2014-01-17 11:56:04 -08:00
Elliott Hughes
1571dac49f am 1b37794b: am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."
* commit '1b37794b07212ef32c2930937445f9cad212ac63':
  Fix 'r' for LP64.
2014-01-17 19:26:17 +00:00
Christopher Ferris
758c8636c6 am 6ecdff5b: am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."
* commit '6ecdff5baeb8102438c7f91cd2297b8feaaa5081':
  Add PROT_* constants not found on windows.
2014-01-17 19:26:16 +00:00
Christopher Ferris
47fa90641e am 0cf5d96c: am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
* commit '0cf5d96c43a11e150941202961bcedcbce9bb294':
  Rewrite libbacktrace to be all C++.
2014-01-17 19:26:16 +00:00
Elliott Hughes
1b37794b07 am f62b602f: am 6192eedb: Merge "Fix \'r\' for LP64."
* commit 'f62b602f452ab9e1f97be2a61f3c26ece12506db':
  Fix 'r' for LP64.
2014-01-17 19:22:59 +00:00
Christopher Ferris
6ecdff5bae am f7adcfc8: am 17b9c827: Merge "Add PROT_* constants not found on windows."
* commit 'f7adcfc8bdd855e424b9970da444843920d8dde5':
  Add PROT_* constants not found on windows.
2014-01-17 19:22:59 +00:00
Christopher Ferris
0cf5d96c43 am 237fdb4a: am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
* commit '237fdb4a95aeb94ad040a737c6fa22d84d05d633':
  Rewrite libbacktrace to be all C++.
2014-01-17 19:22:58 +00:00
Elliott Hughes
f62b602f45 am 6192eedb: Merge "Fix \'r\' for LP64."
* commit '6192eedb43bfa949569850b5cf4a6550b2c62f08':
  Fix 'r' for LP64.
2014-01-17 11:19:49 -08:00
Christopher Ferris
f7adcfc8bd am 17b9c827: Merge "Add PROT_* constants not found on windows."
* commit '17b9c82765a325d88fc2e8920f9df3155c5773e2':
  Add PROT_* constants not found on windows.
2014-01-17 11:19:48 -08:00
Christopher Ferris
237fdb4a95 am eb8d73b6: Merge "Rewrite libbacktrace to be all C++."
* commit 'eb8d73b675d8d9613310b5d5e5865571b98d6f78':
  Rewrite libbacktrace to be all C++.
2014-01-17 11:19:48 -08:00
Elliott Hughes
6192eedb43 Merge "Fix 'r' for LP64." 2014-01-17 18:03:40 +00:00
Elliott Hughes
2430a064bd Fix 'r' for LP64.
Change-Id: I8332a0a8045a70b3992fe34b0b9e334a721265a9
2014-01-17 09:50:56 -08:00
Christopher Ferris
17b9c82765 Merge "Add PROT_* constants not found on windows." 2014-01-17 16:26:37 +00:00
Christopher Ferris
0dbce4564b Add PROT_* constants not found on windows.
Change-Id: Ic515363ed66dfb2d8e1a6fdfa274508b3a91311d
2014-01-17 08:25:26 -08:00
Christopher Ferris
eb8d73b675 Merge "Rewrite libbacktrace to be all C++." 2014-01-17 15:07:18 +00:00
Mark Salyzyn
c176e14ce3 liblog: support struct logger_event_v2 format
Change-Id: I34c96adffab3478dae8f5a2597a840caad5092cc
2014-01-16 18:13:59 -08:00
Mark Salyzyn
b69e092dc7 liblog: update timestamp on NOTICE file
Change-Id: I776509232aaa50e14fe79e45ab133c0ea3985933
2014-01-16 18:13:59 -08:00
Mark Salyzyn
407038cd93 libcutils: resolve warning in iosched_policy.c
Change-Id: I35b0d1eeba21cc1ed9645a5acfa180ed20797c56
2014-01-16 18:13:59 -08:00
Mark Salyzyn
9e03ce45f9 liblog: Add const pedantics
Change-Id: I819695b778ac08fcfc9b1a87f3f86e5715f53084
2014-01-16 18:04:57 -08:00
Mark Salyzyn
de02546e3d logcat: Add -T flag (-t w/o assumption of -d)
Change-Id: I49763e2db83755e0b7b12dfa3f83a3957c54d389
2014-01-16 18:04:48 -08:00
Mark Salyzyn
97b0795104 Merge "logcat: Add logcat test suite" 2014-01-17 01:55:32 +00:00
Mark Salyzyn
d3f99fbd06 Merge "liblog: Add cpu utilization test" 2014-01-17 01:52:04 +00:00
Mark Salyzyn
2b8579e769 Merge "liblog: Add liblog test suite" 2014-01-17 01:51:29 +00:00
Mark Salyzyn
0f47b5ed82 Merge "debuggerd: Support newline split in log messages" 2014-01-17 01:50:48 +00:00
Mark Salyzyn
e44830e533 Merge "liblog: deprecate export LOGGER ioctl definitions" 2014-01-17 01:48:59 +00:00
Elliott Hughes
3215ed4228 am b1091958: am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
* commit 'b1091958bdb4bc42f66631fdf4105cbc2faec98a':
  Remove obsolete 'setconsole' command.
2014-01-17 01:06:44 +00:00
Christopher Ferris
46756821c4 Rewrite libbacktrace to be all C++.
This includes removing the map_info.c source and replacing it with the
BacktraceMap class to handle all map related code.

Change all callers of libbacktrace map functionality.

Also modify the corkscrew thread code so that it doesn't need to build
the map twice (once in the corkscrew format and once in the libbacktrace
format).

Change-Id: I32865a39f83a3dd6f958fc03c2759ba47d12382e
2014-01-16 16:12:29 -08:00
Mark Salyzyn
2807db9a26 logcat: Add logcat test suite
Change-Id: Ic4c84b88b8d899965c9765bdc3ee223ef73ba7d1
2014-01-16 16:08:32 -08:00
Elliott Hughes
b1091958bd am 320f2940: am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
* commit '320f2940239c405889baa3c5184beb1d8971837d':
  Remove obsolete 'setconsole' command.
2014-01-17 00:06:11 +00:00
Mark Salyzyn
edadb2e719 liblog: Add cpu utilization test
- followup to measure CPU utilization in liblog to
  ensure this issue gets caught before a regression
  passes into the labs. Threshold for failure is 1%.

BUG: 12457855
Change-Id: I40568a72aeef2f554b19ad55f3dd3c02bc023f24
2014-01-16 16:05:15 -08:00
Mark Salyzyn
8d1fdb5093 liblog: Add liblog test suite
Change-Id: Ia457d518b4e7ff37e840336ff0c48583709700d4
2014-01-16 16:04:17 -08:00
Elliott Hughes
320f294023 am e20b5f71: am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
* commit 'e20b5f71c01d912a5ce6aa4140e6e35edae8f4df':
  Remove obsolete 'setconsole' command.
2014-01-17 00:03:26 +00:00
Elliott Hughes
e20b5f71c0 am 524b3a0c: Merge "Remove obsolete \'setconsole\' command."
* commit '524b3a0c40fcca4b2259f317b2d098434998ce47':
  Remove obsolete 'setconsole' command.
2014-01-16 16:00:58 -08:00
Elliott Hughes
524b3a0c40 Merge "Remove obsolete 'setconsole' command." 2014-01-16 23:55:50 +00:00