Commit Graph

28516 Commits

Author SHA1 Message Date
Jeff Sharkey ac13675071 Merge "Define range of GIDs for cached app data."
am: da94f09e22

Change-Id: I5db07df01d02b7612d89bca226536cc6461d44b0
2016-12-15 21:52:05 +00:00
Jeff Sharkey da94f09e22 Merge "Define range of GIDs for cached app data." 2016-12-15 21:46:31 +00:00
Colin Cross da9bd5902f Convert the rest of libbacktrace to Android.bp
See build/soong/README.md for more information.

Reapplies I61c49fb62fdeafb66db25b8f97621239b8fd6e75 after fixing
an unused parameter warning on mips builds.

Test: mma -j
Test: backtrace_test
Change-Id: I6dc353a274cafcdb05ee866b41c3c2731612941c
2016-12-15 12:57:47 -08:00
Colin Cross 06d314917f Fix unused parameter warning for mips builds
libbacktrace_offline was inheriting -Wno-unused-parameter from llvm's
makefiles.  Fix an unused parameter warning when compiling for an
unsupported architecture, and return false since *value wasn't
written.

Test: lunch aosp_mips-eng && mma -j
Change-Id: I7df990f01e1025ca17ec3717107df56d2349f3cb
2016-12-15 12:57:45 -08:00
Colin Cross 6b1a1badd0 Merge "Revert "Convert the rest of libbacktrace to Android.bp""
am: 049376f14d

Change-Id: I697ea2eb0612a905868f40a63229c8e3e74b70b3
2016-12-15 20:54:15 +00:00
Colin Cross 049376f14d Merge "Revert "Convert the rest of libbacktrace to Android.bp"" 2016-12-15 20:44:56 +00:00
Colin Cross ced030892d Revert "Convert the rest of libbacktrace to Android.bp"
This reverts commit 9a3603622f.

Broke the mips build with an unused parameter warning

Change-Id: If36964ea189b58a9825de8904f1cf49010548b59
2016-12-15 20:44:30 +00:00
Colin Cross eb5763d177 Merge "Convert the rest of libbacktrace to Android.bp" am: 28f7749b12 am: 6d2af9a8b9 am: bfbf7403de
am: e9285d6c04

Change-Id: I5bd9cdb1528271bca674a58ac2a2c6541202346e
2016-12-15 19:56:29 +00:00
Colin Cross e9285d6c04 Merge "Convert the rest of libbacktrace to Android.bp" am: 28f7749b12 am: 6d2af9a8b9
am: bfbf7403de

Change-Id: I3493f961b0e2aa9345d91bc98f7116291e96f865
2016-12-15 19:48:58 +00:00
Colin Cross bfbf7403de Merge "Convert the rest of libbacktrace to Android.bp" am: 28f7749b12
am: 6d2af9a8b9

Change-Id: I95d1f14ac02808302b86e7c5a7dfcebdaaeb9fbd
2016-12-15 19:40:57 +00:00
Colin Cross 6d2af9a8b9 Merge "Convert the rest of libbacktrace to Android.bp"
am: 28f7749b12

Change-Id: I924ab33de1688124c24fcf296848244d8b40b2f8
2016-12-15 19:33:24 +00:00
Colin Cross 28f7749b12 Merge "Convert the rest of libbacktrace to Android.bp" 2016-12-15 19:19:07 +00:00
Charles He 740bc012f2 Merge "[nit] Fix typo in properties.h" am: ded663c231 am: 21181e5297 am: d887102049
am: 551a396b15

Change-Id: I9b750104ab4615c5a3ea16c822d98e54dcd6bb14
2016-12-15 17:55:47 +00:00
Charles He 551a396b15 Merge "[nit] Fix typo in properties.h" am: ded663c231 am: 21181e5297
am: d887102049

Change-Id: I566cc4b5a8a9b41c3298492ae547e90d764257ac
2016-12-15 17:47:43 +00:00
Charles He d887102049 Merge "[nit] Fix typo in properties.h" am: ded663c231
am: 21181e5297

Change-Id: I5625fb263d54f107a5b630037811c4d0d701ba86
2016-12-15 17:39:43 +00:00
Charles He 21181e5297 Merge "[nit] Fix typo in properties.h"
am: ded663c231

Change-Id: If7edd9aa3b06feeebf35585b53313b1b3b0ebf8e
2016-12-15 17:31:42 +00:00
Treehugger Robot ded663c231 Merge "[nit] Fix typo in properties.h" 2016-12-15 17:22:04 +00:00
Charles He 40feda6ae9 [nit] Fix typo in properties.h
Test: none
Change-Id: I6fe25bc9404c18bedc5802b3d830ede8a1bc28df
2016-12-15 10:47:32 +00:00
Daichi Hirono 99b5f81595 Merge "Support SOCK_STREAM for bridge between system and app" am: 89ae81da76 am: 43418b52d7 am: b24e35e6bf
am: fed4aba6c2

Change-Id: Id3f068a0b2ff397d36d041374314a33c12195dae
2016-12-15 07:50:28 +00:00
Daichi Hirono fed4aba6c2 Merge "Support SOCK_STREAM for bridge between system and app" am: 89ae81da76 am: 43418b52d7
am: b24e35e6bf

Change-Id: I7159aa5ea207e0f0e55ac4a3b49b7d0905ef23cd
2016-12-15 07:34:48 +00:00
Daichi Hirono b24e35e6bf Merge "Support SOCK_STREAM for bridge between system and app" am: 89ae81da76
am: 43418b52d7

Change-Id: I6da2a3a2f02346abeb06f7d3bd380011a6a3ba01
2016-12-15 07:21:25 +00:00
Daichi Hirono 43418b52d7 Merge "Support SOCK_STREAM for bridge between system and app"
am: 89ae81da76

Change-Id: I4f0832d0d54c7d08c42bfedb482adfd26f562366
2016-12-15 07:04:23 +00:00
Treehugger Robot 89ae81da76 Merge "Support SOCK_STREAM for bridge between system and app" 2016-12-15 06:47:38 +00:00
TreeHugger Robot 937a5bc881 Merge "Regenerate graphics-base.h" 2016-12-15 06:40:27 +00:00
Josh Gao 61694c55f3 Merge "adb: don't require adb keys to be named "*.adb_key"." am: 37883718a9 am: ffb0576c7b am: 747049e527
am: 8a98ad9cfe

Change-Id: I8e69e2b4dedf5bded1714fe9492ed3789e112eb1
2016-12-15 06:38:36 +00:00
Josh Gao 8a98ad9cfe Merge "adb: don't require adb keys to be named "*.adb_key"." am: 37883718a9 am: ffb0576c7b
am: 747049e527

Change-Id: I903a1b4be2beabe666964ac96918b98c6f0489a8
2016-12-15 06:31:04 +00:00
Josh Gao 747049e527 Merge "adb: don't require adb keys to be named "*.adb_key"." am: 37883718a9
am: ffb0576c7b

Change-Id: I70b9a6ee90d57c8d4085f45bfc7ddf0e3cf711fa
2016-12-15 06:23:31 +00:00
Josh Gao ffb0576c7b Merge "adb: don't require adb keys to be named "*.adb_key"."
am: 37883718a9

Change-Id: I0a1463180019960e92fbd3c06befcdc3c182f261
2016-12-15 06:16:00 +00:00
Treehugger Robot 37883718a9 Merge "adb: don't require adb keys to be named "*.adb_key"." 2016-12-15 06:04:05 +00:00
Romain Guy 631e0b7dfc Regenerate graphics-base.h
Bug: 32984164
Test: hidl-gen -o system/core/include/system/graphics-base.h -Lexport-header
-r android.hardware:hardware/interfaces
android.hardware.graphics.common@1.0 and compilation

Change-Id: Ied7f53c97b94eb15e11e26db4e73a568cfd982bb
2016-12-14 18:29:28 -08:00
Ajay Panicker ba1324c740 Allow bluetooth service to access bluetooth directory and add /logs (2/14) am: 03067a21e7 -s ours
am: 883306cb62

Change-Id: If914cb3022e6198f05f13b977d72c7adac03e88d
2016-12-15 01:51:10 +00:00
Ajay Panicker 883306cb62 Allow bluetooth service to access bluetooth directory and add /logs (2/14)
am: 03067a21e7  -s ours

Change-Id: I13e0b2d83c32d44ecba70b37f39d7d717b9bd368
2016-12-15 01:44:58 +00:00
Elliott Hughes 400628aeac Improve crasher.
Make it behave better in our typical use cases and support more of the kinds
of crash we want to document.

Bug: http://b/28746168
Test: crasher
Change-Id: Ifbc3dfb042f6055568244c921f4abe1ea554cec4
2016-12-14 17:33:46 -08:00
Romain Guy eef1854f48 Merge "Prevent conflict with deprecated pixel format constants" 2016-12-15 01:27:28 +00:00
Colin Cross 9a3603622f Convert the rest of libbacktrace to Android.bp
See build/soong/README.md for more information.

Test: mma -j
Test: backtrace_test
Change-Id: I61c49fb62fdeafb66db25b8f97621239b8fd6e75
2016-12-14 17:24:46 -08:00
Josh Gao a27666b823 adb: don't require adb keys to be named "*.adb_key".
Don't require the extension on explicit file paths passed on; only
check for it in monitored directories.

Bug: http://b/33638233
Test: ADB_TRACE=1 ADB_VENDOR_KEYS=$HOME/foo adb server nodaemon
Change-Id: I7387e0bbe0f2e16878bf22b05d5c6e8d0f9e5a92
2016-12-14 17:05:36 -08:00
Josh Gao eac988cdd9 Merge "adb: remove extraneous stat in sync_recv." am: e69e9be7b6 am: f7d0ac101c am: f9351bf971
am: 285017efa7

Change-Id: I34995899acb1af24a7b2a177fdc25c820089d46f
2016-12-14 21:40:47 +00:00
Tao Bao e4fe83dc00 Merge "init: Specify the data wipe reason." am: d9b9ebb887 am: 431b41b320 am: c8ebc133a2
am: 6be6a4fdb4

Change-Id: I7554ad98473a70669434ac4dcea5bf6ff542b7ce
2016-12-14 21:40:31 +00:00
Josh Gao 285017efa7 Merge "adb: remove extraneous stat in sync_recv." am: e69e9be7b6 am: f7d0ac101c
am: f9351bf971

Change-Id: I200fefa85d8877bfbf86860494468b92f1621957
2016-12-14 21:33:39 +00:00
Tao Bao 6be6a4fdb4 Merge "init: Specify the data wipe reason." am: d9b9ebb887 am: 431b41b320
am: c8ebc133a2

Change-Id: Idb25388582595642b47e6049cb425e3e561db974
2016-12-14 21:33:27 +00:00
Josh Gao f9351bf971 Merge "adb: remove extraneous stat in sync_recv." am: e69e9be7b6
am: f7d0ac101c

Change-Id: I4cb529709456361059217b509c3705dddadf0871
2016-12-14 21:29:31 +00:00
Tao Bao c8ebc133a2 Merge "init: Specify the data wipe reason." am: d9b9ebb887
am: 431b41b320

Change-Id: Idaa2d5ff62b4fc7e98e3d6d8ebadb5e393516198
2016-12-14 21:29:17 +00:00
Josh Gao f7d0ac101c Merge "adb: remove extraneous stat in sync_recv."
am: e69e9be7b6

Change-Id: I357397b3b9b4bc90573c21c4053f62133973674b
2016-12-14 21:20:39 +00:00
Tao Bao 431b41b320 Merge "init: Specify the data wipe reason."
am: d9b9ebb887

Change-Id: I9e4ee4b3b2a46f8a293d761678e9b2f23ba0680f
2016-12-14 21:20:26 +00:00
Treehugger Robot e69e9be7b6 Merge "adb: remove extraneous stat in sync_recv." 2016-12-14 21:11:23 +00:00
Treehugger Robot d9b9ebb887 Merge "init: Specify the data wipe reason." 2016-12-14 21:08:40 +00:00
Tao Bao fdf1a54f45 init: Specify the data wipe reason.
We should say that if the data wipe is triggered by fs_mgr_mount_all.

Test: mmma system/core/init
Change-Id: I3998d9493611ecc286de0913a95cf22fc41100b5
2016-12-14 12:12:32 -08:00
Sandeep Patil 9b2e207099 Merge "socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE" am: 0a2080bced am: 571e246983 am: c345388bea
am: e432dc58c1

Change-Id: Iab5bafe3e156dfb2fc75634c8d25b5f67991915e
2016-12-14 19:54:35 +00:00
Sandeep Patil e432dc58c1 Merge "socket: uevent: use SO_RCVBUF instead of SO_RCVBUFFORCE" am: 0a2080bced am: 571e246983
am: c345388bea

Change-Id: I84eb8cd8479db999f750a0186b6f12cd2f644109
2016-12-14 19:47:42 +00:00
Jorge Lucangeli Obes e024b3957f Merge "Remove obsolete __BRILLO__ ifdef." am: a95e9aff7c am: ec43ed7d46 am: cfea3d9b59
am: 0f4793a401

Change-Id: I269a07da7aaf362949a083bf6ac32e1e44ed9f94
2016-12-14 19:47:19 +00:00