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

22988 commits

This branch
This branch
All branches
Author SHA1 Message Date
Felipe Leme
6993211d38 Merge "Display warning about bugreport delay." into nyc-dev 
am: f99193b7aa

* commit 'f99193b7aa8eedb0f5be448c6df6d2688c1bfb2e':
  Display warning about bugreport delay.

Change-Id: I19de3a7c8e98127322a4f8454d87e4be39c2d071
 2016-05-05 03:05:22 +00:00
TreeHugger Robot
f99193b7aa Merge "Display warning about bugreport delay." into nyc-dev 2016-05-05 03:01:29 +00:00
Elliott Hughes
576f3d4cd7 Merge "Lose ps to toybox." am: 31701d6074 
am: e9e8b44d5a

* commit 'e9e8b44d5aed355b1cd71da6ab166c49ec8c4b13':
  Lose ps to toybox.

Change-Id: I411f18cac389fe002c39cb26e08d92588ad6172f
 2016-05-05 00:38:23 +00:00
Elliott Hughes
e9e8b44d5a Merge "Lose ps to toybox." 
am: 31701d6074

* commit '31701d6074effb399cf717da21abde91d7e29dd7':
  Lose ps to toybox.

Change-Id: I5b24a54c4e9a7e64853c71d13256aa6cf89ca0ac
 2016-05-05 00:36:09 +00:00
Elliott Hughes
31701d6074 Merge "Lose ps to toybox." 2016-05-05 00:29:12 +00:00
Dimitry Ivanov
7a9f7adbb6 Merge "nativeloader: Add CloseNativeLibrary() method" am: ad717d6566 
am: 9fad128a16

* commit '9fad128a16099e1ccbc5fb96e17ef4a270fdbfc7':
  nativeloader: Add CloseNativeLibrary() method

Change-Id: I8dcbd8ed311a887ab583017666bda2f629d77eaf
 2016-05-04 23:46:26 +00:00
Dimitry Ivanov
9fad128a16 Merge "nativeloader: Add CloseNativeLibrary() method" 
am: ad717d6566

* commit 'ad717d6566eb381fb0ef47941c000789f048cf81':
  nativeloader: Add CloseNativeLibrary() method

Change-Id: Id4a0937a32afe189c5cb46367d91a2aeebbfb71d
 2016-05-04 23:44:28 +00:00
Treehugger Robot
ad717d6566 Merge "nativeloader: Add CloseNativeLibrary() method" 2016-05-04 23:38:55 +00:00
Felipe Leme
42e45c7068 Display warning about bugreport delay. 
BUG: 28569299
Change-Id: Ide6109fd24737cbaf6296ef7326127e85d6420cb
 2016-05-04 16:20:25 -07:00
Dimitry Ivanov
256e4b0dfc Merge "nativeloader: Add CloseNativeLibrary() method" into nyc-dev 
am: acd3c71784

* commit 'acd3c71784d4207b478f411413f109281a83ef36':
  nativeloader: Add CloseNativeLibrary() method

Change-Id: Icdd2d3c6cfbcee5bfdd43dfbe355e2ded841c07d
 2016-05-04 22:31:35 +00:00
Dimitry Ivanov
7a1f9518f7 nativeloader: Add CloseNativeLibrary() method 
This method is called by art on UnloadNativeLibraries()

Bug: http://b/28406866
Change-Id: Ibccff93c83d6ccd3d0a1c0294a64b09281b4e05e
(cherry picked from commit 09a516bf16)
 2016-05-04 15:26:33 -07:00
Dimitry Ivanov
acd3c71784 Merge "nativeloader: Add CloseNativeLibrary() method" into nyc-dev 2016-05-04 22:22:07 +00:00
Elliott Hughes
eea3c0e601 Lose ps to toybox. 
Change-Id: I890a453533e1b3066169738f55314f8813285c17
 2016-05-04 15:20:02 -07:00
Elliott Hughes
46ae7d36a4 Merge "Remove <utils/ashmem.h>." am: f9f76146a1 
am: ee3202563b

* commit 'ee3202563be401328ad318d77d7c6c0622ab0960':
  Remove <utils/ashmem.h>.

Change-Id: I6d076a9097df4969b703fc2833d464a15692835b
 2016-05-04 22:04:29 +00:00
Elliott Hughes
ee3202563b Merge "Remove <utils/ashmem.h>." 
am: f9f76146a1

* commit 'f9f76146a1d0f05654be8963e78c2ed6c56d4a57':
  Remove <utils/ashmem.h>.

Change-Id: I2404bef3218617fb06dcb62f52717f61d83f52d8
 2016-05-04 22:01:36 +00:00
Elliott Hughes
f9f76146a1 Merge "Remove <utils/ashmem.h>." 2016-05-04 21:48:21 +00:00
Elliott Hughes
6d7823a54e Remove <utils/ashmem.h>. 
Not to be confused with <cutils/ashmem.h> or <linux/ashmem.h>, one or other
of which is what you should be using instead.

Change-Id: Ie158530591b28b94c2cda9e2686cae56b7aeb1a3
 2016-05-04 13:33:20 -07:00
Nick Kralevich
56db5bf567 init/builtins.cpp: Switch to finit_module 
am: f2049163a4

* commit 'f2049163a4ce602dffaa41a747ee5675a0d82752':
  init/builtins.cpp: Switch to finit_module

Change-Id: I2a74e768fbb8367dbbd6b3794dab8a3250b32e27
 2016-05-04 16:02:33 +00:00
Nick Kralevich
f2049163a4 init/builtins.cpp: Switch to finit_module 
Switch insmod from using init_module to finit_module. From
"man finit_module":

  The finit_module() system call is like init_module(), but reads the
  module to be loaded from the file descriptor fd. It is useful when the
  authenticity of a kernel module can be determined from its location in
  the file system; in cases where that is possible, the overhead of
  using cryptographically signed modules to determine the authenticity
  of a module can be avoided.

finit_module is preferred over init_module because it allows LSMs, such
as SELinux, to perform a permission check on kernel module loads based on
the file from which the module is loaded. This functionality is not yet
implemented in the Linux kernel, but is on the SEAndroid TODO list.
See https://bitbucket.org/seandroid/wiki/wiki/ToDo

Bug: 27824855

(cherry picked from commit 124a9c97e9)

Change-Id: I5e87de1a7b8c3d8849bf757c71b08e81c378b021
 2016-05-04 07:01:46 -07:00
Matthew Bouyack
2e7620594e Merge "If we fail to format a blank partition, try recovery" into nyc-dev 
am: 6846d22629

* commit '6846d22629e7bf9d53006d4f40c9c5f81b2b45f0':
  If we fail to format a blank partition, try recovery

Change-Id: I6879f99f6901b24a3a51a35c3fc629c49bb64091
 2016-05-03 23:22:58 +00:00
Matthew Bouyack
6846d22629 Merge "If we fail to format a blank partition, try recovery" into nyc-dev 2016-05-03 23:18:16 +00:00
Elliott Hughes
40d1d10a84 DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot. am: a463d24633 -s ours am: 1baf911bd5 -s ours 
am: c04a11c9e3  -s ours

* commit 'c04a11c9e3bc1a314f05561648a0db6da767d03d':
  DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot.

Change-Id: Ifdf8812fbc5ccfad15646f621c59c0be457afb9a
 2016-05-03 23:07:18 +00:00
Elliott Hughes
c04a11c9e3 DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot. am: a463d24633 -s ours 
am: 1baf911bd5  -s ours

* commit '1baf911bd5a8df58e0bf66a8741829f34625d44f':
  DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot.

Change-Id: Ic1ea13b7a393e5bbb3e8e1376b9470987ecdc925
 2016-05-03 22:57:06 +00:00
Elliott Hughes
1baf911bd5 DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot. 
am: a463d24633  -s ours

* commit 'a463d246339f405981bd690209429ef5acf0f01d':
  DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot.

Change-Id: Id9504ed93bedf0f981fc7817d07aee5b74fac8db
 2016-05-03 22:54:31 +00:00
Michael Ryleev
7a2bc37af5 trusty: storage: implement storage proxy daemon 
Change-Id: I80cdf61e5ced00dd32a3e35eb81969d25b624df9
 2016-05-03 15:50:07 -07:00
Andres Morales
eb970794dc trusty: storage: add trusty interface header 
Change-Id: I9885cc8d4204690690b384bbf209f82cb64f9265
 2016-05-03 15:50:05 -07:00
Michael Ryleev
826c2d2834 trusty: add trusty-base.mk 
The trusty-base.mk should be included by devices that use
Trusty TEE to pull in the baseline set of Trusty specific modules.

Change-Id: I47c2095a21f47a40d390c9d5426380ad9507a708
 2016-05-03 15:50:02 -07:00
Andres Morales
b33c9b8ffa trusty: add keymaster module 
Change-Id: Id240b1b33e07d4cb3ea9d188014701e3d2b3c477
 2016-05-03 15:49:59 -07:00
Andres Morales
56d2835021 trusty: add gatekeeper module 
Change-Id: I3e468c103326e6a9147dbed6c803748ffd5e207a
 2016-05-03 15:49:51 -07:00
Dimitry Ivanov
09a516bf16 nativeloader: Add CloseNativeLibrary() method 
This method is called by art on UnloadNativeLibraries()

Bug: http://b/28406866
Change-Id: Ibccff93c83d6ccd3d0a1c0294a64b09281b4e05e
 2016-05-03 14:55:25 -07:00
Felipe Leme
d4611a9680 Automatically add a .zip to adb bugreport file when missing. 
am: 644a36c209

* commit '644a36c20942029ece43ea9fbeb6163d4b706c56':
  Automatically add a .zip to adb bugreport file when missing.

Change-Id: I081fbac07cba3c7e3cbfc263ed71ee4832224d9b
 2016-05-03 21:34:13 +00:00
Michael Ryleev
cb9b299418 Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10 am: 09167c2f5c 
am: 97d33dc5b0  -s ours

* commit '97d33dc5b03c8e2ebfbbf1f3a17c3935a92e696f':
  trusty: storage: implement storage proxy daemon
  trusty: storage: add trusty interface header
  trusty: add trusty-base.mk
  trusty: add keymaster module
  trusty: add gatekeeper module

Change-Id: Idd4cfa612382bf76ca9ed775f36de621197ec54c
 2016-05-03 20:12:16 +00:00
Michael Ryleev
97d33dc5b0 Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10 
am: 09167c2f5c

* commit '09167c2f5cfbc75441d34372a1f0cb1b82c32aa2':
  trusty: storage: implement storage proxy daemon
  trusty: storage: add trusty interface header
  trusty: add trusty-base.mk
  trusty: add keymaster module
  trusty: add gatekeeper module

Change-Id: Ib6576b95a4badf0885a8b922722ec5d9146843a1
 2016-05-03 20:05:00 +00:00
Michael Ryleev
09167c2f5c Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10 
* changes:
  trusty: storage: implement storage proxy daemon
  trusty: storage: add trusty interface header
  trusty: add trusty-base.mk
  trusty: add keymaster module
  trusty: add gatekeeper module
 2016-05-03 19:56:08 +00:00
Felipe Leme
644a36c209 Automatically add a .zip to adb bugreport file when missing. 
BUG: 27653204
Change-Id: Ib322f1f9eeedd8e78c9a51a845a20c462442a0fe
 2016-05-03 10:21:22 -07:00
Elliott Hughes
a463d24633 DO NOT MERGE ANYWHERE Remove the USB vendor id whitelist from fastboot. 
(Backported from AOSP commit: e1746fda6a)

Change-Id: I661a0538776d4ba74fcee37e2964d987eb861342
 2016-05-03 10:14:02 -07:00
Matthew Bouyack
9c59cbcf37 If we fail to format a blank partition, try recovery 
Bug: 28303663

Change-Id: Iab802997dcd2a4416417228c92362518c7f1a82f
 2016-05-03 10:01:03 -07:00
Michael Ryleev
f59560df2c trusty: storage: implement storage proxy daemon 
Change-Id: I80cdf61e5ced00dd32a3e35eb81969d25b624df9
 2016-05-02 15:12:01 -07:00
Andres Morales
117b1307d9 trusty: storage: add trusty interface header 
Change-Id: I9885cc8d4204690690b384bbf209f82cb64f9265
 2016-05-02 15:12:01 -07:00
Michael Ryleev
aedf9af3ec trusty: add trusty-base.mk 
The trusty-base.mk should be included by devices that use
Trusty TEE to pull in the baseline set of Trusty specific modules.

Change-Id: I47c2095a21f47a40d390c9d5426380ad9507a708
 2016-05-02 15:12:01 -07:00
Andres Morales
95989dbb0f trusty: add keymaster module 
Change-Id: Id240b1b33e07d4cb3ea9d188014701e3d2b3c477
 2016-05-02 15:12:01 -07:00
Andres Morales
1571f47f3c trusty: add gatekeeper module 
Change-Id: I3e468c103326e6a9147dbed6c803748ffd5e207a
 2016-05-02 15:12:01 -07:00
Dimitry Ivanov
af736bb59d Merge "nativeloader: Add Reset capabilities" am: 27d75e8bc1 
am: 75701b0d60

* commit '75701b0d60e6b47f3fd78af39c590e313a15a666':
  nativeloader: Add Reset capabilities

Change-Id: I2e365611c2ee22e050a00f6efe8f04d80948dad9
 2016-05-02 21:41:59 +00:00
Dimitry Ivanov
600c6780ec Merge "nativeloader: Add Reset capabilities" into nyc-dev 
am: 3174bda7ac

* commit '3174bda7ac07465400a4b38b272ebe5126212ba6':
  nativeloader: Add Reset capabilities

Change-Id: I337c7047a93d2914363833591f707a29a843228a
 2016-05-02 21:39:09 +00:00
Dimitry Ivanov
75701b0d60 Merge "nativeloader: Add Reset capabilities" 
am: 27d75e8bc1

* commit '27d75e8bc11985e2f3de5aa2811749f53a109a41':
  nativeloader: Add Reset capabilities

Change-Id: I32eb61966c3cdbeef3ac909fcd402447929af40e
 2016-05-02 21:37:05 +00:00
Dimitry Ivanov
27d75e8bc1 Merge "nativeloader: Add Reset capabilities" 2016-05-02 21:31:49 +00:00
Dimitry Ivanov
3174bda7ac Merge "nativeloader: Add Reset capabilities" into nyc-dev 2016-05-02 21:20:00 +00:00
Dimitry Ivanov
911472da85 nativeloader: Add Reset capabilities 
In the case when VM is restarted all weak references
from the old VM become invalid. In such event NativeLoader
needs to clear the list of classloaders from old VM.

Bug: http://b/28453840
Bug: http://b/28449304
Change-Id: I2268c1e21cf940c57ddc5f0312f56b71aa702134
(cherry picked from commit be4ca3afc0)
 2016-05-02 13:35:32 -07:00
Dimitry Ivanov
be4ca3afc0 nativeloader: Add Reset capabilities 
In the case when VM is restarted all weak references
from the old VM become invalid. In such event NativeLoader
needs to clear the list of classloaders from old VM.

Bug: http://b/28453840
Bug: http://b/28449304
Change-Id: I2268c1e21cf940c57ddc5f0312f56b71aa702134
 2016-05-02 10:43:16 -07:00
Elliott Hughes
e9b2950a85 resolve merge conflicts of 755244f to nyc-dev-plus-aosp 
Change-Id: Ib33885d167a1913727f8b51b78babd419fbcdace
 2016-04-30 11:24:47 -07:00