Commit Graph

39071 Commits

Author SHA1 Message Date
Tom Cherry daef77ed4c Merge "system property: property set without time spent asleep" am: 0f65650859
am: 2b4d5e6958

Change-Id: Ia82dbaf01943f29d4f50cc133137b62184b15860
2018-01-04 17:16:03 +00:00
Tom Cherry 2b4d5e6958 Merge "system property: property set without time spent asleep"
am: 0f65650859

Change-Id: I902193d830e94fa9bb4032768d980487224f45d3
2018-01-04 17:12:01 +00:00
Tom Cherry 0f65650859 Merge "system property: property set without time spent asleep" 2018-01-04 17:06:59 +00:00
Steve Muckle 1a3e3065fb rootdir: make sure the /odm mountpoint is always available
The odm partition will eventually be required. Prepare for this by
creating its mount point.

Bug: 37322799
Test: run cts-dev -m CtsPermissionTestCases
Change-Id: Ibd031b68dd7328c853ded401bb2690dbd6675141
2018-01-04 08:45:20 -08:00
Jiyong Park c54426028a Merge "Don't install unnecessary VNDK libs" am: 2fdf9da669 am: 3ef1ce174d
am: b22c5a1aa9

Change-Id: I4aefb843fcd71ca74e9913a195cf8475331d3175
2018-01-04 13:46:15 +00:00
Jiyong Park b22c5a1aa9 Merge "Don't install unnecessary VNDK libs" am: 2fdf9da669
am: 3ef1ce174d

Change-Id: I71f560f184a6e3945978140dec55d7db6cd1cc1e
2018-01-04 13:43:08 +00:00
Jiyong Park 3ef1ce174d Merge "Don't install unnecessary VNDK libs"
am: 2fdf9da669

Change-Id: Iac44f8662cd1d0adcfd11515945d678a9a82e346
2018-01-04 13:39:07 +00:00
Treehugger Robot 2fdf9da669 Merge "Don't install unnecessary VNDK libs" 2018-01-04 13:36:14 +00:00
Dong Jinguang bb877e273b system property: property set without time spent asleep
There is a 2s timeout for system property set that currently
uses boot_clock as its clock source. If the system goes to sleep
during a property set, it may erroneously cause the timeout to
be reached as boot_clock increments during sleep. This patch
changes from boot_clock to steady_clock to ignore time spent
asleep when determining this timeout.

bug: 71497234
Test: 1. System service process try to set a system property
      with timeout 2s
      2. At the same time, the system go into sleep mode more
      than 2s
      3. System property set will be ok.

Change-Id: I808b9af16974a0f4de60a4ca30ae64d095a13422
2018-01-04 09:35:40 +08:00
Daniel Colascione 7ad944af8d Merge "Pin lmkd for real" am: 625d1383d3 am: da0d209ba1
am: 9d32261de6

Change-Id: I9d33771ba840cbf6517c23d250d31c83dd65987c
2018-01-04 00:07:38 +00:00
Daniel Colascione 9d32261de6 Merge "Pin lmkd for real" am: 625d1383d3
am: da0d209ba1

Change-Id: I774bef622b77a1cfb5cfd1b8efbe0e2bb92ea422
2018-01-03 23:40:48 +00:00
Daniel Colascione da0d209ba1 Merge "Pin lmkd for real"
am: 625d1383d3

Change-Id: If813c79b3f321faa5fc34d70078c30c0966a3676
2018-01-03 23:30:53 +00:00
Treehugger Robot 625d1383d3 Merge "Pin lmkd for real" 2018-01-03 23:23:38 +00:00
Jeff Vander Stoep 54c7a5f1e7 LogAudit: remove dynamic rate limiter
Select a low rate-limit to cut down on logspam and resulting
performance regressions.

Functionally reverts 247d682fe1
(logd: sepolicy dynamic rate limiting) and sets a static low
rate-limit. Before 247d682f, the limit was statically set to 20.
247d682f continued to support 20, but if sustained dropped the limit
to 5. This revert leaves us at 5 so as not to impact performance.

Test: /data/nativetest/logd-unit-tests/logd-unit-tests \
    --gtest_filter=logd.sepolicy_rate_limiter
    [  PASSED  ] 1 test.
Bug: 71538411
Change-Id: I6c92f4ba825cc24beb8f1f1b79258fa8097c837b
2018-01-03 12:52:58 -08:00
Yi Kong 04e5fde33d Merge "Use correct format specifier" am: 370d2e02e0 am: ef44dd2325
am: 53d69290a7

Change-Id: I158f99bdba598d64bc676be4ea4e1c38e6cbcce4
2018-01-03 20:45:03 +00:00
Daniel Colascione 4dd5d00ecc Pin lmkd for real
We pin lmkd in memory so that we don't take page faults (and thus
requisition memory) while we're in the process of responding to a
low-memory condition. mlockall(2) is the right primitive for this
pinning. Previously, we used the MCL_FUTURE flag to mlockall: used
this way, mlockall doesn't actually pin all pages in memory, since
MCL_FUTURE affects only the default flags for future mappings and
doesn't affect mapping already in existence at the time of the
mlockall call --- like the lmkd executable itself.

This patch adds the MCL_CURRENT flag, which also pins all pages
already mapped.

Test: code inspection
Change-Id: I4563959367a2f0a9cadc3ea41731b7f311326685
2018-01-03 12:32:14 -08:00
Yi Kong 53d69290a7 Merge "Use correct format specifier" am: 370d2e02e0
am: ef44dd2325

Change-Id: Ic17b42e30a2971782491797c5374e765deec3082
2018-01-03 20:13:56 +00:00
Yi Kong ef44dd2325 Merge "Use correct format specifier"
am: 370d2e02e0

Change-Id: I167f8bfdd819945b53bb8fa29555f593f8687fa8
2018-01-03 20:01:38 +00:00
Yi Kong 370d2e02e0 Merge "Use correct format specifier" 2018-01-03 19:49:08 +00:00
Ricky Wai 02fbb27e73 Merge "Create Network Watchlist data folder for ConfigUpdater" 2018-01-03 14:16:41 +00:00
Andreas Gampe 5c7d582be4 Nativeloader: Add minimal effort for host library path
Attempt to (somewhat) support the given library path on a non-Android
device. Iterate through the given list and construct a complete path.
This will of course not handle dependencies correctly and is best
effort.

Required (and enough) for agent-related testing in ART.

Bug: 70901841
Test: m
Change-Id: I9ecb27d662c8a2c79a70b6c5464483c449c5d034
2018-01-02 09:05:55 -08:00
Mike Frysinger 50ecaca744 adb: add missing condition_variable include
Test: build still works
Change-Id: I0e77336bab2a4a54cb2e77143162627d47aac0b1
2018-01-02 02:25:02 -05:00
Yi Kong 21c515ad1c Use correct format specifier
Discovered by the upcoming compiler update.

Test: m checkbuild
Change-Id: I8dd4bb711bfa4f4b71a3345a2ee38f689cee5257
2017-12-27 13:42:49 -08:00
Luis Hector Chavez 4841e744c2 debuggerd_handler: set PR_SET_PTRACER before running crash_dump.
Set and restore PR_SET_PTRACER when performing a dump, so that when
Android is running on a kernel that has the Yama LSM enabled (and the
value of ptrace_scope is > 0), crash_dump can attach to processes and
print nice, symbolized stack traces.

Bug: 70992745
Test: kill -6 `pidof surfaceflinger` && logcat -d -b crash
      # in both sailfish and Chrome OS

Change-Id: If4646442c6000fdcc69cf4ab95fdc71ae74baaaf
2017-12-27 13:19:31 -08:00
Narayan Kamath c68a1e4ec9 Merge "zip_archive: Fix a few more badly written tests." am: 93d344d98c am: 000e0bfff4
am: 5c39aa53a9

Change-Id: Idc2e77fb2134f2935f04ed3756d84a36090995e1
2017-12-27 11:50:18 +00:00
Narayan Kamath 5c39aa53a9 Merge "zip_archive: Fix a few more badly written tests." am: 93d344d98c
am: 000e0bfff4

Change-Id: I6af4ce2a977e0fbc21974e8e80516fb39ec8156a
2017-12-27 11:47:41 +00:00
Narayan Kamath 000e0bfff4 Merge "zip_archive: Fix a few more badly written tests."
am: 93d344d98c

Change-Id: Iaaa56006cc57acf8950040fa99cacae828c5858e
2017-12-27 11:41:44 +00:00
Treehugger Robot 93d344d98c Merge "zip_archive: Fix a few more badly written tests." 2017-12-27 11:35:20 +00:00
Narayan Kamath c36b80928b zip_archive: Fix a few more badly written tests.
Fix failures in DataDescriptor related tests due to to a bad call to
SetZipString (undefined behaviour). Also fix a typo in the test for
invalid descriptors, we were asserting things on the wrong array.

Test: zip_archive_test
Change-Id: I8c9a632443fdf1d5c115670d6e9317e1f4bf6ef4
2017-12-27 09:42:00 +00:00
Siarhei Vishniakou 38d4352fce Allow input system access to /dev/v4l-touch
Bug: 62940136
Test: read /dev/v4l-touchX from inputflinger

Change-Id: I394686e4167855f50ddd6ff9aebcf3c94f6550b0
2017-12-22 17:06:24 -08:00
Josh Gao 35573d4dc1 Merge "debuggerd: restore the location of abort message." am: 2da01a2a71 am: 31b8659606
am: ad90832fd6

Change-Id: I622886b282ee501f4a532cbded1035ab90ab3e6f
2017-12-23 00:29:00 +00:00
Josh Gao ad90832fd6 Merge "debuggerd: restore the location of abort message." am: 2da01a2a71
am: 31b8659606

Change-Id: I7b73593cd469f246cb6f197f1d69d274927ff15a
2017-12-23 00:26:28 +00:00
Josh Gao 31b8659606 Merge "debuggerd: restore the location of abort message."
am: 2da01a2a71

Change-Id: Idb373a5e1b7e9772269bb184cb2b32c4e6a9a776
2017-12-23 00:23:14 +00:00
Josh Gao c881c49ab0 Merge "debuggerd: wait for dump completion on crashes." am: 1f3b605c41 am: 65e2c06a90
am: 6c9ea516da

Change-Id: I0063c9f0e4f3e21ff0023069ff9a061d54b373d8
2017-12-23 00:20:55 +00:00
Josh Gao 6c9ea516da Merge "debuggerd: wait for dump completion on crashes." am: 1f3b605c41
am: 65e2c06a90

Change-Id: I1c96c8aaa898ceddb9f88f58a44902985e23767a
2017-12-23 00:17:57 +00:00
Treehugger Robot 2da01a2a71 Merge "debuggerd: restore the location of abort message." 2017-12-23 00:17:34 +00:00
Josh Gao 65e2c06a90 Merge "debuggerd: wait for dump completion on crashes."
am: 1f3b605c41

Change-Id: I21dfb7a7efba253e8d3c58a80a819d520b030c04
2017-12-23 00:15:18 +00:00
Treehugger Robot 1f3b605c41 Merge "debuggerd: wait for dump completion on crashes." 2017-12-23 00:11:34 +00:00
Victor Hsieh 9a0e12d405 Change seccomp to the system filter
Test: build
Bug: 63944145
Change-Id: I55da5354b90def14b024add7979099189943d9e6
2017-12-22 14:35:28 -08:00
Josh Gao 34c2556d11 debuggerd: restore the location of abort message.
The abort message was accidentally relocated to be printed below the
registers, backtrace, and stack, which isn't very helpful. Move it back
to its rightful place.

Test: treehugger
Change-Id: I8aa5b63e58081f27ccdb42481fed8d9eb3a892a4
2017-12-22 14:20:12 -08:00
Josh Gao 7302097e77 debuggerd: wait for dump completion on crashes.
When a process crashes, both ActivityManager and init will try to kill
its process group when they notice. The recent change to minimize the
amount of time a process is paused results in crash dumps being killed
before they finish as a result of this. Since anything that needs to be
low-latency is probably not going to be too happy if it crashes, just
wait for completion whenever we're processing a real crash.

Bug: http://b/70343110
Test: debuggerd_test
Change-Id: I894bb06efd264b1ba005df06f7326a72f4b767bb
2017-12-22 14:20:12 -08:00
Narayan Kamath f2aa5ec254 Merge "Get rid of unneeded allocations in Extract...() APIs" am: 18f25d399e am: 64bf32d999
am: 780105e6b1

Change-Id: I71782554db964d33820a4ee68ae766a05c39266f
2017-12-22 10:53:14 +00:00
Narayan Kamath faaa0d71ad Merge "zip_archive: Fix tests broken by 1f93d71022cca7bb6bb9eec49." am: 492de535c4 am: fede183c53
am: 47ede5466a

Change-Id: Ia845756bf799a0a02f4aadb3a004ecc1d8cfc99f
2017-12-22 10:52:18 +00:00
Narayan Kamath 780105e6b1 Merge "Get rid of unneeded allocations in Extract...() APIs" am: 18f25d399e
am: 64bf32d999

Change-Id: I0107091854c2d810fc5d19a873c29a270c5cf207
2017-12-22 10:50:24 +00:00
Narayan Kamath 47ede5466a Merge "zip_archive: Fix tests broken by 1f93d71022cca7bb6bb9eec49." am: 492de535c4
am: fede183c53

Change-Id: Ib1e16a1b0799ffe88b822b04d3231c4d30f77917
2017-12-22 10:49:41 +00:00
Narayan Kamath 64bf32d999 Merge "Get rid of unneeded allocations in Extract...() APIs"
am: 18f25d399e

Change-Id: Iedf41c02dc7b1b92ba781d59f71f1e8e6729ffcf
2017-12-22 10:47:47 +00:00
Narayan Kamath fede183c53 Merge "zip_archive: Fix tests broken by 1f93d71022cca7bb6bb9eec49."
am: 492de535c4

Change-Id: I0e6de0b6f71626fefbb04befd2e8e84f439ae1fe
2017-12-22 10:47:05 +00:00
Narayan Kamath 18f25d399e Merge "Get rid of unneeded allocations in Extract...() APIs" 2017-12-22 10:41:41 +00:00
Narayan Kamath 492de535c4 Merge "zip_archive: Fix tests broken by 1f93d71022cca7bb6bb9eec49." 2017-12-22 10:41:17 +00:00
TreeHugger Robot 40b150f9d5 Merge "Remove libkeymaster_staging" 2017-12-21 22:10:29 +00:00