summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add NativeHandle, a refcounted C++ wrapper around a native_handle_t*"Jesse Hall2014-03-063-0/+89
|\
| * Add NativeHandle, a refcounted C++ wrapper around a native_handle_t*Jesse Hall2014-03-053-0/+89
| | | | | | | | Change-Id: I232dfa2ad2e4a463a39e2e901e4097dffe278cc3
* | am d8ed565f: am f27f9e10: am 51ebffd8: Merge "Add free to CloseArchive."Mathieu Chartier2014-03-051-7/+1
|\ \ | | | | | | | | | | | | * commit 'd8ed565f1541ccda63254f236064fa22be9ecbf9': Add free to CloseArchive.
| * \ am f27f9e10: am 51ebffd8: Merge "Add free to CloseArchive."Mathieu Chartier2014-03-051-7/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'f27f9e10f50a015ec2d76a2f3579a5d11932965e': Add free to CloseArchive.
| | * \ am 51ebffd8: Merge "Add free to CloseArchive."Mathieu Chartier2014-03-051-7/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '51ebffd8a5536af09b60950bf7cf6f020c962f8a': Add free to CloseArchive.
| | | * \ Merge "Add free to CloseArchive."Mathieu Chartier2014-03-051-7/+1
| | | |\ \
| | | | * | Add free to CloseArchive.Mathieu Chartier2014-03-041-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently CloseArchive doesn't call free and call sites don't appear to either. I could not find any call sites which manually freed the archive by deleting the handle. This fixes several memory leaks. Change-Id: I21f187dde60fd87e6e54bde06de9e76fd0791104
* | | | | | libsuspend: use wakeup count interface for system suspendTodd Poynor2014-03-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the wakeup count interface for requesting suspend, instead of autosleep, to allow userspace to collect stats on suspend/resume activity. Change-Id: I44b5ef031b2bdc5b09c904fb2adbbe16370c2984
* | | | | | am 933f0b88: am f21b6b92: am 87a56eb6: Merge "Use the getopt function in ↵Colin Cross2014-03-051-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compliance with the standard." * commit '933f0b88e4232f58f171b8217d7871f97a927c57': Use the getopt function in compliance with the standard.
| * | | | | am f21b6b92: am 87a56eb6: Merge "Use the getopt function in compliance with ↵Colin Cross2014-03-051-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the standard." * commit 'f21b6b9217efc86ae753e5c57a05ff05e631bd3e': Use the getopt function in compliance with the standard.
| | * | | | am 87a56eb6: Merge "Use the getopt function in compliance with the standard."Colin Cross2014-03-051-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit '87a56eb6cc616150d536ed0e70cf8e69e1d5edf6': Use the getopt function in compliance with the standard.
| | | * | | Merge "Use the getopt function in compliance with the standard."Colin Cross2014-03-051-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Use the getopt function in compliance with the standard.David Gumberg2014-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a simple change to the use of getopt in reboot.c, as per the standard, getopt does NOT return an EOF, it returns a -1, (this was done to remove getopt's dependence on stdio.h), and since the standard does not guarantee that EOF is -1, and the documentation tells us that getopt returns -1, in my judgement it would be best to test for -1, rather than EOF. Change-Id: I63a3bb7011eb60753eb910221bbe8ce0a71e6679 Signed-off-by: David Gumberg <davidzgumberg@gmail.com>
* | | | | | am 71ca8381: am 6783d7cf: am 93412622: am 726beb6c: am 6941a83c: don\'t load ↵Nick Kralevich2014-03-040-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property_contexts from /data * commit '71ca8381b880d6402e273dc1c9a10a25e5b82572': don't load property_contexts from /data
| * | | | | am 6783d7cf: am 93412622: am 726beb6c: am 6941a83c: don\'t load ↵Nick Kralevich2014-03-040-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property_contexts from /data * commit '6783d7cf166feb943a5cdcd74c8da1f7a160fc2d': don't load property_contexts from /data
| | * | | | am 93412622: am 726beb6c: am 6941a83c: don\'t load property_contexts from /dataNick Kralevich2014-03-040-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93412622859014cc8bd39c30101096d03300845c': don't load property_contexts from /data
| | | * \ \ \ am 726beb6c: am 6941a83c: don\'t load property_contexts from /dataNick Kralevich2014-03-040-0/+0
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '726beb6c4a02d14cc4637ec61cba09dbe097a149': don't load property_contexts from /data
| | | | * \ \ \ am 6941a83c: don\'t load property_contexts from /dataNick Kralevich2014-03-040-0/+0
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6941a83c2dd34df606df13972576fbc23172c3c5': don't load property_contexts from /data
| | | | | * | | | don't load property_contexts from /dataNick Kralevich2014-03-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12613118 Change-Id: I5a84b13d2151075d5136e3682431fbcc9307df13 (cherry picked from commit dc3a42bb11dc2aefee37f799b5a1cce87cf35aaf)
* | | | | | | | | am 6bb6372b: am 508240c3: am 2a16a584: Merge "fix: making lsof show devies ↵Dmitriy Ivanov2014-03-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and loaded .so file names correctly" * commit '6bb6372b3ee930e2e8517262ec7db4f057a50725': fix: making lsof show devies and loaded .so file names correctly
| * | | | | | | | am 508240c3: am 2a16a584: Merge "fix: making lsof show devies and loaded .so ↵Dmitriy Ivanov2014-03-041-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file names correctly" * commit '508240c3798799e5d177d03604798f38366a4a4a': fix: making lsof show devies and loaded .so file names correctly
| | * | | | | | | am 2a16a584: Merge "fix: making lsof show devies and loaded .so file names ↵Dmitriy Ivanov2014-03-041-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly" * commit '2a16a5847a2811626a108f8cbd7606680647df86': fix: making lsof show devies and loaded .so file names correctly
| | | * | | | | | Merge "fix: making lsof show devies and loaded .so file names correctly"Dmitriy Ivanov2014-03-041-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | fix: making lsof show devies and loaded .so file names correctlyDmitriy Ivanov2014-03-041-1/+1
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b6f2e0015f8cfa18400fa4bd08460a07e29a51b
* | | | | | | | | am be2dfb68: am f773d127: resolved conflicts for merge of 4bf3bb67 to ↵Nick Kralevich2014-03-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit 'be2dfb684caf760937bae61b79c7dfe390be04d0': Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
| * | | | | | | | am f773d127: resolved conflicts for merge of 4bf3bb67 to ↵Nick Kralevich2014-03-040-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp * commit 'f773d127849b25838df032bced80ecf9f98a0633': Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.
| | * | | | | | | resolved conflicts for merge of 4bf3bb67 to klp-modular-dev-plus-aospNick Kralevich2014-03-040-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | Change-Id: I20b005efaa84d86d22f6af7a81ade36a606a1d21
| | | * | | | | | Merge "Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc ↵Daniel Cashman2014-03-041-1/+5
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file." into klp-modular-dev
| | | | * | | | | | Move creation of /data/misc/wifi and /data/misc/dhcp to main init.rc file.Stephen Smalley2014-02-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mkdir /data/misc/wifi subdirectories and /data/misc/dhcp is performed in the various device-specific init*.rc files but seems generic. Move it to the main init.rc file. Drop the separate chown for /data/misc/dhcp as this is handled by mkdir built-in if the directory already exists. Add a restorecon_recursive /data/misc/wifi/sockets. Change-Id: I51b09c5e40946673a38732ea9f601b2d047d3b62 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
* | | | | | | | | | am 3e36cbb0: am 7cd7ad52: am 5e96d89a: am 3530b9cd: am 02916aa2: Remove ↵Nick Kralevich2014-03-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obsolete vdc call. * commit '3e36cbb096ea6334e136446821fc2897a2e0c64e': Remove obsolete vdc call.
| * | | | | | | | | am 7cd7ad52: am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.Nick Kralevich2014-03-040-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7cd7ad5216d4c4946ebbefc78382ef78d510afc1': Remove obsolete vdc call.
| | * | | | | | | | am 5e96d89a: am 3530b9cd: am 02916aa2: Remove obsolete vdc call.Nick Kralevich2014-03-040-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e96d89aa5da72fdd20c719cd35eff36e27ecab2': Remove obsolete vdc call.
| | | * | | | | | | am 3530b9cd: am 02916aa2: Remove obsolete vdc call.Nick Kralevich2014-03-040-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | / / / / | | | | | |/ / / / | | | | |/| | | | * commit '3530b9cd4675a5e0c5c02dd765450b84ace67401': Remove obsolete vdc call.
| | | | * | | | | am 02916aa2: Remove obsolete vdc call.Nick Kralevich2014-03-042-16/+2
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | * commit '02916aa20e3ffbe4b738bb12dc1607a7ec6a8c37': Remove obsolete vdc call.
| | | | | * | | | Remove obsolete vdc call.Nick Kralevich2014-03-042-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since ca8e66a8b0f843812014a28d49208f9f6f64ecbc, init has been handling reboots and filesystem unmounts. Remove obsolete call to vdc. Bug: 12504045 Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881 (cherry picked from commit 225459a5da21e9397ca49b0d9af7d5fe3462706b)
* | | | | | | | | am 00eaae3a: am 556c9c24: am 858d0dd1: Merge "set ↵Mark Salyzyn2014-03-044-2/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /proc/sys/net/unix/max_dgram_qlen to large value" * commit '00eaae3aaa6ea3ca2c9c00e0559fa6937ce33e37': set /proc/sys/net/unix/max_dgram_qlen to large value
| * | | | | | | | am 556c9c24: am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to ↵Mark Salyzyn2014-03-044-2/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | large value" * commit '556c9c245de257efe8bda09ff23d2c4f7add5e49': set /proc/sys/net/unix/max_dgram_qlen to large value
| | * | | | | | | am 858d0dd1: Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"Mark Salyzyn2014-03-044-2/+9
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '858d0dd1e529575181abd8de607e46f7b273cc9d': set /proc/sys/net/unix/max_dgram_qlen to large value
| | | * | | | | | Merge "set /proc/sys/net/unix/max_dgram_qlen to large value"Mark Salyzyn2014-03-044-2/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | set /proc/sys/net/unix/max_dgram_qlen to large valueMark Salyzyn2014-03-034-2/+9
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - init: set /proc/sys/net/unix/max_dgram_qlen to 300 - libsysutils: Add listen backlog argument to startListener - logd: set listen backlog to 300 Change-Id: Id6d37d6c937ba2d221e76258d89c9516619caeec
* | | | | | | | | Merge "Adding opus to list of audio formats"Lajos Molnar2014-03-031-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Adding opus to list of audio formatsVignesh Venkatasubramanian2014-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding opus to the list of audio formats enum. This CL is part of adding Opus decoding support to android. Change-Id: I41decf426ed3f76c10b27f247b1264010689c759
* | | | | | | | | am b497340c: am a27fcee6: am ba23d539: Merge "Fix the handling of CodeCache ↵Jesse Hall2014-03-031-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return codes in pixelflinger" * commit 'b497340cb1c36b92fb298c52f041e1f9bdd990f2': Fix the handling of CodeCache return codes in pixelflinger
| * | | | | | | | am a27fcee6: am ba23d539: Merge "Fix the handling of CodeCache return codes ↵Jesse Hall2014-03-031-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in pixelflinger" * commit 'a27fcee621b5b680702ff5c30c858dbc5e287c51': Fix the handling of CodeCache return codes in pixelflinger
| | * | | | | | | am ba23d539: Merge "Fix the handling of CodeCache return codes in pixelflinger"Jesse Hall2014-03-031-2/+2
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'ba23d539328af36b2040a5bcbdcc840810a4df51': Fix the handling of CodeCache return codes in pixelflinger
| | | * | | | | | Merge "Fix the handling of CodeCache return codes in pixelflinger"Jesse Hall2014-03-031-2/+2
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | Fix the handling of CodeCache return codes in pixelflingerKévin PETIT2014-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error condition was not correctly detected: an error was reported by checking that the index returned by CodeCache::cache was non-zero. This did not work because this function can return a positive value on success. Change-Id: I1f90125ee62ab277b80da4dfb341733cd6e8e86a Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | | | | | | | | am 2ae567c8: am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) ↵Elliott Hughes2014-03-013-12/+41
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uid_from_user." * commit '2ae567c82ee34fb7e51e797fce140313de34338b': Declare (and simplify) uid_from_user.
| * | | | | | | | am 1a5bc28f: am a0e4d164: Merge "Declare (and simplify) uid_from_user."Elliott Hughes2014-03-013-12/+41
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a5bc28faed5e2060a6f3e1b8135fe82dc2cb319': Declare (and simplify) uid_from_user.
| | * | | | | | | am a0e4d164: Merge "Declare (and simplify) uid_from_user."Elliott Hughes2014-03-013-12/+41
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0e4d1643cc74748c3b5b05da0d41b7dbcda23e5': Declare (and simplify) uid_from_user.