Commit graph

8008 commits

Author SHA1 Message Date
Hong-Mei Li
88f7683d9c libcutils: fix rw FS remount check issue
In some condition, some of FS would set disable_roll_forward option.
In this case, when we do power off or reboot, the power down progress
would stuck at android_reboot for 360 sec.
The reason is, remount_ro_done function check key word "rw" to determine
whether all the read-write FS has been remounted as read-only FS.
Unfortunately, it takes disable_roll_forward as a rw flag too by
mistake, so the check would always fail, until reach 360 sec threshold.

The patch would match "rw," from mount options, this can avoid the issue
successfully.

Change-Id: I409f9dc88c9ee5cf049615ea9dcccaf195b6bc5a
Signed-off-by: Hong-Mei Li <a21834@motorola.com>
2014-06-02 22:45:37 -07:00
Mark Salyzyn
5bed803664 libutils: turn on -Werror
- Deal with some -Wunused issues
- Override PRI macros (windows)
- Revert use of PRI macros on off64_t (linux)
- Deal with a gnu++11 complaince issue

Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
2014-06-02 15:57:50 -07:00
Mark Salyzyn
00d7097963 am bf0f2590: Merge "liblog: cache getuid() syscall"
* commit 'bf0f25905b12581f05b65b1ebe95211c727ae483':
  liblog: cache getuid() syscall
2014-06-02 20:11:56 +00:00
Mark Salyzyn
bf0f25905b Merge "liblog: cache getuid() syscall" 2014-06-02 20:09:19 +00:00
Mark Salyzyn
076ba81ce9 liblog: cache getuid() syscall
BUG: 15315766
Change-Id: I8f889a1c6ede74f2621f1b8ea5fda666c4b9cba2
2014-06-02 12:33:57 -07:00
Nick Kralevich
6fb92bd84b am 252b0e2b: Merge "SELinux changes to check policy versions during a reload."
* commit '252b0e2b46e3d5e71a8b5c55928dc9ca62811f0a':
  SELinux changes to check policy versions during a reload.
2014-05-31 05:05:52 +00:00
Nick Kralevich
252b0e2b46 Merge "SELinux changes to check policy versions during a reload." 2014-05-31 05:03:05 +00:00
Dan Albert
e8f90ca60d am 570cd46d: Merge "Revert "Move libutils to libc++""
* commit '570cd46d14645f622e9972671308fdb4f2425292':
  Revert "Move libutils to libc++"
2014-05-30 20:17:32 +00:00
Dan Albert
570cd46d14 Merge "Revert "Move libutils to libc++"" 2014-05-30 20:13:48 +00:00
Dan Albert
7bc49a16e8 Revert "Move libutils to libc++"
Causes issues in the unbundled branches.

This reverts commit dc133729b0.

Change-Id: I9185ce9ea9e0ea631f0bfe016edf38c6830b288a
2014-05-30 19:40:58 +00:00
Dan Albert
36f536fc7b am 9f69e028: Merge "Move libutils to libc++"
* commit '9f69e028f73ce3e3ebbbc795d9a0b1143acb15e6':
  Move libutils to libc++
2014-05-30 18:40:25 +00:00
Dan Albert
9f69e028f7 Merge "Move libutils to libc++" 2014-05-30 18:32:08 +00:00
Mark Salyzyn
265262a8b2 am 5f815da3: Merge "String16.cpp rm unused utils/Debug.h"
* commit '5f815da3aba73e7605b72b6b3e2de648ca7c3390':
  String16.cpp rm unused utils/Debug.h
2014-05-29 23:52:54 +00:00
Mark Salyzyn
5f815da3ab Merge "String16.cpp rm unused utils/Debug.h" 2014-05-29 23:51:17 +00:00
Mark Salyzyn
6443033f6d String16.cpp rm unused utils/Debug.h
Change-Id: Ie7e3695770f20be33738a0f0a868cc914248d91a
2014-05-29 13:14:35 -07:00
Dave Allison
dec41a388d am 967729b7: Merge "Add LD_PRELOAD for libsigchain.so to the environment"
* commit '967729b7ca675d6f2c895a1bd56216a62b217e50':
  Add LD_PRELOAD for libsigchain.so to the environment
2014-05-29 19:57:50 +00:00
Dave Allison
967729b7ca Merge "Add LD_PRELOAD for libsigchain.so to the environment" 2014-05-29 19:51:42 +00:00
Dan Albert
dc133729b0 Move libutils to libc++
Bug: 15193147
Change-Id: Ib4b1835e77279db905e098abc7c9bf8d27d66b57
2014-05-29 10:19:39 -07:00
Narayan Kamath
a284f8b214 Skip the "--abi" flag on "adb install" if present.
This flag needs to be passed through to the package manager.
Without this change, the argument to this flag is interpreted
as a filename.

NOTE: If we don't want to add special treatment for this flag,
we'll have to assume that all flags with a -- prefix have an
argument, and that isn't necessarily true.

Change-Id: I78c3fa842bc24148d83d7278e6dee395686240a0
2014-05-29 15:54:10 +01:00
Elliott Hughes
c752d6dd37 am bf082ffb: Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC."
* commit 'bf082ffb71c40e4670410b246309a182d9dafcf5':
  Updated trace.h to recognize ATRACE_TAG_BIONIC.
2014-05-28 21:41:25 +00:00
Elliott Hughes
bf082ffb71 Merge "Updated trace.h to recognize ATRACE_TAG_BIONIC." 2014-05-28 21:35:57 +00:00
Mark Salyzyn
6445b40e93 am 811f2c0b: Merge "system/window.h: add deprecation warnings"
* commit '811f2c0b98d6f8935123221648c96ff975688902':
  system/window.h: add deprecation warnings
2014-05-28 19:28:30 +00:00
Mark Salyzyn
811f2c0b98 Merge "system/window.h: add deprecation warnings" 2014-05-28 19:25:15 +00:00
Nick Kralevich
c4ffa5f62e am c290bed0: Merge "Remove dmesg_restrict"
* commit 'c290bed0350cded5620ed8dbb68b1cfb07d9828c':
  Remove dmesg_restrict
2014-05-28 13:11:38 +00:00
Nick Kralevich
c290bed035 Merge "Remove dmesg_restrict" 2014-05-28 13:09:34 +00:00
Torne (Richard Coles)
a8329a36ca am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
  Add UID and directory for RELRO sharing support.
2014-05-28 10:17:44 +00:00
Torne (Richard Coles)
96109cf36c Merge "Add UID and directory for RELRO sharing support." 2014-05-28 10:15:46 +00:00
Nick Kralevich
1a6184baf3 Remove dmesg_restrict
dmesg_restrict is too coarse of a control. In Android's case,
we want to allow the shell user to see dmesg output, but disallow
others from seeing it.

Rather than rely on dmesg_restrict, use SELinux to control access
to dmesg instead. See corresponding change in external/sepolicy .

Bug: 10020939
Change-Id: I9d4bbbd41cb02b707cdfee79f826a39c1ec2f177
2014-05-27 16:51:11 -07:00
Mark Salyzyn
1e4cfe0636 am 5df557f6: Merge "logd: logcat: debuggerd: audit logs to events and main"
* commit '5df557f6b05ebde2e3f98affa54ef60b717d4b96':
  logd: logcat: debuggerd: audit logs to events and main
2014-05-27 22:55:35 +00:00
Mark Salyzyn
5df557f6b0 Merge "logd: logcat: debuggerd: audit logs to events and main" 2014-05-27 22:53:44 +00:00
Mark Salyzyn
e4369d68a2 logd: logcat: debuggerd: audit logs to events and main
- auditd spawn log copy to events and main
- logcat delete events as one of the default logs
- debuggerd do not collect events.
- squish multiple spaces
- switch from strcpy to memmove for overlapping buffers

BUG: 14626551
Change-Id: I89b30273ce931ed2b25a53ea9be48e77f4c1bbf4
2014-05-27 14:29:56 -07:00
Elliott Hughes
769db021e6 am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"
* commit 'b24085d55b082d802eba699243dba26fbc6ac712':
  adb: Add USB vendor ID for Unowhy
2014-05-27 21:29:15 +00:00
Elliott Hughes
b24085d55b Merge "adb: Add USB vendor ID for Unowhy" 2014-05-27 21:25:29 +00:00
Wing Tseng
56266c75e2 adb: Add USB vendor ID for Unowhy
Change-Id: I8bab07734d5b6acb4d8ceaf45b0bab0723f5fe03
Signed-off-by: Wing Tseng <Wing_Tseng@pegatroncorp.com>
2014-05-27 14:23:11 -07:00
Brigid Smith
8c82b35239 Updated trace.h to recognize ATRACE_TAG_BIONIC.
Bug: 15116468
Change-Id: If8d4971505ffe5cbc193c6ad71618a5adb8192b6
2014-05-27 12:37:48 -07:00
David 'Digit' Turner
c335887516 am 6e7343b8: Merge "adb: implement "adb reverse <local> <remote>""
* commit '6e7343b8993fecb2f0600a9e5cff91dd4480a877':
  adb: implement "adb reverse <local> <remote>"
2014-05-27 16:33:16 +00:00
David 'Digit' Turner
6e7343b899 Merge "adb: implement "adb reverse <local> <remote>"" 2014-05-27 16:30:31 +00:00
David 'Digit' Turner
2525869419 adb: implement "adb reverse <local> <remote>"
This implements the logical opposite of 'adb forward', i.e.
the ability to reverse network connections from the device
to the host.

This feature is very useful for testing various programs
running on an Android device without root or poking at the
host's routing table.

Options and parameters are exactly the same as those for
'adb forward', except that the direction is reversed.

Examples:

  adb reverse tcp:5000 tcp:6000
    connections to localhost:5000 on the device will be
    forwarded to localhost:6000 on the host.

  adb reverse --no-rebind tcp:5000 tcp:6000
    same as above, but fails if the socket is already
    bound through a previous 'adb reverse tcp:5000 ...'
    command.

  adb reverse --list
    list all active reversed connections for the target
    device. Note: there is no command to list all
    reversed connections for all devices at once.

  adb reverse --remove tcp:5000
    remove any reversed connection on the device from
    localhost:5000

  adb reverse --remove-all
    remove all reversed connections form the current
    device.

Reversed connections are tied to a transport, in other
words, they disappear as soon as a device is disconnected.

Simple testing protocol:

  adb forward tcp:5000 tcp:6000
  adb reverse tcp:6000 tcp:7000
  nc -l localhost 7000

in another terminal:
  echo "Hello" | nc localhost 5000

Will print "Hello" on the first terminal.

Change-Id: I761af790cdb06829b68430afa4145a919fa0e6d5
2014-05-27 16:42:13 +02:00
Torne (Richard Coles)
234f696ea7 Add UID and directory for RELRO sharing support.
Define a UID to be used by the process responsible for creating shared
RELRO files for the WebView native library, and create a directory owned
by that UID to use to store the files.

Bug: 13005501
Change-Id: I5bbb1e1035405e5534b2681f554fe16f74e3da1a
2014-05-27 14:00:29 +01:00
Narayan Kamath
9196f5f2df am 5fe6fcc3: Merge "Add a zygote 64/32 bit config."
* commit '5fe6fcc35d10c88dd55213dc5b2303ea73c1883b':
  Add a zygote 64/32 bit config.
2014-05-27 11:04:38 +00:00
Narayan Kamath
5fe6fcc35d Merge "Add a zygote 64/32 bit config." 2014-05-27 11:00:37 +00:00
Christopher Ferris
a0962b687a am d917d64f: Merge "Only copy mcontext data from sigcontext."
* commit 'd917d64fafb2eca22c9c75a8527eb4e920a9f079':
  Only copy mcontext data from sigcontext.
2014-05-23 22:28:43 +00:00
Mark Salyzyn
21157abcd9 am 8814bd1d: Merge "include: cleanup for -Wsystem-header"
* commit '8814bd1d24e3ce9476e64ba641d592521fcf80ed':
  include: cleanup for -Wsystem-header
2014-05-23 22:23:57 +00:00
Christopher Ferris
d917d64faf Merge "Only copy mcontext data from sigcontext." 2014-05-23 22:23:45 +00:00
Mark Salyzyn
8814bd1d24 Merge "include: cleanup for -Wsystem-header" 2014-05-23 22:19:57 +00:00
Christopher Ferris
e484607622 Only copy mcontext data from sigcontext.
The ucontext_t data structure could be bigger than the kernel data
structure. Since the unwinder only cares about the mcontext data, only
copy that out of the structure. The mcontext data is the same size in
the kernel and in the ucontext_t structure.

Bug: 15189014
Change-Id: I5978169c4425b8212e11db85a57eb319cd0e264b
2014-05-23 15:11:26 -07:00
Mark Salyzyn
289e111a00 system/window.h: add deprecation warnings
Change-Id: I38de3d281f28e0750b4abb86f28509f98dfc7a72
2014-05-23 15:10:06 -07:00
Mark Salyzyn
4887842c92 include: cleanup for -Wsystem-header
- warnings as errors, or errors introduced when -Wsystem-header
  was experimentally introduced.

Change-Id: Ia8f5b3c1c1096e191741223d52526aa48c7f1cc4
2014-05-23 15:09:57 -07:00
Mark Salyzyn
3f69451b03 am 818f8004: Merge "logd: used before set warning"
* commit '818f80045fe4c925a7739a1d1e69e3ebb3a3dbd9':
  logd: used before set warning
2014-05-23 17:48:25 +00:00
Mark Salyzyn
0b17e1cf18 am 72be6d5e: Merge "cpio: Turn on -Werror"
* commit '72be6d5eea001e7bd1bc7b31e8c7e81a0c4a9cff':
  cpio: Turn on -Werror
2014-05-23 17:48:24 +00:00