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

19587 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Albert
79602945d8 Merge "[gatekeeperd] copy uid to local before passing to u_map" am: fe8213f0dd am: a9a2eaeadc 
am: a619440436

* commit 'a61944043671859da7693dc444e54eada977947d':
  [gatekeeperd] copy uid to local before passing to u_map
 2015-11-05 20:04:23 +00:00
Dan Albert
a619440436 Merge "[gatekeeperd] copy uid to local before passing to u_map" am: fe8213f0dd 
am: a9a2eaeadc

* commit 'a9a2eaeadc3485e4b2e89f6fd43e02050bfdc687':
  [gatekeeperd] copy uid to local before passing to u_map
 2015-11-05 19:53:53 +00:00
Dan Albert
a9a2eaeadc Merge "[gatekeeperd] copy uid to local before passing to u_map" 
am: fe8213f0dd

* commit 'fe8213f0dd254a1210ba56126e07a21b433c4f75':
  [gatekeeperd] copy uid to local before passing to u_map
 2015-11-05 19:40:04 +00:00
Dan Albert
fe8213f0dd Merge "[gatekeeperd] copy uid to local before passing to u_map" 2015-11-05 19:19:26 +00:00
Andres Morales
70309ff8c7 [gatekeeperd] copy uid to local before passing to u_map 
The compiler will issue the unaligned access instuctions
when reading from a packed struct. Since 'find' takes a
reference, if we pass the field directly it is removed
from its packed context and may be unreadable.

Read the field out directly from the packed struct and pass
in aligned to u_map to fix.

Bug: 22367550
Change-Id: Ia3b639c7518154ff5a2b7c233b752e154eab9aad
(cherry picked from commit 6e83dc4d325d68b568c841d3e88fda2a93e00663)
 2015-11-05 11:09:21 -08:00
Elliott Hughes
c6dc5edf79 Merge "Revert "Add MIPS64r6 support for libpixelflinger"" am: c77c1a3f0a am: b0f336d225 
am: 5531cc3395

* commit '5531cc3395a18e530706f1e1d8c38414624a5c9e':
  Revert "Add MIPS64r6 support for libpixelflinger"
 2015-11-05 19:06:38 +00:00
Elliott Hughes
5531cc3395 Merge "Revert "Add MIPS64r6 support for libpixelflinger"" am: c77c1a3f0a 
am: b0f336d225

* commit 'b0f336d2250c309d3ae56b01171c77152c909527':
  Revert "Add MIPS64r6 support for libpixelflinger"
 2015-11-05 19:00:50 +00:00
Elliott Hughes
b0f336d225 Merge "Revert "Add MIPS64r6 support for libpixelflinger"" 
am: c77c1a3f0a

* commit 'c77c1a3f0a99d3dd280470cb5af6b0ec8a15b0f1':
  Revert "Add MIPS64r6 support for libpixelflinger"
 2015-11-05 18:58:01 +00:00
Elliott Hughes
c77c1a3f0a Merge "Revert "Add MIPS64r6 support for libpixelflinger"" 2015-11-05 18:55:12 +00:00
Elliott Hughes
7fd121788a Revert "Add MIPS64r6 support for libpixelflinger" 
This reverts commit ab5265ebe6.

This broke the mips64 build (which, stupidly, I hadn't tested):

  system/core/libpixelflinger/codeflinger/MIPS64Assembler.h:24:35: fatal error: tinyutils/KeyedVector.h: No such file or directory
   #include "tinyutils/KeyedVector.h"

Change-Id: I4fa1c04e196592fd1ef893a83c75261a55d32290
 2015-11-05 18:54:11 +00:00
Pablo Ceballos
15a54a97fe Merge "Expose setSingleBufferMode in ANativeWindow" 2015-11-05 18:14:08 +00:00
Elliott Hughes
1446a14cbe Merge "Add MIPS64r6 support for libpixelflinger" am: 251f8b69fb am: e8930a093f 
am: 8190add29e

* commit '8190add29e48bf835686490c0b98046bc5358116':
  Add MIPS64r6 support for libpixelflinger
 2015-11-05 18:08:02 +00:00
Elliott Hughes
8190add29e Merge "Add MIPS64r6 support for libpixelflinger" am: 251f8b69fb 
am: e8930a093f

* commit 'e8930a093f934fa9b8f6e84522dfd13d92eb7103':
  Add MIPS64r6 support for libpixelflinger
 2015-11-05 18:06:16 +00:00
Elliott Hughes
e8930a093f Merge "Add MIPS64r6 support for libpixelflinger" 
am: 251f8b69fb

* commit '251f8b69fbe5068aa3a9ebbc3dc42ed5b228fd73':
  Add MIPS64r6 support for libpixelflinger
 2015-11-05 18:04:33 +00:00
Elliott Hughes
251f8b69fb Merge "Add MIPS64r6 support for libpixelflinger" 2015-11-05 18:03:18 +00:00
Will Drewry
1f8164cfa7 Merge "Populate BRILLO_CRASH_SERVER from the product config" am: d3b177ccb5 am: a987cc9733 
am: 6c26b96e04

* commit '6c26b96e04a9c97af30509f322540378d803b0a2':
  Populate BRILLO_CRASH_SERVER from the product config
 2015-11-05 03:46:07 +00:00
Josh Gao
95c54487ce Merge changes I70c94c4b,Ifd8769ed am: 11d18f1491 am: 974da4b603 
am: f4115df5ed

* commit 'f4115df5edd9491af67019d5a5d1399db08e7d1b':
  adb: make mkdirs/secure_mkdirs do what they say.
  adb: remove use of mkdirs from `adb backup`.
 2015-11-05 03:46:00 +00:00
Colin Cross
4e5afbd0c8 Merge "Use exported headers instead of copying" am: e0debcf33e am: 881cdcd155 
am: 6ce1735bdb

* commit '6ce1735bdb79e551d9a6cc2819950ee900e9315f':
  Use exported headers instead of copying
 2015-11-05 03:45:54 +00:00
Will Drewry
6c26b96e04 Merge "Populate BRILLO_CRASH_SERVER from the product config" am: d3b177ccb5 
am: a987cc9733

* commit 'a987cc9733b412f88ba72b57833201e68055ff21':
  Populate BRILLO_CRASH_SERVER from the product config
 2015-11-05 03:43:08 +00:00
Will Drewry
a987cc9733 Merge "Populate BRILLO_CRASH_SERVER from the product config" 
am: d3b177ccb5

* commit 'd3b177ccb5502306546a357d0897e2552384b18c':
  Populate BRILLO_CRASH_SERVER from the product config
 2015-11-05 03:40:30 +00:00
Will Drewry
d3b177ccb5 Merge "Populate BRILLO_CRASH_SERVER from the product config" 2015-11-05 03:37:02 +00:00
Will Drewry
e680f358ec Populate BRILLO_CRASH_SERVER from the product config 
Using cfgtree.mk, this change adds support to load the
crash server URL directly from a file in the product tree
during the build.

BUG=25343470
TEST=build image, check in etc for the populated osrelease.d file

Change-Id: I6342a829936809b9553a32be7bc58285c86dd732
 2015-11-04 18:48:30 -08:00
Josh Gao
f4115df5ed Merge changes I70c94c4b,Ifd8769ed am: 11d18f1491 
am: 974da4b603

* commit '974da4b60389719677d04f71c1e6568f6d687139':
  adb: make mkdirs/secure_mkdirs do what they say.
  adb: remove use of mkdirs from `adb backup`.
 2015-11-05 01:55:22 +00:00
Colin Cross
6ce1735bdb Merge "Use exported headers instead of copying" am: e0debcf33e 
am: 881cdcd155

* commit '881cdcd15595a3518f89070957c18d128c3edd7e':
  Use exported headers instead of copying
 2015-11-05 01:55:16 +00:00
Josh Gao
974da4b603 Merge changes I70c94c4b,Ifd8769ed 
am: 11d18f1491

* commit '11d18f1491430902939e8d3be4d895e6e950f00c':
  adb: make mkdirs/secure_mkdirs do what they say.
  adb: remove use of mkdirs from `adb backup`.
 2015-11-05 01:53:17 +00:00
Colin Cross
881cdcd155 Merge "Use exported headers instead of copying" 
am: e0debcf33e

* commit 'e0debcf33e942e64e8ee11f2f71787651be5bdd6':
  Use exported headers instead of copying
 2015-11-05 01:53:09 +00:00
Josh Gao
11d18f1491 Merge changes I70c94c4b,Ifd8769ed 
* changes:
  adb: make mkdirs/secure_mkdirs do what they say.
  adb: remove use of mkdirs from `adb backup`.
 2015-11-05 01:45:22 +00:00
Colin Cross
e0debcf33e Merge "Use exported headers instead of copying" 2015-11-05 01:17:12 +00:00
Colin Cross
7f68acb135 Use exported headers instead of copying 
Use LOCAL_C_EXPORT_INCLUDE_DIRS to share exported headers instead of
copying them to $OUT/obj/include.  Fixes make warnings on multiple rules
to copy the headers from the shared and static versions of the library.

Change-Id: Ide68ed604a62c9eb693dc4bca892f1781622ff95
 2015-11-04 17:05:24 -08:00
Bertrand Simonnet
1f635c2c64 Merge "metricsd: Collect average cpu usage information." am: 900d9df1e5 am: 410d7cc881 
am: 2caa1e920a

* commit '2caa1e920aa104073ea9e47f3e22772c6f22c7ae':
  metricsd: Collect average cpu usage information.
 2015-11-04 23:31:19 +00:00
Bertrand Simonnet
2caa1e920a Merge "metricsd: Collect average cpu usage information." am: 900d9df1e5 
am: 410d7cc881

* commit '410d7cc8810d9fc791960adfa8a2e22997ba3579':
  metricsd: Collect average cpu usage information.
 2015-11-04 23:29:21 +00:00
Bertrand Simonnet
410d7cc881 Merge "metricsd: Collect average cpu usage information." 
am: 900d9df1e5

* commit '900d9df1e5c1f272a3c743894cbdf1441eea7f3a':
  metricsd: Collect average cpu usage information.
 2015-11-04 23:24:24 +00:00
Bertrand Simonnet
900d9df1e5 Merge "metricsd: Collect average cpu usage information." 2015-11-04 23:20:26 +00:00
Josh Gao
45b6fc878a adb: make mkdirs/secure_mkdirs do what they say. 
Previously, mkdirs/secure_mkdirs wouldn't create a directory at the
specified path, only the ones above it.

Bug: http://b/25459942
Change-Id: I70c94c4b44d90723cb4a063657fc40e5bcb3b10e
 2015-11-04 14:51:23 -08:00
Josh Gao
09c5bbf0fb adb: remove use of mkdirs from adb backup. 
`adb backup -f nonexistent/directories/foo <pkg>` shouldn't create the
directory structure if they don't already exist.

Change-Id: Ifd8769ed7ee5e733a6635751ad09b714ab58ea4b
 2015-11-04 14:35:43 -08:00
Josh Gao
d3b8f29d09 Merge "adb: make adb_basename match the POSIX behavior." am: 77cdfbd50c am: 29c468f379 
am: 521015eba8

* commit '521015eba87af4d08b96747192b7f42067976344':
  adb: make adb_basename match the POSIX behavior.
 2015-11-04 22:32:21 +00:00
Josh Gao
521015eba8 Merge "adb: make adb_basename match the POSIX behavior." am: 77cdfbd50c 
am: 29c468f379

* commit '29c468f3790770931db8cc4a5a66538d34ef31d6':
  adb: make adb_basename match the POSIX behavior.
 2015-11-04 22:30:27 +00:00
Josh Gao
29c468f379 Merge "adb: make adb_basename match the POSIX behavior." 
am: 77cdfbd50c

* commit '77cdfbd50c2110ade6e57319f99c966c45174fd8':
  adb: make adb_basename match the POSIX behavior.
 2015-11-04 22:28:26 +00:00
Josh Gao
77cdfbd50c Merge "adb: make adb_basename match the POSIX behavior." 2015-11-04 22:26:32 +00:00
Josh Gao
787f3442cc adb: make adb_basename match the POSIX behavior. 
Previously, adb_basename was behaving according to the GNU, POSIX-incompatible
basename, despite POSIX adb_dirname existing alongside it. This patch changes
adb_basename to pass through to the POSIX basename.

Bug: http://b/25456821
Change-Id: I62a4865cccf3b9cdbc112e3e53ff475aa4a23bd9
 2015-11-04 14:21:35 -08:00
Elliott Hughes
75718ed046 Merge "Fix Mac adb build." am: 8660035010 am: 2176a87b8e 
am: 48b6a1f346

* commit '48b6a1f346dd7e01eb7d3cca6fce521156402f46':
  Fix Mac adb build.
 2015-11-04 21:28:26 +00:00
Elliott Hughes
48b6a1f346 Merge "Fix Mac adb build." am: 8660035010 
am: 2176a87b8e

* commit '2176a87b8e0bb9509bce3b69433fe1c74330ee87':
  Fix Mac adb build.
 2015-11-04 21:24:38 +00:00
Elliott Hughes
2176a87b8e Merge "Fix Mac adb build." 
am: 8660035010

* commit '8660035010515833c538401a418dfb74427aefc6':
  Fix Mac adb build.
 2015-11-04 21:22:01 +00:00
Elliott Hughes
8660035010 Merge "Fix Mac adb build." 2015-11-04 21:14:19 +00:00
Elliott Hughes
0fbf9618bb Fix Mac adb build. 
The Mac doesn't have <termio.h>, and it looks like the canonical place for
struct winsize is <sys/ioctl.h> anyway.

  system/core/adb/commandline.cpp:44:10: fatal error: 'termio.h' file not found
  #include <termio.h>

Bug: http://b/19734542
Change-Id: I3bfbf58cdb9b582f3b7e2c9ef0977613001cd3ac
 2015-11-04 13:07:47 -08:00
Elliott Hughes
357fb9e8d0 Merge "adb shell SIGWINCH support." am: 1358e2869c am: d1467af6f0 
am: e768a35344

* commit 'e768a353449dd0e4aa1612fa5c2ed5c9bab66c5f':
  adb shell SIGWINCH support.
 2015-11-04 20:56:14 +00:00
Elliott Hughes
e768a35344 Merge "adb shell SIGWINCH support." am: 1358e2869c 
am: d1467af6f0

* commit 'd1467af6f0e3a6ee92fec8d4591ebd9edb7ecad4':
  adb shell SIGWINCH support.
 2015-11-04 20:54:13 +00:00
Elliott Hughes
d1467af6f0 Merge "adb shell SIGWINCH support." 
am: 1358e2869c

* commit '1358e2869c5816c74582cbc1f21eba50512375c1':
  adb shell SIGWINCH support.
 2015-11-04 20:51:36 +00:00
Elliott Hughes
1358e2869c Merge "adb shell SIGWINCH support." 2015-11-04 20:46:56 +00:00
Bertrand SIMONNET
0ada2ca1dc metricsd: Collect average cpu usage information. 
Collect a new histogram (Platform.CpuUsage.Percent), collecting the
average cpu usage in percent of the total cpu usage possible (across all
cpus).
This measurement is collected every minute.

Bug: 25231576
Test: unit tests.
Test: Manual testing.

Change-Id: I1c63486c177f0c2d4bd361eb9e351a7ca25b80d9
 2015-11-04 12:14:13 -08:00