Colin Cross
350a68bf24
am fb27d34d: Merge "Add libprocessgroup"
...
* commit 'fb27d34dacf45fa1b5a5ea8ded778889827e5c99':
Add libprocessgroup
2014-07-14 01:56:58 +00:00
Badhri Jagan Sridharan
8f6c821bb5
am bf9ef519: am cb7be1e8: am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"
...
* commit 'bf9ef5196995119a9801b55d2df2e683eeba2168':
adbd: adb root should terminate adbd only if it's debuggable
2014-07-14 01:56:58 +00:00
Elliott Hughes
5dda36bd7c
am c89c0c65: am 75b3d8c0: am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."
...
* commit 'c89c0c65c7683835248c06899dc0712a50f6caa2':
Fix arm emulator "D register out of range for selected VFP version" build failure.
2014-07-14 01:56:57 +00:00
Elliott Hughes
3a03e61ccf
am 0dd3fe22: am b237f5fb: am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher."
...
* commit '0dd3fe220b3c7d7013871ec4b1f7875586f4d719':
Integrate vfp-crasher with crasher.
2014-07-14 01:56:56 +00:00
Elliott Hughes
a06bbdf543
am 67db9d5f: am b2ac4243: am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h"
...
* commit '67db9d5f7373e96a1f2279f25a544be76b26a88f':
Fix typo in fs.h
2014-07-14 01:56:56 +00:00
Colin Cross
1d6279ee3d
am 038975a5: Merge "lmkd: pass uid from ActivityManager to lmkd"
...
* commit '038975a5c85caa758294102d4577d063d7e02651':
lmkd: pass uid from ActivityManager to lmkd
2014-07-14 01:56:55 +00:00
Nick Kralevich
a352c8c856
am ee0388e7: am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"
...
* commit 'ee0388e768bb27eb845809a0b3ba85f4f7f21885':
restorecon_recursive /cache
2014-07-14 01:56:54 +00:00
Daniel Rosenberg
9d09b12d4d
am 33e7b131: Made formatting for newfs_msdos.c more uniform
...
* commit '33e7b13167bcfd65b6c595e316e515ff8eab4b33':
Made formatting for newfs_msdos.c more uniform
2014-07-14 01:56:54 +00:00
Elliott Hughes
e360bb459e
am 6ebab06d: am f043f061: am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."
...
* commit '6ebab06dc4e7149b4deb5032518c64b881801259':
Fix sdcard's FUSE_FSYNCDIR handling.
2014-07-14 01:56:53 +00:00
Elliott Hughes
63917b1027
am 40372e5b: am 94645665: am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."
...
* commit '40372e5b4ed1027418485a66d80e48748eedc07f':
Make sdcard log to the log rather than stderr.
2014-07-14 01:56:52 +00:00
Terry Heo
ac53a4af6a
am a916e260: Merge "audio: add definition for new audio loopback input device"
...
* commit 'a916e260db1e6c2c20fe0451ffe380f5e19af818':
audio: add definition for new audio loopback input device
2014-07-14 01:56:51 +00:00
Nick Kralevich
09ef42ab63
am 14253c1a: Merge "init.rc: add seclabel to flash_recovery"
...
* commit '14253c1aab42e4e4ec4e68798c068436b4260288':
init.rc: add seclabel to flash_recovery
2014-07-14 01:56:51 +00:00
Eric Laurent
0c9dc55292
am aecb7f84: Merge "Revert "Revert "sound trigger: several data structure updates"""
...
* commit 'aecb7f84cfe505403372a19c6247e34e366916ab':
Revert "Revert "sound trigger: several data structure updates""
2014-07-14 01:56:50 +00:00
Sreeram Ramachandran
2f26cd9ea6
am 85449d36: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit '85449d360f86ed9faaf1403f972f9657698a8289':
2014-07-14 01:56:49 +00:00
Elliott Hughes
ef0a3cfaf0
am 81542db7: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit '81542db7c2cdf44803ba36be0f8cd76972790fc0':
2014-07-14 01:56:49 +00:00
Elliott Hughes
3c6216a894
am 85090337: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."
...
* commit '850903371fce13933d5b9cfaf16d777fcd329296':
2014-07-14 01:56:48 +00:00
dcashman
1ecce47dfb
am 9f3a11ed: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit '9f3a11edde07af068217581cf11c004f1cdca3f0':
2014-07-14 01:56:47 +00:00
Hans Boehm
0de8ac248a
am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
Add comment to discourage use of cutils/atomic.h.
2014-07-13 08:18:24 -07:00
Hans Boehm
b53af3f60f
am 4b9f899b: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit '4b9f899bf1f5d09622307df85ba7d7f7aabbb834':
Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:41:08 +00:00
Christopher Ferris
06ca5fadbd
am 611dceec: am ce61f74f: am 56cbd19b: Merge "Fix build."
...
* commit '611dceecd57ab651514942823cd1eb4a10b8a9fb':
Fix build.
2014-07-12 19:41:07 +00:00
Elliott Hughes
9d6dfd63c9
am c785caa4: am 802943ab: am 8098114c: Merge "Sync with upstream grep."
...
* commit 'c785caa4b44a1a96e21904fac8cf857f2d9f5e96':
Sync with upstream grep.
2014-07-12 19:41:07 +00:00
Elliott Hughes
dddb191cba
am 3aad8796: am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing"
...
* commit '3aad879660686ec3d88994bd9f0716ac861f6e2f':
fix duplicated grep usage printing
2014-07-12 19:41:06 +00:00
Mark Salyzyn
719dda65d7
am 7fc37b54: am ad806908: am 755df295: Merge "logd: test: disable kernel LOGGER"
...
* commit '7fc37b542509a235423d605829c9f0cde058c4e8':
logd: test: disable kernel LOGGER
2014-07-12 19:41:05 +00:00
Elliott Hughes
913613a51d
am ecba4dc0: am 85dfe988: am 796fccb8: Merge "Fix environment variable assignment in init"
...
* commit 'ecba4dc0370f4dd04833acb08901be63b6bde4b3':
Fix environment variable assignment in init
2014-07-12 19:41:05 +00:00
Hans Boehm
4b9f899bf1
am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:36:58 +00:00
Christopher Ferris
611dceecd5
am ce61f74f: am 56cbd19b: Merge "Fix build."
...
* commit 'ce61f74f153c7d185d1a3d5e2d6dc02ccf768963':
Fix build.
2014-07-12 19:36:58 +00:00
Elliott Hughes
c785caa4b4
am 802943ab: am 8098114c: Merge "Sync with upstream grep."
...
* commit '802943ab514de0814078b2e0a400d18632daa188':
Sync with upstream grep.
2014-07-12 19:36:58 +00:00
Elliott Hughes
3aad879660
am 895d6747: am 7a8420ec: Merge "fix duplicated grep usage printing"
...
* commit '895d67473854e89abf5834be66a79589de8c4b9e':
fix duplicated grep usage printing
2014-07-12 19:36:58 +00:00
Mark Salyzyn
7fc37b5425
am ad806908: am 755df295: Merge "logd: test: disable kernel LOGGER"
...
* commit 'ad806908bb68a03d34bc0bda3ad83abe321021a1':
logd: test: disable kernel LOGGER
2014-07-12 19:36:58 +00:00
Elliott Hughes
ecba4dc037
am 85dfe988: am 796fccb8: Merge "Fix environment variable assignment in init"
...
* commit '85dfe98830c78f1c3d400ca7be4ac594bfcdd275':
Fix environment variable assignment in init
2014-07-12 19:36:57 +00:00
Hans Boehm
e6b0c56676
am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit '981dcd79d5cbfb2192dc14706e2825b81a467af7':
Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:33:37 +00:00
Elliott Hughes
e07d77e422
Use <sys/prctl.h> instead of <linux/prctl.h>.
...
Change-Id: I708da00e36a9da8be9184c451453774be6b78c06
2014-07-11 20:58:55 -07:00
Hans Boehm
981dcd79d5
Merge "Add comment to discourage use of cutils/atomic.h."
2014-07-11 23:26:34 +00:00
Hans Boehm
5af7877950
Add comment to discourage use of cutils/atomic.h.
...
Change-Id: Ib05c745158fdf5a11fd4697c3665a6370ffc04f5
2014-07-11 18:30:13 -07:00
Riley Andrews
9464e5a58d
Move unlink("/dev/.booting") until after filesystems are mounted.
...
Move the unlink out of init.c and into init.rc, so that the file
will be removed after all the filesystems with firmware are up.
Change-Id: I7442df2042cc2788d0301f00e3c2fba7d6e0e1c7
2014-07-11 15:47:15 -07:00
Patrick Tjin
aac89db8a5
Scan all descriptors when checking for fastboot
...
For Linux, the USB code was only looking at the first
descriptor when searching for the fastboot interface
which caused some devices to not be found.
Also clarify some code by using the actual USB structures
instead of void or char pointers.
Change-Id: I9e4871c4d477ac10ba75bb17a955f176809af289
Signed-off-by: Patrick Tjin <pattjin@google.com>
2014-07-11 14:15:30 -07:00
aarti jadhav-gaikwad
923e740879
audio: add definitions for aac sub formats
...
add definitions for aac sub formats
Change-Id: I610caa510dfc7347f7c98e19359545423edd76b3
2014-07-11 18:26:00 +00:00
Sreeram Ramachandran
f813da2dfc
am e26ca55b: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit 'e26ca55bdd3ca6530826e5248fd8dc5d8f6ba26e':
2014-07-11 17:46:58 +00:00
Elliott Hughes
99adb75562
am b5dfe272: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit 'b5dfe27206336787a351111cc45ca362b185eb78':
2014-07-11 17:46:58 +00:00
Elliott Hughes
afacbefba8
am 7ca8bae8: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."
...
* commit '7ca8bae8b4148eb204530ceeca885a3245c436b1':
2014-07-11 17:46:57 +00:00
dcashman
9ae2b5e1f4
am 8c7e0520: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit '8c7e0520777acff9212580972d7ae04e026df1cd':
2014-07-11 17:32:59 +00:00
Sreeram Ramachandran
e26ca55bdd
am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit 'b12e40da2526881c1730a3d3387556e4600c7040':
Create a data directory for netd and other network-related files.
2014-07-11 17:29:02 +00:00
Elliott Hughes
b5dfe27206
am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit 'f761709a8e0f440afbdcd0df8f78d5e8ebc94211':
Fix LP64 tombstone.cpp build failure.
2014-07-11 17:28:54 +00:00
Elliott Hughes
7ca8bae8b4
am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."
...
* commit '4f27968f988808c713564de99c04612b9e8768b9':
Improving maps output.
2014-07-11 17:28:50 +00:00
Glenn Kasten
e60eb62384
Merge "Representation of channel masks for position assignment and index assignment"
2014-07-11 16:34:41 +00:00
Glenn Kasten
432b7c6da2
Representation of channel masks for position assignment and index assignment
...
Bug: 16245854
Change-Id: I76c7c39c7d4f8d5035016653aa91fa7c1e749bbd
2014-07-12 13:23:57 +00:00
dcashman
8c7e052077
am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit 'cddb15b8a9057e7efacf2de9c9a6a887fd666663':
Remove sshd.
2014-07-11 16:19:00 +00:00
Christopher Ferris
ce61f74f15
am 56cbd19b: Merge "Fix build."
...
* commit '56cbd19b1b8a42a0011be78aa1051304bc57127d':
Fix build.
2014-07-11 06:39:03 +00:00
Jungshik Jang
2c7cfc10f5
Remove forced usage types for HDMI-CEC system audio mode.
...
Change-Id: Ice8aab76281aa62a42665d7c86df1041c7f64ab9
2014-07-11 03:36:28 +00:00
Elliott Hughes
802943ab51
am 8098114c: Merge "Sync with upstream grep."
...
* commit '8098114c904923d187368a331ed34a9f2d98cac5':
Sync with upstream grep.
2014-07-11 03:08:36 +00:00