Commit Graph

19166 Commits

Author SHA1 Message Date
Todd Poynor 59e5c25919 Merge "metricsd binder: Abort if fail to register service" 2015-12-10 19:32:03 +00:00
Mike Frysinger 4120ebc635 adbd: refactor priv dropping logic
Makes the code a little cleaner.

Change-Id: I961b6fc8730c45d8fd4f9fd2981a6d6ab8f51fb6
2015-12-10 13:35:10 -05:00
Josh Gao e0dcc75107 Merge "adb: make the test_pull_dir test actually test something."
am: f31aba9e8d

* commit 'f31aba9e8d976039398dbc694f7a1bd57da6e8e6':
  adb: make the test_pull_dir test actually test something.
2015-12-10 10:17:38 -08:00
Josh Gao fe5c23b388 Merge "Move adb tests to system/core/adb."
am: 4d0e10b24e

* commit '4d0e10b24e6535297424ebfe6682a1239d1a6d18':
  Move adb tests to system/core/adb.
2015-12-10 10:17:24 -08:00
Josh Gao f31aba9e8d Merge "adb: make the test_pull_dir test actually test something." 2015-12-10 18:09:53 +00:00
Josh Gao 4d0e10b24e Merge "Move adb tests to system/core/adb." 2015-12-10 18:09:47 +00:00
Dimitry Ivanov 584c26f872 Merge "Apply permitted path to the classloader-namespace"
am: 028aa205af

* commit '028aa205af102d38ad710d31439796771fd7f708':
  Apply permitted path to the classloader-namespace
2015-12-10 04:39:18 +00:00
Dimitry Ivanov 028aa205af Merge "Apply permitted path to the classloader-namespace" 2015-12-10 04:34:38 +00:00
Elliott Hughes ab31c07ce9 Merge "Simplify adb LinePrinter newline handling."
am: 9fa5cefea4

* commit '9fa5cefea4bf085d686ae09a65809593300fe407':
  Simplify adb LinePrinter newline handling.
2015-12-10 02:50:55 +00:00
Elliott Hughes 9fa5cefea4 Merge "Simplify adb LinePrinter newline handling." 2015-12-10 02:44:13 +00:00
Elliott Hughes 77f539ab49 Simplify adb LinePrinter newline handling.
We had mostly-working hacks before, but it's time to just modify LinePrinter
to suit our needs. If we tell LinePrinter what kind of output we're giving
it, it can manage things automatically.

This fixes the minor bug where we'd sometimes have a blank line after an
error message.

Change-Id: I07ff52437f2402de311e237dd1b2dd338d9b668a
2015-12-09 18:42:41 -08:00
Sami Tolvanen ff980d22d1 fs_mgr: support upstream dm-verity without error correction
Set up dm-verity even if kernel configuration doesn't have
CONFIG_DM_VERITY_FEC set. Fall back to the always safe EIO
mode if dm-verity doesn't support feature arguments.

Bug: 21893453
Change-Id: I4812bd74801c0abc8da479230f48b752858f9cd8
2015-12-10 01:01:29 +00:00
Daniel Rosenberg b940309ec7 Merge "fastboot: Re-add set_active as a command."
am: 98a8257313

* commit '98a825731354791b31c91558dc46332b3ecb978d':
  fastboot: Re-add set_active as a command.
2015-12-09 16:57:47 -08:00
Daniel Rosenberg 98a8257313 Merge "fastboot: Re-add set_active as a command." 2015-12-10 00:54:01 +00:00
Dimitry Ivanov 0d6e59407d Apply permitted path to the classloader-namespace
Bug: http://b/25853516
Bug: http://b/22548808
Change-Id: I283e6ee8d743bc3ab41aab9f36af0abbe729943f
2015-12-09 15:39:36 -08:00
Josh Gao ce8f2cdcd0 adb: make the test_pull_dir test actually test something.
Change-Id: I8b525377557528d5bc70c44d587891fad9f739bd
2015-12-09 14:41:33 -08:00
Alex Vakulenko 457fcbd81f Merge "metricsd: Update to use new component/trait APIs from weaved"
am: 919af692c5

* commit '919af692c58c1aab5081a3cbf48e88e744094dae':
  metricsd: Update to use new component/trait APIs from weaved
2015-12-09 22:18:55 +00:00
Alex Vakulenko 919af692c5 Merge "metricsd: Update to use new component/trait APIs from weaved" 2015-12-09 22:11:09 +00:00
Todd Poynor 2862a7843d metricsd binder: Abort if fail to register service
Assert abort metricsd if binder service registration fails.

If the addService() call fails (for reasons that at least include an SELinux
policy denial), the call to joinThreadPool() apparently processes a stale
pending weak dereference that triggers an abort on a probable double-free:

 F libc    : Invalid address 0xbe8bfa30 passed to free: value not allocated
 F libc    : Fatal signal 6 (SIGABRT), code -6 in tid 609 (metricsd)

Since metricsd is severely hobbled if registration fails, abort and see if
things work better the next time.  If not, the crash loop will hopefully
attract attention to the problem.

Change-Id: I520d0eafb9cb25ee225d589bfd87df4e51f6b181
2015-12-09 13:32:37 -08:00
Alex Vakulenko 9fc597b750 metricsd: Update to use new component/trait APIs from weaved
Removed command and state definitions and use trait definitions
instead. Also, create "metrics" component for weave.

BUG: 25916429, 25916428, 25917426

Change-Id: Icc02d1c46c371d3afa8e4723852f182992c62bf2
2015-12-09 12:35:39 -08:00
Tao Bao 8ca8664956 Merge "rootdir: Execute update_verifier for A/B update."
am: df13f60ce0

* commit 'df13f60ce0152bc9a38e18fcb9c7c839d8eba5e3':
  rootdir: Execute update_verifier for A/B update.
2015-12-09 19:55:09 +00:00
Tao Bao df13f60ce0 Merge "rootdir: Execute update_verifier for A/B update." 2015-12-09 19:50:31 +00:00
Josh Gao 191c154832 Move adb tests to system/core/adb.
Change-Id: If240f45817a46d1e055a8e5173ee7191b9d6c8ea
2015-12-09 11:26:11 -08:00
Yabin Cui e6bcd22f3e Merge "libbacktrace: check if elf file paths are valid before reading them."
am: b6345d6efa

* commit 'b6345d6efa7f9026a7a3414a1dd91535d063ce93':
  libbacktrace: check if elf file paths are valid before reading them.
2015-12-09 18:33:12 +00:00
Yabin Cui b6345d6efa Merge "libbacktrace: check if elf file paths are valid before reading them." 2015-12-09 18:26:15 +00:00
Mark Salyzyn b6a8d41e2a logger.h: reduce maximum payload so sum is page size
Reduce maximum log payload so that the sum with the maximum
length header logger_entry_v4 is a page size. This is a
performance measure.

Expect side effects, truncates messages 8 bytes earlier. The
length has a long history (2008) so there may be non-C code
somewhere that has it hard-coded rather than reflecting this
header. CTS tests may need to be adjusted.

Bug: 25996918
Change-Id: I598c8c5cc78f6b0afc2c1f30cc6f3c18eb8c4c9d
2015-12-09 08:12:07 -08:00
Mark Salyzyn 42ae82742b liblog: test for maximum payload can not survive change
If we adjusted the maximum log payload, Resolve compile
issues resulting from the changes (gTest).

Bug: 25996918
Change-Id: I672b0f4d9d4a1394a5b2e27bf81a5e906bf92a10
2015-12-09 08:12:07 -08:00
Mark Salyzyn 2aa510e8b4 liblog: logprint use uid name if length less then 5
Bug: 25996918
Change-Id: Id882978b7b0b439e39bedeafc39edf80892f0317
2015-12-09 08:12:07 -08:00
Mark Salyzyn 90e7af30a5 liblog: logprint add uid format modifier
Bug: 25996918
Change-Id: Idff5e080fc5c7b69e0c45d3f596eb9d632451cbd
2015-12-09 08:12:07 -08:00
Mark Salyzyn 8646a54ece liblog: readlog apps get logger_entry_v4 for pstore
Adds the uid field to outgoing content for readlog applications.
AID_LOG, AID_ROOT and AID_SYSTEM gain access to the information.

Bug: 25996918
Change-Id: Ib124eca12c004cdd6e57b98e0aae6ddced385cf6
2015-12-09 08:12:07 -08:00
Mark Salyzyn 7b87365ecf logd: readlog apps get logger_entry_v4
Adds the uid field to outgoing content for readlog applications.
AID_LOG, AID_ROOT and AID_SYSTEM gain access to the information.

Bug: 25996918
Change-Id: I0254303c19d174cbf5e722c38844be5c54410c85
2015-12-09 08:12:07 -08:00
Mark Salyzyn 9b292f563e logger.h: Add definition for logger_entry_v4
Extends logger_entry_v3 to add an uid field and moves some fields to
unsigned (easier to have zero'd bit-field for future adjustments).

Still no version field, not crossing that bridge, historical reasons.

Bug: 25996918
Change-Id: I18b7291666c3a5b170d6771a012363a41f2c5847
2015-12-09 08:12:07 -08:00
Sami Tolvanen 226914be6a Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate"
am: 85abb0860e

* commit '85abb0860e4e8b74d8f4498b2b1b3cea44614aff':
  init: set ro.boot.flash.locked from ro.boot.verifiedbootstate
2015-12-09 08:05:46 -08:00
Sami Tolvanen 85abb0860e Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate" 2015-12-09 16:00:00 +00:00
Sami Tolvanen 9e9efcadc5 init: set ro.boot.flash.locked from ro.boot.verifiedbootstate
If ro.oem_unlock_supported is specified for the device and it supports
verified boot, export lock status in ro.boot.flash.locked.

Bug: 26039090
Change-Id: Ie7844aeb458c97944c72d46ea962b9cfb0a7875d
2015-12-09 10:09:11 +00:00
Yabin Cui 2ad59db75f libbacktrace: check if elf file paths are valid before reading them.
Bug: 25194400
Change-Id: If6e60585673226392d38fab9ad14bd7b94261316
2015-12-08 19:22:29 -08:00
Alex Vakulenko be3f400c8c Merge "metricsd: Remove unused type declarations"
am: 9729392ffa

* commit '9729392ffa40ed37aab7fd535c6644d20279bbf0':
  metricsd: Remove unused type declarations
2015-12-09 01:38:50 +00:00
Alex Vakulenko 9729392ffa Merge "metricsd: Remove unused type declarations" 2015-12-09 01:32:43 +00:00
Alex Vakulenko 4840ab74b5 metricsd: Remove unused type declarations
BUG: 26092352
Change-Id: If0dda4c171a2b62291693db49c1e16499fc10f5a
2015-12-08 17:13:32 -08:00
Mark Salyzyn 083b037c07 logd: liblog: logcat: Add LOG_ID_SECURITY
- Largish commit, buffer and access controls done together
- Add LOG_ID_SECURITY binary content log
- Add "default" meta buffer
- allow LOG_ID_SECURITY only from AID_SYSTEM and AID_ROOT UID & GID
- Use __android_log_security() to gate logging
- Add __android_log_security_bwrite() native access to security
  logging.
- Add liblog.__security_buffer end-to-end gTest

Bug: 26029733
Change-Id: Ibcf5b4660c17c1aa6902c0d93f8ffd29c93d9a93
2015-12-08 16:46:29 -08:00
Mark Salyzyn 2625a74585 Merge "liblog: Build Problem, BOOLEAN"
am: cb3e6ef154

* commit 'cb3e6ef15459388fc8fee2b4a3157ff0eac0714a':
  liblog: Build Problem, BOOLEAN
2015-12-09 00:10:04 +00:00
Mark Salyzyn cb3e6ef154 Merge "liblog: Build Problem, BOOLEAN" 2015-12-09 00:04:53 +00:00
Mark Salyzyn b004a7fe6f liblog: Build Problem, BOOLEAN
Checks with BOOLEAN_FALSE and BOOLEAN_TRUE should be made
against an unsigned char.

Bug: 26029733
Change-Id: I405f45a4d6ddae1b060b0e8da9c1585298abe8bd
2015-12-08 15:24:44 -08:00
Mark Salyzyn e52a6d60cd Merge "liblog: Add __android_log_security()"
am: 1631d36d95

* commit '1631d36d95f03cc4c3f0a9c00effdc4a918ce324':
  liblog: Add __android_log_security()
2015-12-08 22:02:07 +00:00
Mark Salyzyn 1631d36d95 Merge "liblog: Add __android_log_security()" 2015-12-08 21:55:56 +00:00
Steve Fung 502f2c957d Merge "crash_reporter: Fix unit tests"
am: ec5b7d4b6c

* commit 'ec5b7d4b6c0d41d90f3d4046bdc13a201f5a023f':
  crash_reporter: Fix unit tests
2015-12-08 21:52:22 +00:00
Steve Fung ec5b7d4b6c Merge "crash_reporter: Fix unit tests" 2015-12-08 21:46:53 +00:00
Tom Cherry c70fe0073e Merge "Remove property_area_initialized"
am: 93f82d0897

* commit '93f82d08978772498fa61cafc955f3487dff5515':
  Remove property_area_initialized
2015-12-08 21:09:16 +00:00
Tom Cherry 93f82d0897 Merge "Remove property_area_initialized" 2015-12-08 21:03:05 +00:00
Alain Vongsouvanh 2f18b54502 logcatd: up size from 16MB to 256MB
Based on: https://android-review.googlesource.com/#/c/172084

Change-Id: Idaa4177618acef31806b4d8f6a2f5caa859e8992
2015-12-08 12:50:18 -08:00