OSDN Git Service
Yabin Cui [Mon, 4 May 2015 22:47:15 +0000 (22:47 +0000)]
Merge "Implement simpleperf record/dumprecord subcommands."
Yabin Cui [Tue, 28 Apr 2015 22:54:13 +0000 (15:54 -0700)]
Implement simpleperf record/dumprecord subcommands.
Bug:
19483574
Change-Id: Id879713a75c2d3a6289d8847b95ee0bb4a2cc8a0
Colin Cross [Sun, 3 May 2015 21:17:40 +0000 (21:17 +0000)]
Merge "Fix asan error when copying super block to backup super blocks"
Colin Cross [Sun, 3 May 2015 21:09:52 +0000 (14:09 -0700)]
Fix asan error when copying super block to backup super blocks
Address santizier caught a bug where we memcpy a full block size into
the backup super block, but the source may be offset 1024 bytes into
a block size allocation. The destination buffer is zeroed by calloc,
so just copy the super block size instead.
Change-Id: I87af8e3349a63940905697466f62532c50fab720
Paul Lawrence [Fri, 1 May 2015 14:44:42 +0000 (14:44 +0000)]
Merge "Enable properties in ext4enc"
Elliott Hughes [Thu, 30 Apr 2015 17:56:52 +0000 (17:56 +0000)]
Merge "Update simpleperf path to /system/xbin/simpleperf."
Dehao Chen [Thu, 30 Apr 2015 17:54:26 +0000 (10:54 -0700)]
Update simpleperf path to /system/xbin/simpleperf.
Change-Id: Ib326b1669553146e028c8354bb5077176d150616
Paul Lawrence [Wed, 15 Apr 2015 21:11:07 +0000 (14:11 -0700)]
Enable properties in ext4enc
Enables OwnerInfo and pattern suppression
Change-Id: I4a7d71c9a750d5ed996ab1937bd5a81da480a2b3
Paul Lawrence [Thu, 30 Apr 2015 16:28:50 +0000 (16:28 +0000)]
Merge "New ext4enc kernel switching from xattrs to ioctl"
Paul Lawrence [Fri, 10 Apr 2015 14:47:30 +0000 (07:47 -0700)]
New ext4enc kernel switching from xattrs to ioctl
This is one of three changes to enable this functionality:
https://android-review.googlesource.com/#/c/146259/
https://android-review.googlesource.com/#/c/146264/
https://android-review.googlesource.com/#/c/146265/
Bug:
18151196
Change-Id: I05b96f49b8848e82484a500e4536bdb4d2cdd635
Elliott Hughes [Thu, 30 Apr 2015 00:49:16 +0000 (00:49 +0000)]
Merge "Switch perfprofd from using full to lite version of protobuf library."
Elliott Hughes [Wed, 29 Apr 2015 22:06:44 +0000 (22:06 +0000)]
Merge "Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified."
Dehao Chen [Wed, 29 Apr 2015 20:31:48 +0000 (13:31 -0700)]
Default the config file to NULL for perfprofd, so that we will not see error in logcat when config file is not specified.
Change-Id: Ib6a442726b687f8aaec27dee30962cf3cc820918
Than McIntosh [Wed, 29 Apr 2015 18:48:32 +0000 (14:48 -0400)]
Switch perfprofd from using full to lite version of protobuf library.
Change-Id: Ie4cf7cd2e6e4f90bcdba39200c856c219b710065
Paul Lawrence [Wed, 29 Apr 2015 16:24:25 +0000 (16:24 +0000)]
Merge "Securely encrypt the master key"
Colin Cross [Wed, 29 Apr 2015 00:38:58 +0000 (00:38 +0000)]
Merge "make_ext4fs: write out super blocks at last for block devices"
Eric Miao [Thu, 16 Apr 2015 22:00:11 +0000 (15:00 -0700)]
make_ext4fs: write out super blocks at last for block devices
Change-Id: I93ee37a649aabff14464030efd88f79e1ae324f0
Signed-off-by: Eric Miao <emiao@nvidia.com>
Paul Lawrence [Tue, 28 Apr 2015 22:13:04 +0000 (22:13 +0000)]
Securely encrypt the master key
Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.
Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/148586/
https://android-review.googlesource.com/#/c/148604/
https://android-review.googlesource.com/#/c/148606/
https://android-review.googlesource.com/#/c/148607/
Bug:
18151196
Change-Id: I7a4ef3f3a937c45ff18f17c9ad1398293a8630f3
Colin Cross [Tue, 28 Apr 2015 22:05:34 +0000 (22:05 +0000)]
Merge "Add real UUID support to ext4_utils."
Jeff Sharkey [Tue, 7 Apr 2015 05:29:04 +0000 (22:29 -0700)]
Add real UUID support to ext4_utils.
For some unknown reason, we've always been generating the same UUID
for every single ext4 partition that we formatted. Yikes.
Add a flag to request that a real UUID be generated when creating
filesystem.
(cherry-picked from
7538cc97e1695608123739d6ef8ff2ee1572aaec)
Bug:
19993667
Change-Id: I6f3f6aa373021cb8b6779e5354ac36436c4d98d3
Paul Lawrence [Tue, 28 Apr 2015 19:16:07 +0000 (19:16 +0000)]
Merge "Revert "Securely encrypt the master key""
Paul Lawrence [Tue, 28 Apr 2015 19:15:58 +0000 (19:15 +0000)]
Revert "Securely encrypt the master key"
This reverts commit
af2359fdc4a45fcf482d1a316bae1fff226c425b.
Change-Id: Icd4d04adf5c0728357caa6eb225b9a08fd0ad552
Elliott Hughes [Tue, 28 Apr 2015 18:12:50 +0000 (18:12 +0000)]
Merge "Build simpleperf in user-debug mode, and put it in /system/xbin/."
Elliott Hughes [Tue, 28 Apr 2015 00:03:54 +0000 (00:03 +0000)]
Merge "Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/"
Dehao Chen [Mon, 27 Apr 2015 22:34:09 +0000 (15:34 -0700)]
Build simpleperf in user-debug mode, and put it in /system/xbin/.
Change-Id: I83cf2bece5491ab88cd8ceff7fdd8f563d50f18f
Dehao Chen [Mon, 27 Apr 2015 22:25:39 +0000 (15:25 -0700)]
Build perfprofd and its libraries in userdebug mode only, and store it in /system/xbin/
Change-Id: I77c4176b75018aedc8a8d6e4633109367cc0b304
Paul Lawrence [Mon, 27 Apr 2015 20:08:51 +0000 (20:08 +0000)]
Merge "Securely encrypt the master key"
Paul Lawrence [Tue, 31 Mar 2015 18:18:31 +0000 (11:18 -0700)]
Securely encrypt the master key
Move functionality from init into vold so we can use
vold to manage key encryption
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/144586/
https://android-review.googlesource.com/#/c/144663/
https://android-review.googlesource.com/#/c/144672/
https://android-review.googlesource.com/#/c/144673/
Bug:
18151196
Change-Id: I4a1c79d27f0d225a9ce4ac21653279919f75c991
Colin Cross [Fri, 24 Apr 2015 21:58:46 +0000 (21:58 +0000)]
Merge "fix possible buffer overrun in librank"
Yabin Cui [Thu, 23 Apr 2015 23:01:30 +0000 (23:01 +0000)]
Merge "Implement simpleperf stat subcommand."
Yabin Cui [Tue, 21 Apr 2015 01:07:17 +0000 (18:07 -0700)]
Implement simpleperf stat subcommand.
Also add some simple unit-tests.
Change-Id: Ic30a2d4a879e028a8c82babbaf82e322fc49a838
Than McIntosh [Thu, 23 Apr 2015 00:31:24 +0000 (00:31 +0000)]
Merge "Second round of changes to 'perf' profile collection daemon."
daegeun.song [Wed, 22 Apr 2015 02:31:29 +0000 (11:31 +0900)]
fix possible buffer overrun in librank
Use snprintf instead of sprintf and fclose() before return.
Change-Id: I2c367b2e7b943f4ed10551c18ecc971e6b830c66
Signed-off-by: Daegeun Song <daegeun.song@lge.com>
Than McIntosh [Fri, 17 Apr 2015 19:10:43 +0000 (15:10 -0400)]
Second round of changes to 'perf' profile collection daemon.
Details:
- avoid use of system() in favor of fork/exec.
- add option to selectively disable/enable mpdecision service around perf
collection runs to improve profile quality and avoid kernel pmuevents issues.
- default to using 'simpleperf' instead of 'perf'
Change-Id: I27928d8bb647fd852ec944158ebfd8efa38c01b4
Colin Cross [Wed, 22 Apr 2015 17:57:32 +0000 (17:57 +0000)]
Merge "Do free and fclose when error occur."
daegeun.song [Wed, 22 Apr 2015 05:14:02 +0000 (14:14 +0900)]
Do free and fclose when error occur.
Do free and fclose when error occur.
Change-Id: Ifc611579cf919eeb3fbbf1dff70e7f851a26e083
Signed-off-by: Daegeun Song <daegeun.song@lge.com>
Yabin Cui [Sat, 18 Apr 2015 21:13:26 +0000 (21:13 +0000)]
Merge "Implement simpleperf list subcommand."
Yabin Cui [Thu, 16 Apr 2015 22:26:31 +0000 (15:26 -0700)]
Implement simpleperf list subcommand.
simpleperf is used to replace linux/tools/perf. And This CL implements
the list subcommand of it.
Change-Id: I3e6fe854e19cc370070d0fd8416d0aa6fa8f8e90
Mark Salyzyn [Thu, 16 Apr 2015 18:02:41 +0000 (18:02 +0000)]
Merge "f2fs_utils: fix build break in static_sdk_tools"
Mark Salyzyn [Thu, 16 Apr 2015 16:56:36 +0000 (09:56 -0700)]
f2fs_utils: fix build break in static_sdk_tools
external/f2fs-tools/mkfs/f2fs_format.c:357:
error: undefined reference to dev_read_version
clang: error:
linker command failed with exit code 1 (use -v to see invocation)
make: *** [out/host/linux-x86/obj/lib/libf2fs_fmt_host_dyn.so] Error 1
Change-Id: I9bf1eec9ee60aa2fc55a3d0793a67d36f271acef
Mark Salyzyn [Wed, 15 Apr 2015 18:14:37 +0000 (18:14 +0000)]
Merge "make_ext4fs: use libcutils and libselinux shared libraries"
Elliott Hughes [Wed, 15 Apr 2015 17:59:52 +0000 (17:59 +0000)]
Merge "Move away from gr_surface."
Elliott Hughes [Wed, 15 Apr 2015 17:23:15 +0000 (10:23 -0700)]
Move away from gr_surface.
Change-Id: Id23940a2e92bbfd56a2f2e1e021fb89114830dd4
Mark Salyzyn [Tue, 7 Apr 2015 16:36:29 +0000 (09:36 -0700)]
make_ext4fs: use libcutils and libselinux shared libraries
- move libcutils and libselinux as shared now that they are
in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging
Bug:
19908228
Change-Id: I85d6d0c1fd5cf22f7328fdfcbe9a8511a552857c
Paul Crowley [Thu, 9 Apr 2015 15:55:35 +0000 (15:55 +0000)]
Merge "select(2) is bad, always use poll(2). Also remove unnecessary loop."
Paul Crowley [Thu, 9 Apr 2015 09:18:54 +0000 (10:18 +0100)]
select(2) is bad, always use poll(2). Also remove unnecessary loop.
Change-Id: I18cb8d75945413e35dc904bc95362d9b579cb336
Christopher Ferris [Wed, 8 Apr 2015 22:28:38 +0000 (22:28 +0000)]
Merge "Add memmove benchmarking."
Christopher Ferris [Wed, 8 Apr 2015 22:21:42 +0000 (15:21 -0700)]
Add memmove benchmarking.
Change-Id: I75bb907f5633d155cd411941ea6d9d39b9787983
Elliott Hughes [Tue, 7 Apr 2015 20:10:14 +0000 (20:10 +0000)]
Merge "Perf profile collection daemon."
Than McIntosh [Thu, 5 Mar 2015 16:05:02 +0000 (11:05 -0500)]
Perf profile collection daemon.
Collects system-wide profiles via periodic invocation of
/system/bin/perf, placing the resulting data files in a destination
directory selected via config file. Behavior of the daemon, e.g how
often to profile, duration of profiling runs, etc, can also be
controlled with config file settings.
Change-Id: I7978cab62aa0c2507ecf8d70ba073e77db730120
Mohamad Ayyash [Tue, 7 Apr 2015 01:24:21 +0000 (01:24 +0000)]
Merge "Introduce squashfs-utils that includes helper functions"
Mohamad Ayyash [Thu, 2 Apr 2015 02:25:28 +0000 (19:25 -0700)]
Introduce squashfs-utils that includes helper functions
For example: extracting filesystem size from superblock
Change-Id: I97c79d80ebb767a977c8ca27f7e0877b5ead8fdc
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Mark Salyzyn [Mon, 6 Apr 2015 19:41:07 +0000 (19:41 +0000)]
Merge "ext_utils: xattr_free_space assert"
Mark Salyzyn [Mon, 6 Apr 2015 19:37:28 +0000 (12:37 -0700)]
ext_utils: xattr_free_space assert
Commit
636d848860e5eac4225a830706fc34d48d8cc01e failed
to modify the assert checking to compensate for the
four null bytes.
Change-Id: Iec618f94f05f8700683507a3c797521689103b5a
Mark Salyzyn [Mon, 6 Apr 2015 19:22:48 +0000 (19:22 +0000)]
Merge "ext4_utils: xattr_assert_sane false positives"
Mark Salyzyn [Mon, 6 Apr 2015 19:16:42 +0000 (12:16 -0700)]
ext4_utils: xattr_assert_sane false positives
xattr_free_space() does not match kernel, it subtracts
sizeof(__u32) as a buffer zone to permit IS_LAST_ENTRY
to function. As documented in .../linux/fs/ext4/xattr.c:
+------------------+
| header |
| entry 1 | |
| entry 2 | | growing downwards
| entry 3 | v
| four null bytes | <<<< HERE is why sizeof(__u32)
| . . . |
| value 1 | ^
| value 3 | | growing upwards
| value 2 | |
+------------------+
Change-Id: Iee6e4e90664a3c2c5056006870b0f2f22b236bad
Elliott Hughes [Sat, 4 Apr 2015 19:06:34 +0000 (19:06 +0000)]
Merge "Fix missing '\n's in kernel logging."
Elliott Hughes [Sat, 4 Apr 2015 19:03:52 +0000 (12:03 -0700)]
Fix missing '\n's in kernel logging.
Change-Id: I3a127b2d50012fec2f91fd302bbc611e47e04aff
Mark Salyzyn [Thu, 2 Apr 2015 20:59:05 +0000 (20:59 +0000)]
Merge "ext4_utils: move fs_config to libcutils"
Mark Salyzyn [Wed, 1 Apr 2015 14:31:14 +0000 (07:31 -0700)]
ext4_utils: move fs_config to libcutils
Bug:
19908228
Change-Id: Ic868d3e71d2a166603f3f0618aca5ea69639bdaf
Paul Lawrence [Thu, 2 Apr 2015 15:39:01 +0000 (15:39 +0000)]
Merge "ext4_utils: Abstracting ext4 encryption property system"
Paul Lawrence [Mon, 16 Mar 2015 22:35:55 +0000 (15:35 -0700)]
ext4_utils: Abstracting ext4 encryption property system
Change-Id: Iddca42328e9249eb09eb68e6d5339a02cfebecd0
Mohamad Ayyash [Wed, 1 Apr 2015 17:35:05 +0000 (17:35 +0000)]
Merge "build_verity_tree: Add verbose flag"
Sami Tolvanen [Wed, 1 Apr 2015 17:02:48 +0000 (17:02 +0000)]
Merge "slideshow: fix format string type"
Sami Tolvanen [Wed, 1 Apr 2015 16:53:41 +0000 (17:53 +0100)]
slideshow: fix format string type
Format string specifies %u, even though long int is passed.
Change-Id: I541c15552e403e16bef7a78f53d81eaacb605120
Mohamad Ayyash [Tue, 31 Mar 2015 19:27:29 +0000 (12:27 -0700)]
build_verity_tree: Add verbose flag
Change-Id: I0c5607f7aa5e964abc2031bbe71ff5c6e6ef56cc
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Elliott Hughes [Tue, 31 Mar 2015 01:36:03 +0000 (01:36 +0000)]
Merge "fs_mgr exports its headers."
Elliott Hughes [Tue, 31 Mar 2015 00:48:49 +0000 (17:48 -0700)]
fs_mgr exports its headers.
Change-Id: I6fddb60a902be5ac216d32a751ec8c178c26ebaf
Paul Lawrence [Mon, 30 Mar 2015 16:51:54 +0000 (16:51 +0000)]
Merge "Clean up includes"
Paul Lawrence [Mon, 30 Mar 2015 16:16:09 +0000 (09:16 -0700)]
Clean up includes
Remove two system files
Remove a circular include dependency by using a callback function
Change-Id: I159357b3a0ad06d0a7ebf45feb82989bcc1b303a
Elliott Hughes [Sat, 28 Mar 2015 17:49:57 +0000 (17:49 +0000)]
Merge "Don't #include "../"."
Elliott Hughes [Sat, 28 Mar 2015 17:39:46 +0000 (10:39 -0700)]
Don't #include "../".
If you have to use a relative path (especially one out of the current
git project), you probably shouldn't be using those headers...
(cherrypick of
0c58a04b5567b84a13269835d9365a045d85b95e.)
Change-Id: Ifef6945cf1e884a4aa7f8f5532f1de660a22dafc
Paul Lawrence [Fri, 27 Mar 2015 20:36:19 +0000 (20:36 +0000)]
Merge "[HACK] Adding e4crypt support"
Paul Lawrence [Wed, 25 Feb 2015 23:11:13 +0000 (15:11 -0800)]
[HACK] Adding e4crypt support
This is a dirty hack requiring a lot of clean up.
Needed to allow other parts to make progress.
Add e4crypt functions to libext4_utils
Add e4crypt command line tool
Change-Id: Iac5ae75e7f39cccc87701faf1f590e44f5209c0e
Elliott Hughes [Fri, 27 Mar 2015 02:01:27 +0000 (02:01 +0000)]
Merge "Special-case "su --help"."
Elliott Hughes [Fri, 27 Mar 2015 00:09:41 +0000 (17:09 -0700)]
Special-case "su --help".
Rather than force people to move from "su system echo -n hello", where
the -n gets interpreted by getopt_long(3), to "su system -- echo -n hello",
just hard-code the recognition of --help. This seems easier than moving
people over to the more traditional "su -c 'echo -n hello'" style.
Bug:
19948740
Change-Id: I248269343b452a381effb7b8926ac7f2522b941b
Elliott Hughes [Tue, 24 Mar 2015 03:41:09 +0000 (03:41 +0000)]
Merge "Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP."
Elliott Hughes [Tue, 24 Mar 2015 03:20:54 +0000 (20:20 -0700)]
Use PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP.
Change-Id: Ifa87d9a9406acec1d5cdf7dd63af0df52c5cfb3c
Kenny Root [Wed, 18 Mar 2015 17:35:47 +0000 (17:35 +0000)]
Merge "system/extras/verity: BoringSSL fix."
Elliott Hughes [Wed, 18 Mar 2015 15:47:55 +0000 (15:47 +0000)]
Merge "Remove perm_checker and mounts-test.sh."
Elliott Hughes [Wed, 18 Mar 2015 15:37:08 +0000 (08:37 -0700)]
Remove perm_checker and mounts-test.sh.
These are enforced by SELinux and tested by CTS now.
Change-Id: If506327f108c39449c611264a10623be9f1782fa
Sami Tolvanen [Wed, 18 Mar 2015 09:02:13 +0000 (09:02 +0000)]
Merge "Add 64 bit support to verity build."
Elliott Hughes [Wed, 18 Mar 2015 04:30:03 +0000 (04:30 +0000)]
Merge "su should reset PATH, IFS, LOGNAME, and USER."
Elliott Hughes [Wed, 18 Mar 2015 04:19:25 +0000 (21:19 -0700)]
su should reset PATH, IFS, LOGNAME, and USER.
Also add -h and --help while we're here (since all the toybox commands carry
their own documentation, and our su isn't much like the real su).
Bug:
19647373
Bug:
19564110
Change-Id: If2e6117b6701dcac03b5831f251e60a272bf0d61
Elliott Hughes [Tue, 17 Mar 2015 21:14:28 +0000 (21:14 +0000)]
Merge "Fix su."
Adam Langley [Tue, 17 Mar 2015 21:08:40 +0000 (14:08 -0700)]
system/extras/verity: BoringSSL fix.
In BoringSSL, the functions that references BIOs have been moved out of
ERR in order to have some reasonable layering of the code.
A recent addition here referenced ERR_print_errors, which is now
BIO_print_errors in BoringSSL for that reason. Additionally, the
BoringSSL headers don't #include so many standard headers for you so an
explicit #include of errno.h is needed here.
Change-Id: Iebcc353b1354bd85d432deebeb7873aae46b0d2a
Elliott Hughes [Tue, 17 Mar 2015 19:35:45 +0000 (12:35 -0700)]
Fix su.
Manually NULL-terminate the arguments array instead of trying to use memset.
This was accidentally working on LP64 but fails reliably on LP32.
Change-Id: Ic2ecb8ed2019f260c720f27dbd018a55e7cfa569
Elliott Hughes [Sun, 15 Mar 2015 17:00:43 +0000 (17:00 +0000)]
Merge "Clean up su."
Elliott Hughes [Sat, 14 Mar 2015 17:15:06 +0000 (10:15 -0700)]
Clean up su.
Stop building su as a static executable. We don't rely on the getuid
implementation for security, so we have nothing to fear from the dynamic
linker.
Add some missing error checking and improve error reporting.
Remove various special cases that can all be rolled into the general
case.
Bug:
19647373
Change-Id: I2689b8957a89da1f3be571fcdc966b1084efca9a
Qin Ying [Tue, 14 Oct 2014 02:53:23 +0000 (11:53 +0900)]
Add 64 bit support to verity build.
Now build verity only support 32bit environment, when the image
size is bigger than 2^32 the verity image size calculation will
be mistake.
Change-Id: I41e5fe720c1269d6c06e23bfce5bc65226fb6e77
Lorenzo Colitti [Thu, 5 Mar 2015 08:35:35 +0000 (08:35 +0000)]
am
d62c4159: Merge "Add tests for cross-family bind() and connect() operations."
* commit '
d62c415953ebc69b179cc2d250965754917dccd9':
Add tests for cross-family bind() and connect() operations.
Lorenzo Colitti [Thu, 5 Mar 2015 08:29:01 +0000 (08:29 +0000)]
Merge "Add tests for cross-family bind() and connect() operations."
Lorenzo Colitti [Tue, 3 Mar 2015 06:30:23 +0000 (15:30 +0900)]
Add tests for cross-family bind() and connect() operations.
Change-Id: Ie11d593c1ed16e674da6f64dc153dd15b9a4c988
Mohamad Ayyash [Wed, 4 Mar 2015 03:04:16 +0000 (03:04 +0000)]
am
7846062d: Merge "Introduce mksquashfsimage.sh"
* commit '
7846062d8e8b545f8a54a0ddc950f3e9fb7f5eb1':
Introduce mksquashfsimage.sh
Mohamad Ayyash [Wed, 4 Mar 2015 02:58:26 +0000 (02:58 +0000)]
Merge "Introduce mksquashfsimage.sh"
Mohamad Ayyash [Tue, 3 Mar 2015 20:33:48 +0000 (12:33 -0800)]
Introduce mksquashfsimage.sh
Change-Id: I2b916ef3ef60b40f506e1f1be59482f7b071cdb2
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
Lorenzo Colitti [Tue, 3 Mar 2015 12:57:52 +0000 (12:57 +0000)]
am
f924e231: Merge "Make UID rules specify "iif lo" to match real device configs."
* commit '
f924e231377fbf13c9ec352b5de0e79501c41c0f':
Make UID rules specify "iif lo" to match real device configs.
Lorenzo Colitti [Tue, 3 Mar 2015 12:51:23 +0000 (12:51 +0000)]
Merge "Make UID rules specify "iif lo" to match real device configs."
Lorenzo Colitti [Tue, 3 Mar 2015 06:29:10 +0000 (15:29 +0900)]
Make UID rules specify "iif lo" to match real device configs.
Change-Id: Ieddb54dfdf0ea66a13f5ebd3fbeeea786e0c1505
Lorenzo Colitti [Tue, 3 Mar 2015 08:19:25 +0000 (08:19 +0000)]
am
312d567a: Merge "Add Python wrappers for bind and connect as well as sendmsg."
* commit '
312d567ad893f2bab54970471b716e46d68dfcaf':
Add Python wrappers for bind and connect as well as sendmsg.