Commit graph

10233 commits

Author SHA1 Message Date
Tim Murray
b2e13ae4fe am 3a5f3db2: am c894ced1: Merge "Fix fastboot for Darwin."
* commit '3a5f3db2aa5324518eb71c69cd1fb3e2125cbd43':
  Fix fastboot for Darwin.
2014-07-25 02:38:02 +00:00
Tim Murray
3a5f3db2aa am c894ced1: Merge "Fix fastboot for Darwin."
* commit 'c894ced1837117aa3e2dfae702ef51c35b5d74d9':
  Fix fastboot for Darwin.
2014-07-25 02:33:43 +00:00
Tim Murray
2cc4fd73d1 am 6ebaf311: am 721f189a: Merge "fix adb build on Darwin"
* commit '6ebaf311a7af8d20979deba279f9d5096ed8f193':
  fix adb build on Darwin
2014-07-25 02:24:29 +00:00
Elliott Hughes
49c719e144 am 6a223baf: am 52508091: Merge "Silence healthd warnings."
* commit '6a223baf956168893d4b7412852c6836efa4a6ff':
  Silence healthd warnings.
2014-07-25 02:24:29 +00:00
Tim Murray
f505dae2d5 am f2879ef6: am 6698ebf9: Merge "Fix Darwin build caused by -Wunused-parameter."
* commit 'f2879ef61453c845e2f675011e0cbc41d1396040':
  Fix Darwin build caused by -Wunused-parameter.
2014-07-25 02:24:28 +00:00
Tim Murray
6ebaf311a7 am 721f189a: Merge "fix adb build on Darwin"
* commit '721f189a0571ab51388c8a223f343f3da78f28df':
  fix adb build on Darwin
2014-07-25 02:20:30 +00:00
Elliott Hughes
6a223baf95 am 52508091: Merge "Silence healthd warnings."
* commit '525080910efd55df0d562980b6139c0efcc8a47c':
  Silence healthd warnings.
2014-07-25 02:20:29 +00:00
Tim Murray
f2879ef614 am 6698ebf9: Merge "Fix Darwin build caused by -Wunused-parameter."
* commit '6698ebf92857b7a390264b36603c57ae639b43a2':
  Fix Darwin build caused by -Wunused-parameter.
2014-07-25 02:20:28 +00:00
Elliott Hughes
7cd7285b85 am d8c3038b: am d629c789: Merge "Remove <cutils/tztime.h>."
* commit 'd8c3038b5036d3f95781d3eab728758fff61c54a':
  Remove <cutils/tztime.h>.
2014-07-25 01:03:46 +00:00
Mark Salyzyn
ea1a648c1c am 914e36b9: am 74ee1c05: Merge "logcat: test: logrotate flags"
* commit '914e36b919a9b288d93dc50255ffd702a912183b':
  logcat: test: logrotate flags
2014-07-25 01:03:34 +00:00
Tim Murray
650f43d0d5 am 83ddddaa: am 4795ce06: Merge "Update makefiles for host clang."
* commit '83ddddaaba0fea8a1c0dcc64e795112bed67815f':
  Update makefiles for host clang.
2014-07-25 01:03:31 +00:00
Elliott Hughes
d7c28d467b am 2befa73f: Remove <cutils/tztime.h>.
* commit '2befa73f680c8340e5581aa3ef68281f7223e6e4':
  Remove <cutils/tztime.h>.
2014-07-24 23:37:12 +00:00
Mark Salyzyn
703ccc91af am d5c41746: logcat: test: logrotate flags
* commit 'd5c417469b4cc4fb42d090350ad8209de6e70512':
  logcat: test: logrotate flags
2014-07-24 23:36:21 +00:00
Marcus Oakland
3b47c07837 am e43b99a0: Correction to TRACE format strings
* commit 'e43b99a0741dd481aacf76c3dc0f5102864a6857':
  Correction to TRACE format strings
2014-07-24 23:33:58 +00:00
Elliott Hughes
d8c3038b50 am d629c789: Merge "Remove <cutils/tztime.h>."
* commit 'd629c7892fca6a085ad1aebc9d8ac74092f7a2a5':
  Remove <cutils/tztime.h>.
2014-07-24 23:18:34 +00:00
Elliott Hughes
2befa73f68 Remove <cutils/tztime.h>.
(cherry picked from commit f2e4b411e6)

Bug: 15765976
Change-Id: I758acdb18d75ea601a06d02b53f1df9f1ad17a26
2014-07-24 16:16:59 -07: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
Tim Murray
1efcdeffe5 fix adb build on Darwin
bug 16172793

Change-Id: Ia34b7148afc4c909f29037df91c04d6fd29a731e
2014-07-24 18:33:12 -07:00
Mark Salyzyn
d5c417469b logcat: test: logrotate flags
- test -f -n and -r flags
- fix issue with parse error for sizes in bytes (no multiplier)

(cherry pick from d03caa23dd)

Bug: 16147190
Change-Id: Iadf2fd903d5e881d02f1d2b491441cc8090ee1c9
2014-07-24 22:20:51 +00:00
Mark Salyzyn
914e36b919 am 74ee1c05: Merge "logcat: test: logrotate flags"
* commit '74ee1c05d4f942d5cf45c9fcbb6f0d6444fb1db6':
  logcat: test: logrotate flags
2014-07-24 22:19:11 +00: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
Tim Murray
83ddddaaba am 4795ce06: Merge "Update makefiles for host clang."
* commit '4795ce066024c7ab235cb0c6bb229b0b6d9e5878':
  Update makefiles for host clang.
2014-07-24 21:04:24 +00:00
Tim Murray
721f189a05 Merge "fix adb build on Darwin" 2014-07-24 20:55:36 +00:00
Tim Murray
4795ce0660 Merge "Update makefiles for host clang." 2014-07-24 20:55:36 +00:00
Nick Kralevich
d753da344e am c70ebca4: am 6bc762b2: Merge "Add SELinux MAC to debuggerd."
* commit 'c70ebca44cc37b0d261736446ccf52bbdb61e7d1':
  Add SELinux MAC to debuggerd.
2014-07-24 20:31:11 +00:00
Nick Kralevich
c70ebca44c am 6bc762b2: Merge "Add SELinux MAC to debuggerd."
* commit '6bc762b2a10bb13396f7e27d01d9ac7e8f725fbf':
  Add SELinux MAC to debuggerd.
2014-07-24 20:27:55 +00:00
Tim Murray
06fce9db05 Update makefiles for host clang.
bug 16172793

Change-Id: If7484c5dbcccce7d925bec97bff0a3e4c30e9434
2014-07-24 12:18:22 -07:00
Elliott Hughes
e5e9aea01f am 98e5f968: am bf300e1e: Merge "Correction to TRACE format strings"
* commit '98e5f96842c14c378a4a46588b7311b9398f5314':
  Correction to TRACE format strings
2014-07-24 18:58:22 +00:00
Elliott Hughes
98e5f96842 am bf300e1e: Merge "Correction to TRACE format strings"
* commit 'bf300e1e04726528bf2fefac89e5e73aaff1d68e':
  Correction to TRACE format strings
2014-07-24 18:53:21 +00:00
Marcus Oakland
e43b99a074 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.

Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>

(cherry picked from commit d33308752f)

Change-Id: I550b422a6b7c92ea903b4dd8f5e4aec5637cdf67
2014-07-24 11:51:54 -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
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
Sreeram Ramachandran
9334ba79c0 am e5ab3e3a: Add a comment to not delete seemingly unused code.
* commit 'e5ab3e3a4c23077ede0515320c5585a99b236671':
  Add a comment to not delete seemingly unused code.
2014-07-23 19:10:06 +00: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
Sreeram Ramachandran
e5ab3e3a4c Add a comment to not delete seemingly unused code.
Change-Id: I5b9d23eea7e850ab5a1f3a4e6c4f8ecdc3844864
2014-07-23 11:33:36 -07: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
Sreeram Ramachandran
e587093e10 am eec23260: Put back some deleted code.
* commit 'eec232603d314e486888e5a0d2dd8d507c266be7':
  Put back some deleted code.
2014-07-23 16:46:10 +00:00
Sreeram Ramachandran
eec232603d Put back some deleted code.
http://ag/507249 removed a bunch of supposedly dead (unused) code. It turns out
at least ifc_disable() is being used in some protected partner branches. Put
back that as well as ifc_enable() to keep it symmetric.

Bug: 15413389
Change-Id: Ibec83a66e5d9079876ccf36d250b95b7c0294c03
2014-07-23 09:30:53 -07:00
Sreeram Ramachandran
f2af027d5b am 759356bb: Merge "Cleanup: Delete dead code." into lmp-dev
* commit '759356bbd889d780a57c51c19761b32cbba8e6ef':
  Cleanup: Delete dead code.
2014-07-22 23:57:30 +00:00
Sreeram Ramachandran
17f675791a am 435fe9bb: Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGE
* commit '435fe9bb02f250c5bc617462d82f718b67207774':
  Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGE
2014-07-22 23:11:29 +00:00
Sreeram Ramachandran
435fe9bb02 Stop and start netd explicitly for "adb shell stop/start". DO NOT MERGE
netd is supposed to be restarted when the zygote is restarted (see the
"onrestart" section for "service zygote" in init.zygote*.rc). But this
only works if you send a restart command (say via "ctl.restart").

"stop && start" != "restart". It seems ingrained in developers to do
"stop && start", so we don't have much hope of convincing everyone to
switch to "adb shell restart", even if we did add such a toolbox command.

(cherry picked from commit 018c6a57f3)

Bug: 15855807
Change-Id: I387fe86600f4a2862abc3a05a2ef9a1e7374e21d
2014-07-22 22:43:42 +00:00
Elliott Hughes
24d89c36fb am 930d53ea: Switch to NetBSD\'s kill(1).
* commit '930d53eae6a12b3b11c7d0043ec8c7674b1047cc':
  Switch to NetBSD's kill(1).
2014-07-22 21:46:33 +00:00