Colin Cross
67fcd844af
am 350a68bf: am fb27d34d: Merge "Add libprocessgroup"
...
* commit '350a68bf24ade269acc4ee69b0af01b9533f8187':
2014-07-14 18:00:16 +00:00
Badhri Jagan Sridharan
2cdaf1c38b
am 8f6c821b: am bf9ef519: am cb7be1e8: am 87c7a0d7: am 77a2c22d: Merge "adbd: adb root should terminate adbd only if it\'s debuggable"
...
* commit '8f6c821bb5d1e410935cf6cf17c560e27b4c964c':
2014-07-14 18:00:15 +00:00
Elliott Hughes
b28f4c0b1f
am 5dda36bd: am c89c0c65: am 75b3d8c0: am d0fa7342: am 660ba372: Merge "Fix arm emulator "D register out of range for selected VFP version" build failure."
...
* commit '5dda36bd7cb56a0dcfe8ea55ddf955cc5622923c':
2014-07-14 18:00:15 +00:00
Elliott Hughes
67f549b651
am 3a03e61c: am 0dd3fe22: am b237f5fb: am 5acbb9bc: am b5186598: Merge "Integrate vfp-crasher with crasher."
...
* commit '3a03e61ccfe97c76d09c2d8588ef18477af9de73':
2014-07-14 18:00:14 +00:00
Elliott Hughes
920fca2a31
am a06bbdf5: am 67db9d5f: am b2ac4243: am f76c8fe6: am 328c3ef6: Merge "Fix typo in fs.h"
...
* commit 'a06bbdf54334870c233ff4206c78dd2b7fc265eb':
2014-07-14 18:00:13 +00:00
Colin Cross
b91775ba3f
am 1d6279ee: am 038975a5: Merge "lmkd: pass uid from ActivityManager to lmkd"
...
* commit '1d6279ee3d0771687a56a22e70dc1e7aa5ac3078':
2014-07-14 18:00:12 +00:00
Nick Kralevich
cc20ac8bf0
am a352c8c8: am ee0388e7: am f89ddf76: am d05245a4: am c87237f5: Merge "restorecon_recursive /cache"
...
* commit 'a352c8c8569a2d020fd9030bd841ef5f4c4f7755':
2014-07-14 18:00:11 +00:00
Daniel Rosenberg
37b8600f96
am 9d09b12d: am 33e7b131: Made formatting for newfs_msdos.c more uniform
...
* commit '9d09b12d4da492d5bc22c8b71264720a9bdac816':
2014-07-14 18:00:10 +00:00
Elliott Hughes
72629c94bc
am e360bb45: am 6ebab06d: am f043f061: am 060b6ecb: am 6e141aea: Merge "Fix sdcard\'s FUSE_FSYNCDIR handling."
...
* commit 'e360bb459e983521d09586971a5a3a94339af60c':
2014-07-14 18:00:09 +00:00
Elliott Hughes
076c480f61
am 63917b10: am 40372e5b: am 94645665: am f8acdcbe: am 75b7171f: Merge "Make sdcard log to the log rather than stderr."
...
* commit '63917b10273451878d509d908f040d04e8bcccdb':
2014-07-14 18:00:08 +00:00
Terry Heo
554006b7ce
am ac53a4af: am a916e260: Merge "audio: add definition for new audio loopback input device"
...
* commit 'ac53a4af6afd1f4747f527dc28f9fec3c53f3901':
2014-07-14 18:00:07 +00:00
Nick Kralevich
d9d01d0e10
am 09ef42ab: am 14253c1a: Merge "init.rc: add seclabel to flash_recovery"
...
* commit '09ef42ab63dc36d1097390bda6bf08d1cf5332e1':
2014-07-14 18:00:06 +00:00
Eric Laurent
de8566330c
am 0c9dc552: am aecb7f84: Merge "Revert "Revert "sound trigger: several data structure updates"""
...
* commit '0c9dc552921bf50d62c8b81084a703ac07e48cd6':
2014-07-14 18:00:04 +00:00
Sreeram Ramachandran
e20825077c
am 2f26cd9e: am 85449d36: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit '2f26cd9ea62f24123b0f82316cc0a00f4ed5689a':
2014-07-14 18:00:03 +00:00
Elliott Hughes
c4330352f1
am ef0a3cfa: am 81542db7: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit 'ef0a3cfaf063ba36cb8515dc3698a30bc01b7fc3':
2014-07-14 18:00:01 +00:00
Elliott Hughes
1a23f5a8a3
am 3c6216a8: am 85090337: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."
...
* commit '3c6216a894140024f01f8c7223324bb228b629cf':
2014-07-14 18:00:00 +00:00
dcashman
b82ef7e00c
am 1ecce47d: am 9f3a11ed: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit '1ecce47dfbaa4d84880f8500fd83e2863725c271':
2014-07-14 17:59:59 +00:00
Hans Boehm
7d8490eb73
am 0de8ac24: am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
...
* commit '0de8ac248a8a31c4baa4c1b9ab9dd08d8bdaaecb':
am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
2014-07-14 17:59:57 +00:00
Jeff Sharkey
960df97c23
Add install-multiple to adb.
...
The new install-multiple command automates creating an install
session, streaming multiple files into place, and then committing
or destroying the session. This uses the recent "exec" feature to
stream APK contents over stdin directly into their final resting
place, requiring no extra copies.
Blindly pass through command line arguments to "pm" to make adding
new flags easier in future.
Remove support for verifying APK before sending across wire, since it
was reading the entire APK into memory (!) before sending. Also
remove encrypted APKs, since they are no longer supported. Drop
support for undocumented verification files.
Bug: 14975160
Change-Id: I0c538471873061798160e2e47cec4c0424c27361
2014-07-14 10:26:21 -07:00
aarti jadhav-gaikwad
24ca56e1e0
am 923e7408: audio: add definitions for aac sub formats
...
* commit '923e740879c871e0c3806f7c6df77093e715bb38':
audio: add definitions for aac sub formats
2014-07-14 01:57:06 +00:00
Sreeram Ramachandran
9ec4cb8065
am f813da2d: am e26ca55b: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit 'f813da2dfc4990c09d40b2088c27a35683050eb0':
2014-07-14 01:57:05 +00:00
Elliott Hughes
9f8fa8f278
am 99adb755: am b5dfe272: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit '99adb7556250f4bd1665f16ce49359d009bbd2bd':
2014-07-14 01:57:04 +00:00
Elliott Hughes
b5e3671315
am afacbefb: am 7ca8bae8: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."
...
* commit 'afacbefba861703716d4a761846b2a0f9b1e6cd0':
2014-07-14 01:57:03 +00:00
dcashman
80e236a11c
am 9ae2b5e1: am 8c7e0520: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit '9ae2b5e1f41f47617e4a960a64f98f01330209a0':
2014-07-14 01:57:02 +00:00
Jungshik Jang
d7fedf9abd
am 6fe31610: Merge "Fix size of "values" fields of audio_gain_config."
...
* commit '6fe316102a17b644ea2525a393e1f2ea4b299f8d':
Fix size of "values" fields of audio_gain_config.
2014-07-14 01:57:02 +00:00
Jungshik Jang
6a6f116621
am 2c7cfc10: Remove forced usage types for HDMI-CEC system audio mode.
...
* commit '2c7cfc10f5d869a52038198aed6bd6e8e6fc9a54':
Remove forced usage types for HDMI-CEC system audio mode.
2014-07-14 01:57:01 +00:00
Ruchi Kandoi
d48e5fb437
am a78fc234: healthd: Reports arbitrary numbers for capacity and temperature when connected to fake battery.
...
* commit 'a78fc23491f3490bec4e4ac72c4bdc8c6d554fe3':
healthd: Reports arbitrary numbers for capacity and temperature when connected to fake battery.
2014-07-14 01:57:00 +00:00
Colin Cross
59a954a80c
am 212e9798: add cleanspec for lmkd
...
* commit '212e97986564060678bb69b756e700e1db85bc39':
add cleanspec for lmkd
2014-07-14 01:57:00 +00:00
Colin Cross
8cb357ea50
am 420f0a25: Merge "lmkd: use libprocessgroup to kill forked processes"
...
* commit '420f0a2567e8697b828e59802f972382360e667d':
lmkd: use libprocessgroup to kill forked processes
2014-07-14 01:56:59 +00:00
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
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