Commit graph

33107 commits

Author SHA1 Message Date
Mark Salyzyn
654b6eff04 Merge "logcat: test: inject for *.event_tag_filter" am: 2841b4efe0 am: ed1e53fc77
am: 9a2b70a7c8

Change-Id: I26c223bfe6a8028130427d73079fe5306cf65253
2017-05-12 01:57:10 +00:00
Renaud Paquay
1033781b10 Merge "Fix uninitialized member variable" am: 46bb1ffa8a am: 9cf71d784e
am: c134530c37

Change-Id: I6f95919b2f3975754e8937aaa0c956feb79cc3e1
2017-05-12 01:55:47 +00:00
Mark Salyzyn
db52ba299b Merge "logd: test: check sepolicy background rate before testing" am: 5a40c42877 am: 1961eab662
am: 5698594d8a

Change-Id: I6c6e5e08f01b23bedfeb90b3f39031b92a092f44
2017-05-12 01:55:23 +00:00
Siarhei Vishniakou
b995b58631 Merge "Adding 'uhid' permission for access to /dev/uhid." am: cecbc9993d am: 04daed4793
am: d819380f50

Change-Id: If06b07c88276c32cdf5b53e6afcf0563e6538544
2017-05-12 01:00:46 +00:00
Mark Salyzyn
9a2b70a7c8 Merge "logcat: test: inject for *.event_tag_filter" am: 2841b4efe0
am: ed1e53fc77

Change-Id: I4b6c0f145fa83b4c1bb895256b4de45598e5f363
2017-05-11 23:39:49 +00:00
Renaud Paquay
c134530c37 Merge "Fix uninitialized member variable" am: 46bb1ffa8a
am: 9cf71d784e

Change-Id: Ib7644e66e1860a13c0e79b5976d9159ff2de43d2
2017-05-11 23:39:22 +00:00
Mark Salyzyn
5698594d8a Merge "logd: test: check sepolicy background rate before testing" am: 5a40c42877
am: 1961eab662

Change-Id: I7ce24090e02b9902c615c2263cfaba3134c2526e
2017-05-11 23:38:51 +00:00
Mark Salyzyn
ed1e53fc77 Merge "logcat: test: inject for *.event_tag_filter"
am: 2841b4efe0

Change-Id: Ic1fb5ed5bb304ab4a6fa3e55414a07e73c5d546b
2017-05-11 22:13:48 +00:00
Siarhei Vishniakou
d819380f50 Merge "Adding 'uhid' permission for access to /dev/uhid." am: cecbc9993d
am: 04daed4793

Change-Id: I2bcaa5fe48f60c837ac341c71819c492860f50e2
2017-05-11 22:02:14 +00:00
Treehugger Robot
2841b4efe0 Merge "logcat: test: inject for *.event_tag_filter" 2017-05-11 21:48:38 +00:00
Renaud Paquay
9cf71d784e Merge "Fix uninitialized member variable"
am: 46bb1ffa8a

Change-Id: I102f6414d6846186327f68b5dae2e23eadfa0502
2017-05-11 21:04:41 +00:00
Mark Salyzyn
1961eab662 Merge "logd: test: check sepolicy background rate before testing"
am: 5a40c42877

Change-Id: I785965cc1c27d598f3293493d133e7b865c98d59
2017-05-11 21:04:16 +00:00
Siarhei Vishniakou
04daed4793 Merge "Adding 'uhid' permission for access to /dev/uhid."
am: cecbc9993d

Change-Id: I0cfcdaac7685f10a6f2b5e9bfc54a83cc5385da2
2017-05-11 20:48:04 +00:00
Treehugger Robot
46bb1ffa8a Merge "Fix uninitialized member variable" 2017-05-11 19:17:21 +00:00
Mark Salyzyn
24b79ce2bc logcat: test: inject for *.event_tag_filter
Inject a message for event_tag_filter and bucket tests. The former
registered an occasional failure.

Switch order of EXPECT checks so that constant is on the right so
that error reports make more sense.

Test: gTest logcat-unit-tests --gtest_filter=*.event_tag_filter
Test: gTest logcat-unit-tests
Bug: 37791296
Change-Id: Ic2536e6e4c95e3a913ad0ea4c22219aa3c5c01eb
2017-05-11 12:16:06 -07:00
Treehugger Robot
5a40c42877 Merge "logd: test: check sepolicy background rate before testing" 2017-05-11 19:13:52 +00:00
Siarhei Vishniakou
cecbc9993d Merge "Adding 'uhid' permission for access to /dev/uhid." 2017-05-11 19:02:32 +00:00
Renaud Paquay
b7a4f0b9e2 Fix uninitialized member variable
The default constructor of FileMap was missing an initializer for the
mFileMapping variables. This results in CloseHandle being called with
a "random" value, which can cause havoc in Win32 process over time (e.g.
in the case of libaapt2_jni.dll, which is loaded in a JVM process).

Also, update the code to use "NULL" for invalid file map handle
and "INVALID_HANDLE_VALUE" for invalid file handle.

Bug: 38197857
Test: Stress testing on (Windows) machine
Change-Id: Ibd769219d601fbafcfcee89e848b31cc5137826c
2017-05-11 10:30:52 -07:00
Mark Salyzyn
c51ecf9238 logd: test: check sepolicy background rate before testing
logd.sepolicy_rate_limiter_* tests can fail individually so join them
together into one test.  The new test logd.sepolicy_rate_limiter
fails as a group if the background sepolicy activity is too high, so
check it and report a warning that the test can fail as a result so it
can be forgiven during unit testing.  The failure remains as a VTS
performance threshold that requires investigation.

The test takes a total of 45 seconds to run, it was split up as this
approaches the 60 second test timeout on go/apct.

Test: gTest logd-unit-tests --gtest_filter=logd.sepolicy_rate_limiter
      (run in loop ensuring passes do not interfere with eachother)
Bug: 37791296
Change-Id: Ia865241f684c6b0de428702cbd5110dc17927c66
2017-05-11 17:16:30 +00:00
Siarhei Vishniakou
0729dd1edb Adding 'uhid' permission for access to /dev/uhid.
This CL is in support of another CL c/2048848, topic
'Refactor hid command in /frameworks/base/cmds' in
internal master. Adding the permissions for
shell here to access uhid_node as part of the
new 'uhid' group.

Bug: 34052337
Test: Tested on angler, bluetooth mouse works OK.

Change-Id: If9e100aa1262d689fb8adc5c0ce93f157c96399e
2017-05-11 01:28:53 +00:00
Josh Gao
709f57bc69 Merge changes I0ff1fc5c,I7a23d3bf am: 7d199de8e2 am: 162ec283cf
am: 61c8aea04a

Change-Id: I71afab81c2c26e9213da746b9f25a00e98e50796
2017-05-11 00:23:49 +00:00
Chih-Hung Hsieh
0d1879dd8c Merge "Work around clang-tidy segmentation fault." am: d761dd747e am: 4a926efc49
am: 3f9923cf7f

Change-Id: I5207bb2b06902b248137edeef6be3ac167ee62de
2017-05-11 00:23:21 +00:00
Josh Gao
61c8aea04a Merge changes I0ff1fc5c,I7a23d3bf am: 7d199de8e2
am: 162ec283cf

Change-Id: I1dc9b13c00f6944368257e9a4e347278ec46f55f
2017-05-11 00:05:43 +00:00
Chih-Hung Hsieh
3f9923cf7f Merge "Work around clang-tidy segmentation fault." am: d761dd747e
am: 4a926efc49

Change-Id: I5e4b9b8507dc24bb44323c331eabe1afb25dd8f5
2017-05-11 00:05:13 +00:00
Josh Gao
162ec283cf Merge changes I0ff1fc5c,I7a23d3bf
am: 7d199de8e2

Change-Id: I6f47c2f66d79b8d26c239c974dcea34e4e8fef67
2017-05-10 23:54:41 +00:00
Chih-Hung Hsieh
4a926efc49 Merge "Work around clang-tidy segmentation fault."
am: d761dd747e

Change-Id: I51913166b123b41e31c23da8c0def798057dd556
2017-05-10 23:54:12 +00:00
Josh Gao
7d199de8e2 Merge changes I0ff1fc5c,I7a23d3bf
* changes:
  libdebuggerd: print the build fingerprint in fallback.
  libdebuggerd: implement fallback register dumping on arm/aarch64.
2017-05-10 23:24:38 +00:00
Treehugger Robot
d761dd747e Merge "Work around clang-tidy segmentation fault." 2017-05-10 23:11:19 +00:00
Josh Gao
3521f70220 Merge "adb: fix darwin build break." am: a0661237e1 am: 8016a0aa11
am: 40866ccfc0

Change-Id: I5e3b7fab5bb7c3428a2dfe14ca43a54fb62358b8
2017-05-10 22:39:13 +00:00
Josh Gao
40866ccfc0 Merge "adb: fix darwin build break." am: a0661237e1
am: 8016a0aa11

Change-Id: I159bb4720cef0e9cfcb845d76195262f568e94b2
2017-05-10 22:10:48 +00:00
Josh Gao
8016a0aa11 Merge "adb: fix darwin build break."
am: a0661237e1

Change-Id: If89dd3fa27da4316122802af234b6104c2a8ef58
2017-05-10 22:08:44 +00:00
Josh Gao
a0661237e1 Merge "adb: fix darwin build break." 2017-05-10 21:58:10 +00:00
Josh Gao
362b4041f3 adb: fix darwin build break.
Fix the following build breakage:

    system/core/adb/client/usb_osx.cpp:433:13: error: static declaration of 'usb_cleanup' follows non-static declaration
    static void usb_cleanup() NO_THREAD_SAFETY_ANALYSIS {
                ^
    system/core/adb/usb.h:48:5: note: previous declaration is here
        ADB_USB_INTERFACE(native::usb_handle*);

Bug: http://b/38203892
Test: mma on linux, darwin
Change-Id: I1c042e4d64ddcc0713f329202bc2037e590a9b4f
2017-05-10 13:58:51 -07:00
Josh Gao
9deb8140bf Merge changes I394f5782,I9475f5d0,I59707186 am: 44f6592b0d am: b7f3707cd3
am: 75f0275fba

Change-Id: Ie8656ad48bac17b5f5d90e1adeb4096f83b1176c
2017-05-10 19:35:36 +00:00
Josh Gao
75f0275fba Merge changes I394f5782,I9475f5d0,I59707186 am: 44f6592b0d
am: b7f3707cd3

Change-Id: Id2899cce43a39d099797ce9915b3d924cae41e75
2017-05-10 19:13:08 +00:00
Elliott Hughes
94ed60471d Merge "Fix style nits in adb's Android.mk." am: 30b7f59efc am: 86698112b9
am: eba1d8338f

Change-Id: I0b818e500c50a3a83c2cb00665e06fa5d69bcb3f
2017-05-10 19:04:44 +00:00
Josh Gao
b7f3707cd3 Merge changes I394f5782,I9475f5d0,I59707186
am: 44f6592b0d

Change-Id: Ic1a62436b98f986e129a6b08d1ab939b70d5f3e6
2017-05-10 19:01:57 +00:00
Josh Gao
44f6592b0d Merge changes I394f5782,I9475f5d0,I59707186
* changes:
  adb: move all cleanup to a function with defined ordering.
  adb: make `adb kill-server` wait for the server to die.
  adb: libusb: replace sleep with timed CV wait.
2017-05-10 18:42:14 +00:00
Elliott Hughes
eba1d8338f Merge "Fix style nits in adb's Android.mk." am: 30b7f59efc
am: 86698112b9

Change-Id: I1ebbd9a008f5d0cd0812d85802888a952ea77a1b
2017-05-10 18:36:43 +00:00
Elliott Hughes
86698112b9 Merge "Fix style nits in adb's Android.mk."
am: 30b7f59efc

Change-Id: I6a2ff9ba9967e16917397141ced113d5a884d826
2017-05-10 17:55:03 +00:00
Elliott Hughes
30b7f59efc Merge "Fix style nits in adb's Android.mk." 2017-05-10 17:43:54 +00:00
Elliott Hughes
cd81886b94 Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: 3d29736d6b am: f2f3c3b91c
am: 8ff4dbe443

Change-Id: I1598a1aa314a2ec550596a4f92390a71d9cd6137
2017-05-10 15:42:08 +00:00
Elliott Hughes
8964fbfa5f Fix style nits in adb's Android.mk.
We [try to] always use trailing \s in lists.

Bug: N/A
Test: builds
Change-Id: Ibc1ccacbe8a31f784f206d29a8c4f0f4650f7bde
2017-05-10 08:41:50 -07:00
Elliott Hughes
8ff4dbe443 Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" am: 3d29736d6b
am: f2f3c3b91c

Change-Id: Id03922e268fed3174ca4d63976c31b682c4ab202
2017-05-10 15:34:37 +00:00
Elliott Hughes
f2f3c3b91c Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space"
am: 3d29736d6b

Change-Id: I8b3fa683884606e441340940e52114c5f94bb484
2017-05-10 15:26:37 +00:00
Elliott Hughes
3d29736d6b Merge "Fix build error when (ADB|FASTBOOT)_VERSION has space" 2017-05-10 15:11:28 +00:00
SzuWei Lin
b3526e1ee8 Fix build error when (ADB|FASTBOOT)_VERSION has space
Test: make, and build pass
Change-Id: I8fc608a5b8bccb43b8af72978ce16a945147f62d
2017-05-10 18:52:02 +08:00
George Burgess IV
8a30d83aa6 Merge "fix static-analyzer logging/CHECK macros" am: 01e7990a10 am: 951d7e953e
am: 543f2c68be

Change-Id: I42431a5908b7cad199d4c23dd908de561245b822
2017-05-10 03:18:46 +00:00
Dimitry Ivanov
b738efe1a7 Merge "Explicitly enable greylist for classloader-namespaces" am: 2f2cd76d4d am: 55ecc6ff6f
am: fb669dc648

Change-Id: Ibdfa0fedb6093c84952ba5c5416f66c8ad2d37a5
2017-05-10 03:18:22 +00:00
George Burgess IV
543f2c68be Merge "fix static-analyzer logging/CHECK macros" am: 01e7990a10
am: 951d7e953e

Change-Id: I0d6055f7c055b4d841e02945d30074ce898aab5e
2017-05-10 03:13:18 +00:00