Commit graph

9667 commits

Author SHA1 Message Date
Elliott Hughes
e6880b7453 resolved conflicts for merge of 476b069a to master
Change-Id: I647232e584ba29c0a7b57e1f6e520f05f7986bb1
2014-06-19 11:15:45 -07:00
Elliott Hughes
476b069aa0 am a0619be0: am 32cd6ec6: Merge "Removed log.quiet and log = NULL cases from debuggerd."
* commit 'a0619be0f6180074109c8b7097147a11b9934953':
  Removed log.quiet and log = NULL cases from debuggerd.
2014-06-19 18:08:48 +00:00
Elliott Hughes
a0619be0f6 am 32cd6ec6: Merge "Removed log.quiet and log = NULL cases from debuggerd."
* commit '32cd6ec6a71a2e022fc39278287f1b8751338b0e':
  Removed log.quiet and log = NULL cases from debuggerd.
2014-06-19 18:05:02 +00:00
Elliott Hughes
32cd6ec6a7 Merge "Removed log.quiet and log = NULL cases from debuggerd." 2014-06-19 17:43:22 +00:00
Brigid Smith
50eb546ec1 Removed log.quiet and log = NULL cases from debuggerd.
Now the functionality implemented by these semi-confusing cases has been
replaced with the same logtype enum behavior that is easier to
understand, and cases that used log-looking behavior to print to logcat
(when log = NULL) now use the more transparent ALOGE/ALOGD functions.

Change-Id: I7e38f2d4ca74a828df4d2266b3ea34edd3c6f5bb
2014-06-19 10:59:01 -07:00
Eric Laurent
ce30de3553 audio: added new audio formats.
Bug: 9428304.

Change-Id: Ife1f6968a8d079b477b5afb5e5cf544e8fe3298f
2014-06-19 09:55:54 -07:00
Colin Cross
b10fb88e1e am d7d9b6fc: am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"
* commit 'd7d9b6fcaa415ea6251e45d84b95a95740ea807e':
  adb: Add USB vendor ID for Honeywell
2014-06-19 15:48:25 +00:00
Colin Cross
d7d9b6fcaa am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"
* commit 'f02fd9f0b061d29bb872664479ed4a5949d23ac9':
  adb: Add USB vendor ID for Honeywell
2014-06-19 15:44:14 +00:00
Colin Cross
f02fd9f0b0 am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell"
* commit '5e504a4e64824e3e7132b2e4b3f68c02f417466e':
  adb: Add USB vendor ID for Honeywell
2014-06-19 15:40:59 +00:00
Colin Cross
bb8aec4175 am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
* commit '08c704a0fe64927fa8618c576c20e39de7f1aa19':
  Use inet_ntoa to display ipaddr and mask values
2014-06-19 00:57:07 +00:00
Colin Cross
08c704a0fe am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
* commit '1a9e9c203bd2240e7b7768c74c5da1bcf107f159':
  Use inet_ntoa to display ipaddr and mask values
2014-06-19 00:52:40 +00:00
Colin Cross
1a9e9c203b am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"
* commit '974a4f3e00861da9aa1301efd5c349c3e2a5cf07':
  Use inet_ntoa to display ipaddr and mask values
2014-06-19 00:49:10 +00:00
Colin Cross
974a4f3e00 Merge "Use inet_ntoa to display ipaddr and mask values" 2014-06-19 00:18:04 +00:00
Bhanu Chetlapalli
9875ee97c7 Use inet_ntoa to display ipaddr and mask values
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
2014-06-18 17:24:04 -07:00
Ying Wang
fd9cfb4c22 am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
* commit '68d97430dd2cc25bb753df748d859415520a7dcb':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 23:03:48 +00:00
Ying Wang
68d97430dd am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
* commit '4924d10ae04574a15d94c6812153321af59a3e5b':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 22:59:02 +00:00
Colin Cross
5e504a4e64 Merge "adb: Add USB vendor ID for Honeywell" 2014-06-18 22:47:59 +00:00
DanielMo
8c4c8e8988 adb: Add USB vendor ID for Honeywell
Change-Id: Ib92eca23a6c75ec9323bb1b0e7d7f8cd5f9ca207
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-06-19 16:02:14 +08:00
Mark Salyzyn
4700dfa0fb am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize"
* commit '8d782f5170960f023a77be656e60398390aa58aa':
  logcat: test: modernize
2014-06-18 20:45:43 +00:00
Mark Salyzyn
8d782f5170 am 3f55d2f4: Merge "logcat: test: modernize"
* commit '3f55d2f4e69dd155d558fc2aa38e6f9bb0900152':
  logcat: test: modernize
2014-06-18 20:42:26 +00:00
Nick Kralevich
4224edf51d am 89e4fad0: am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"
* commit '89e4fad09e1ae765ab0be1580a468bc0837ef7e4':
  adbd: unconditionally call setgroups
2014-06-18 20:07:54 +00:00
Nick Kralevich
89e4fad09e am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"
* commit '4e6aa6a227401d8b56c9b149719b1e0de6afd6e8':
  adbd: unconditionally call setgroups
2014-06-18 20:05:41 +00:00
JP Abgrall
93a67779dc Merge "fsmgr: support multiple fs-types/mountpoint" 2014-06-18 19:24:54 +00:00
JP Abgrall
5c01dac6d8 fsmgr: support multiple fs-types/mountpoint
Previous attempt was broken.
It would incorrectly be affected by mount failures.

This changes allows an fstab to contain multiple lines for a given
mount point.
The lines sharing a mount MUST be after each other.

The 1st matching line is the primary when it comes to mounting
and look ups for wiping.

Mounting based on a mount_point will attempt each dup in turn
until one succeeds.
The reported error will be that of the last failed attempt.

This is to allow quick experimentation between different FSes.

Bug: 15702546
Change-Id: I378d68ad13eb0098ec1ccb8dcf108b82acbe9ebb
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-18 22:18:24 +00:00
JP Abgrall
da7a448f38 Merge "fastboot: correctly set dependency on f2fs dynamic lib" 2014-06-18 19:24:54 +00:00
Ying Wang
e35e709ecb am fd9cfb4c: am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed."
* commit 'fd9cfb4c226fe76b50d828c737e7664d8b04a59b':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
2014-06-18 23:09:23 +00:00
Mark Salyzyn
025133a8db am 4700dfa0: am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize"
* commit '4700dfa0fbb9be31809b250c001d0275ce0b38dc':
  logcat: test: modernize
2014-06-18 21:40:30 +00:00
Nick Kralevich
000a62f644 am 4224edf5: am 89e4fad0: am 4e6aa6a2: Merge "adbd: unconditionally call setgroups"
* commit '4224edf51dcddf9e014b198bb23fc40ef61a5834':
  adbd: unconditionally call setgroups
2014-06-18 21:40:27 +00:00
Mark Salyzyn
e53714bf59 am 2757d76c: am deae968a: am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit '2757d76cd6f0b0c0560751f5e8b9c2656692ffa9':
  logd: Allow apps to clear their UID-specific data
2014-06-18 21:09:34 +00:00
Mark Salyzyn
722e859dec am 9f621cf8: am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '9f621cf8724859419bbb058f197a0b4fa691aa4e':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 21:09:33 +00:00
Mark Salyzyn
2757d76cd6 am deae968a: am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit 'deae968a2c6384531d208f00f27085f5d725989f':
  logd: Allow apps to clear their UID-specific data
2014-06-18 19:19:32 +00:00
Mark Salyzyn
9f621cf872 am 6bda7716: am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '6bda7716405f3ddc8571c578beaaac4368c840d0':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 19:19:31 +00:00
Mark Salyzyn
deae968a2c am 4da93e34: Merge "logd: Allow apps to clear their UID-specific data"
* commit '4da93e34388748879a25974ee33ff1eb6cc47cd2':
  logd: Allow apps to clear their UID-specific data
2014-06-18 19:16:04 +00:00
Mark Salyzyn
6bda771640 am 9e7bef0e: Merge changes I759c65e8,I97699037
* commit '9e7bef0ef91e819a11ceb8b14489cb451970e62e':
  logd: test: deal with spam filter turned off
  logd: test: modernize
2014-06-18 19:16:03 +00:00
JP Abgrall
64c0ff21e4 fastboot: correctly set dependency on f2fs dynamic lib
In the past it would incorrectly also link against the dlopen()'d lib.

Now it clearly does not care about it.

ldd $(which fastboot)
        linux-gate.so.1 =>  (0xf7735000)
        libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf76d9000)
        libstdc++.so.6 => /usr/lib/i386-linux-gnu/libstdc++.so.6 (0xf75f4000)
        libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf75c7000)
        libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf75a9000)
        libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf73ff000)
        /lib/ld-linux.so.2 (0xf7736000)

Bug: 15717498
Change-Id: I5465e97a445b17f5493a1f590e181ef98a382451
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-18 11:13:05 -07:00
Torne (Richard Coles)
11d8ac2afb Only try and use f2fs on linux.
F2FS was already disabled on windows, but the library doesn't build for
mac either, so only try and use it on Linux hosts.

Change-Id: I8bacfa4c01c9ee13123aef6d05d17b3f9094c765
2014-06-18 13:48:38 +01:00
JP Abgrall
55e298e6dc Merge "fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)" 2014-06-17 22:59:52 +00:00
JP Abgrall
f786fe5438 fsmgr: revert multiple fs-types/mountpoint (fix N5 boot)
This is apparently breaking N5, so reverting for now.

This reverts commit a794f86522.

Bug: 15709256
Change-Id: I37a5160eead17e153e2c83fa94632ffa5d8553c2
2014-06-18 07:28:14 +00:00
JP Abgrall
6bd72beff6 fastboot: fix windows sdk build (don't do f2fs dyn load on windows)
Only do f2fs dynamic loading on linux.
Adds a stub for windows builds.

Change-Id: I7bbaaa1b2ff5992709d904b7ace40ae263d32922
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 23:43:18 -07:00
JP Abgrall
a794f86522 fsmgr: allow for a multiple fs-types for a mount point.
This changes allows an fstab to contain multiple lines for a given
mount point.
The lines sharing a mount MUST be after each other.

The 1st matching line is the primary when it comes to mounting
and look ups for wiping.

Mounting based on a mount_point will attempt each dup in turn
until one succeeds.

This is to allow quick experimentations between different FSes.
It does not deal with checkfs yet, because the underlying invocation
of fs-type appropriate fsck does not handle the error code.
Only the primary FS (1st in the dups) is checked.

Change-Id: I8329737454b53e2681436fe85cd00a9bc522676b
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 17:01:20 -07:00
JP Abgrall
1235158c29 F2FS support for fastboot format and fsmgr
- Enables fsck.f2fs for partitions with type F2FS.
- Adds support for f2fs as format fs-type.
- f2fs is optional and support is dlopen()d when needed.

Needs changes in
  system/extras/f2fs_utils
  external/f2fs-tools

Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
2014-06-17 17:01:14 -07:00
Elliott Hughes
d478aec2a9 am bd80e0d8: am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit 'bd80e0d8e6de5c2d4fbd2e8a1bc750dc6e0b7e20':
  Changed maps output in debuggerd.
2014-06-17 22:58:11 +00:00
Elliott Hughes
bd80e0d8e6 am 0ef3fa24: Merge "Changed maps output in debuggerd."
* commit '0ef3fa24fb0c3c58b8440527e4de4f3f98ddaaa5':
  Changed maps output in debuggerd.
2014-06-17 22:52:46 +00:00
Nick Kralevich
4e6aa6a227 Merge "adbd: unconditionally call setgroups" 2014-06-17 21:47:03 +00:00
Nick Kralevich
e5cbf4e044 adbd: unconditionally call setgroups
We should ensure that the appropriate supplementary groups are
set, regardless of whether we're running UID=0 or UID=shell.

Change-Id: I3a1624a574102be08176a41f9c7eb5f82af2b3e5
2014-06-18 11:24:27 -07:00
Mark Salyzyn
4da93e3438 Merge "logd: Allow apps to clear their UID-specific data" 2014-06-17 21:47:03 +00:00
Mark Salyzyn
3f55d2f4e6 Merge "logcat: test: modernize" 2014-06-17 21:42:00 +00:00
Mark Salyzyn
9879ac8e12 logcat: test: modernize
- split sequential sort output test out as a benchmark check
- Allow up to two failures of sort results because of occasional reader locks.
- logcat -g output was changed to handle wider set of values incorporating a
  multiplier for UX, and would not pass test if 'logcat -G 1M' was run.
- If spam filter is turned off, prune checks would fail, allowed for an
  empty default.

Change-Id: I06d6089e18279df7525d1c16a1f76b3125ddbf05
2014-06-18 13:18:17 -07:00
Ying Wang
4924d10ae0 Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed." 2014-06-17 21:42:00 +00:00
Ying Wang
2359b3c162 Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
(cherry picked from commit 7011a85606)

Change-Id: I025fe1f64c87fd406b3a3bf3d20fd3b78be8a940
2014-06-18 15:43:29 -07:00