Ruben Brunk
a5e65d86a2
Allow sticky transform to be set in ANativeWindow.
...
Bug: 15116722
- Adds methods to set the sticky transform field.
Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:14:49 +00:00
Jeff Sharkey
1404e65472
Merge "Fix 64-bit builds." into lmp-dev
2014-07-14 18:38:02 +00:00
Jeff Sharkey
c03064ea71
Fix 64-bit builds.
...
Change-Id: I1ff5c9c3dc8d870aef2885f8a1989c6c913ccb3d
2014-07-14 13:57:54 -07:00
Riley Andrews
fd0f390869
Merge "Move unlink("/dev/.booting") until after filesystems are mounted." into lmp-dev
2014-07-14 18:37:56 +00:00
Riley Andrews
80c7a5e8a8
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: Ifdd5dd1e95d7e064dde5c80b70198882d949a710
2014-07-14 13:17:43 -07:00
Todd Poynor
2eb3d3b55c
am 7b29cc8c: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp
...
* commit '7b29cc8c026548306e661f22573dc80c8e7fba0f':
2014-07-14 18:52:38 +00:00
Todd Poynor
7b29cc8c02
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp
2014-07-14 18:17:22 +00:00
aarti jadhav-gaikwad
c6cca01756
am 24ca56e1: am 923e7408: audio: add definitions for aac sub formats
...
* commit '24ca56e1e0f04061d5ea0d5750ea2d487bcd5322':
2014-07-14 18:00:26 +00:00
Sreeram Ramachandran
2cb1c3c23b
am 9ec4cb80: am f813da2d: am e26ca55b: am b12e40da: am 0a7b44d5: am ab98d2e6: Merge "Create a data directory for netd and other network-related files."
...
* commit '9ec4cb80658b67e6fe95917cb9a1f697546beb13':
2014-07-14 18:00:25 +00:00
Elliott Hughes
c43a3e875a
am 9f8fa8f2: am 99adb755: am b5dfe272: am f761709a: am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."
...
* commit '9f8fa8f2786c0156b43be7e83e70b8a267c4527a':
2014-07-14 18:00:24 +00:00
Elliott Hughes
4d5d830bc4
am b5e36713: am afacbefb: am 7ca8bae8: am 4f27968f: am 494bd36d: am dda63545: Merge "Improving maps output."
...
* commit 'b5e367131568573f9b9da7c130a1a73c85261958':
2014-07-14 18:00:23 +00:00
dcashman
342681c2a2
am 80e236a1: am 9ae2b5e1: am 8c7e0520: am cddb15b8: am b4e74db7: am 3fa71b8e: Merge "Remove sshd."
...
* commit '80e236a11cd2d1d327ccfae47421a5c35188216b':
2014-07-14 18:00:22 +00:00
Jungshik Jang
b61ae5d9a0
am d7fedf9a: am 6fe31610: Merge "Fix size of "values" fields of audio_gain_config."
...
* commit 'd7fedf9abd5ad0b6ba1ea93ed0d6f53f73d2a891':
2014-07-14 18:00:21 +00:00
Jungshik Jang
37ad4cc965
am 6a6f1166: am 2c7cfc10: Remove forced usage types for HDMI-CEC system audio mode.
...
* commit '6a6f116621d549554679523be35db7033a710445':
2014-07-14 18:00:20 +00:00
Ruchi Kandoi
c543235814
am d48e5fb4: am a78fc234: healthd: Reports arbitrary numbers for capacity and temperature when connected to fake battery.
...
* commit 'd48e5fb4378b6e29d8d33194ece7e5f02d210d76':
2014-07-14 18:00:19 +00:00
Colin Cross
4d96be15b6
am 59a954a8: am 212e9798: add cleanspec for lmkd
...
* commit '59a954a80cc6669dadd9444ddb6b2fb39ef778dd':
2014-07-14 18:00:18 +00:00
Colin Cross
01dc8b19ab
am 8cb357ea: am 420f0a25: Merge "lmkd: use libprocessgroup to kill forked processes"
...
* commit '8cb357ea50f993c3a61a2aaf511c37a1d69b26a1':
2014-07-14 18:00:17 +00:00
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