ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20423 commits 1 branch 0 tags 217 MiB
Commit graph

20423 commits

This branch
This branch
All branches
Author SHA1 Message Date
Josh Gao
12debfc4cb Merge "Move adb tests to system/core/adb." am: 4d0e10b24e 
am: fe5c23b388

* commit 'fe5c23b388d1c4166558f4b3d3222f9015528afb':
  Move adb tests to system/core/adb.
 2015-12-10 15:42:30 -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
4d0e10b24e Merge "Move adb tests to system/core/adb." 2015-12-10 18:09:47 +00:00
Paul Lawrence
e90233c5e6 Merge "Add createuserkey" 2015-12-10 15:10:31 +00:00
Dimitry Ivanov
fe029254e9 Merge "Apply permitted path to the classloader-namespace" am: 028aa205af 
am: 584c26f872

* commit '584c26f872d9adfba9f5d2f200a53f837836b7bc':
  Apply permitted path to the classloader-namespace
 2015-12-10 04:41:34 +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
ffc39903c6 Merge "Simplify adb LinePrinter newline handling." am: 9fa5cefea4 
am: ab31c07ce9

* commit 'ab31c07ce9a9d6df3483c326c42a50c63f737695':
  Simplify adb LinePrinter newline handling.
 2015-12-09 18:53:19 -08: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
Daniel Rosenberg
589500fe2e resolve merge conflicts of b940309ec7 to master. 
Change-Id: Icd6daa7385b8cd8c19f52dbc6805142e81b93dc9
 2015-12-09 17:58:00 -08: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
Paul Lawrence
c5733cfadb Add createuserkey 
Needed so we can make the user0 key on first boot

Change-Id: I4699dbf2efdec44bb09bc4cfa7eeb59e56cb93ab
 2015-12-09 15:34:18 -08:00
Alex Vakulenko
c37f939fb5 Merge "metricsd: Update to use new component/trait APIs from weaved" am: 919af692c5 
am: 457fcbd81f

* commit '457fcbd81fa73b626a05e833a210589255628b88':
  metricsd: Update to use new component/trait APIs from weaved
 2015-12-09 22:21:21 +00: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
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
27ca1eb294 Merge "rootdir: Execute update_verifier for A/B update." am: df13f60ce0 
am: 8ca8664956

* commit '8ca8664956bf4bce783d9b84a9f0fd0ff8a9c11f':
  rootdir: Execute update_verifier for A/B update.
 2015-12-09 19:57:52 +00: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
444330270b Merge "libbacktrace: check if elf file paths are valid before reading them." am: b6345d6efa 
am: e6bcd22f3e

* commit 'e6bcd22f3ed240a5d0fb39bbe90c2577a6ed7b9f':
  libbacktrace: check if elf file paths are valid before reading them.
 2015-12-09 18:36:26 +00: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
Sami Tolvanen
af968b82f2 Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate" am: 85abb0860e 
am: 226914be6a

* commit '226914be6ad06f1ccbdcd2ea584e748a02665e2d':
  init: set ro.boot.flash.locked from ro.boot.verifiedbootstate
 2015-12-09 16:08:06 +00: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
12f726cee9 Merge "metricsd: Remove unused type declarations" am: 9729392ffa 
am: be3f400c8c

* commit 'be3f400c8c3e721bc1fe543d7a086ec89fe43453':
  metricsd: Remove unused type declarations
 2015-12-09 01:41:20 +00: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
64f5059e95 Merge "liblog: Build Problem, BOOLEAN" am: cb3e6ef154 
am: 2625a74585

* commit '2625a745853c5c1324c662234a4d11ca73e34d22':
  liblog: Build Problem, BOOLEAN
 2015-12-09 00:12:40 +00: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
ee6b51f210 Merge "liblog: Add __android_log_security()" am: 1631d36d95 
am: e52a6d60cd

* commit 'e52a6d60cdb2233bd3d03723c73ce8f9bf33c929':
  liblog: Add __android_log_security()
 2015-12-08 14:04:42 -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
47749725fe Merge "crash_reporter: Fix unit tests" am: ec5b7d4b6c 
am: 502f2c957d

* commit '502f2c957d42f89f678282c0f3fb3574aa9466fd':
  crash_reporter: Fix unit tests
 2015-12-08 21:55:13 +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
cbc7c91edc Merge "Remove property_area_initialized" am: 93f82d0897 
am: c70fe0073e

* commit 'c70fe0073e93a3175f3c07778ce81bf9b03f566b':
  Remove property_area_initialized
 2015-12-08 21:12:02 +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
Mark Salyzyn
ffbd86ff25 liblog: Add __android_log_security() 
Return non-zero if ro.device_owner is set and not false
and persist.logd.security is true.

Bug: 26029733
Change-Id: Ie82ae11ae35e9c79017b6e873fefb39d79a1d4fe
 2015-12-08 11:28:27 -08:00