Commit graph

22860 commits

Author SHA1 Message Date
TreeHugger Robot
d5f110f163 Merge "Remove workaround for libart greylist." into nyc-dev am: 595efd0
am: 9c69970

* commit '9c69970a9baf61fa24227434a669ca4863f63c19':
  Remove workaround for libart greylist.

Change-Id: I65ac7f07c96598b7f18ba8928fe5c3bd085a189d
2016-04-25 23:15:40 +00:00
Alex Light
9c69970a9b Merge "Remove workaround for libart greylist." into nyc-dev
am: 595efd0

* commit '595efd04db3970180d2a2de97524ac5e9a421a25':
  Remove workaround for libart greylist.

Change-Id: Ia42dfbad1f4c39592b8534eb16fbfe77444a46b7
2016-04-25 23:05:13 +00:00
Chih-Hung Hsieh
1695ced15e Merge "Fix google-explicit-constructor warnings." am: f966019 am: e5100e6
am: 2a4a02a

* commit '2a4a02a870bcfb5ecd3c5f9e7077ffe1327623b0':
  Fix google-explicit-constructor warnings.

Change-Id: I4f758494c81043243f84d66c67a9037bd6637691
2016-04-25 22:59:55 +00:00
Chih-hung Hsieh
2a4a02a870 Merge "Fix google-explicit-constructor warnings." am: f966019
am: e5100e6

* commit 'e5100e66775df8895e90588f203074ca405ea97e':
  Fix google-explicit-constructor warnings.

Change-Id: I72c7c9c5c179ab285e0fe758dd18ed55f2a2246d
2016-04-25 22:44:32 +00:00
Chih-Hung Hsieh
e5100e6677 Merge "Fix google-explicit-constructor warnings."
am: f966019

* commit 'f9660191f03a7e2ee83064c5240e97a82a482769':
  Fix google-explicit-constructor warnings.

Change-Id: I9fb5f687858dba101fd6f3f5e728cce2d4d815e9
2016-04-25 22:38:37 +00:00
Chih-hung Hsieh
f9660191f0 Merge "Fix google-explicit-constructor warnings." 2016-04-25 22:22:06 +00:00
TreeHugger Robot
595efd04db Merge "Remove workaround for libart greylist." into nyc-dev 2016-04-25 21:53:31 +00:00
Raja M
44d27e7725 Merge "GCC compiler warning fix for sprintf into snprintf" am: d2afbe4 am: 3b4af9a
am: 32fed55

* commit '32fed55e81c423480b96c6eeb70da11067777212':
  GCC compiler warning fix for sprintf into snprintf

Change-Id: Iee25a662ffaa138196437aa48bd0dadf9ef381e8
2016-04-25 21:26:18 +00:00
Elliott Hughes
32fed55e81 Merge "GCC compiler warning fix for sprintf into snprintf" am: d2afbe4
am: 3b4af9a

* commit '3b4af9a44dd6ffa724dfb5f40479f817efc74227':
  GCC compiler warning fix for sprintf into snprintf

Change-Id: I76d8892909721d7218112f5d360eca91ae686e84
2016-04-25 21:20:15 +00:00
Raja M
3b4af9a44d Merge "GCC compiler warning fix for sprintf into snprintf"
am: d2afbe4

* commit 'd2afbe45e1ff50e38e907b0ca2fff3dbec3ba529':
  GCC compiler warning fix for sprintf into snprintf

Change-Id: I18e23cb3df033869144f9c5f3e7563d53f5e5333
2016-04-25 21:14:29 +00:00
Elliott Hughes
d2afbe45e1 Merge "GCC compiler warning fix for sprintf into snprintf" 2016-04-25 20:58:04 +00:00
Chih-Hung Hsieh
1cc82ce95c Fix google-explicit-constructor warnings.
Bug: 28341362
Change-Id: I2cf746fd07addc6e6c22e98e2a5bb8a8ce47c885
2016-04-25 13:49:46 -07:00
Android Build Merger (Role)
f6a07c055c Merge "Merge "Move gatekeeperd to system-background cpuset." into nyc-dev am: 0e54903 am: 91bd529" into nyc-mr1-dev-plus-aosp 2016-04-25 18:09:02 +00:00
Martijn Coenen
559d2182f5 Merge "Move gatekeeperd to system-background cpuset." into nyc-dev am: 0e54903
am: 8c65002

* commit '8c650021142f7757836ef55803883643a8cc7fdc':
  Move gatekeeperd to system-background cpuset.

Change-Id: I7e7a5f9f302f2ac3d132daef8385da6cf81d0a0c
2016-04-25 18:08:53 +00:00
Martijn Coenen
57a4923afb Merge "Move gatekeeperd to system-background cpuset." into nyc-dev am: 0e54903
am: 91bd529

* commit '91bd5294180b825141009c1d6c7a6e0b2bdda562':
  Move gatekeeperd to system-background cpuset.

Change-Id: Ie26404a163b67c4acea8a6a8ad1d9d1ea145b3ce
2016-04-25 18:08:53 +00:00
Martijn Coenen
8c65002114 Merge "Move gatekeeperd to system-background cpuset." into nyc-dev
am: 0e54903

* commit '0e54903c737aa71590d222828cd31944bd2be4cb':
  Move gatekeeperd to system-background cpuset.

Change-Id: I4cb18f78f65baa727c777d0f98ecead1d060e7e5
2016-04-25 18:03:25 +00:00
Martijn Coenen
91bd529418 Merge "Move gatekeeperd to system-background cpuset." into nyc-dev
am: 0e54903

* commit '0e54903c737aa71590d222828cd31944bd2be4cb':
  Move gatekeeperd to system-background cpuset.

Change-Id: I2af7286befadbe848628440ed1548abc183a18c1
2016-04-25 18:03:20 +00:00
Yabin Cui
c4b0fde361 Merge "adb: fix adb usb operations on device." am: ad2021a am: ec4db8f
am: 799e803

* commit '799e80334ccecba09a9cb8138c4ae0ce29a4d1c4':
  adb: fix adb usb operations on device.

Change-Id: Ied724a6cebf6ad79e61a8c0251d1dd4ca8ffea89
2016-04-25 17:53:57 +00:00
Martijn Coenen
0e54903c73 Merge "Move gatekeeperd to system-background cpuset." into nyc-dev 2016-04-25 17:46:01 +00:00
Yabin Cui
799e80334c Merge "adb: fix adb usb operations on device." am: ad2021a
am: ec4db8f

* commit 'ec4db8f14f8ecc122505f17f93ca7e34ced409b4':
  adb: fix adb usb operations on device.

Change-Id: I6daa50bfdb968ef3f1371f30ee3a378630169ce7
2016-04-25 17:41:41 +00:00
Yabin Cui
ec4db8f14f Merge "adb: fix adb usb operations on device."
am: ad2021a

* commit 'ad2021a1b1144f8b307c11ff0a8b47fd85c3cc7a':
  adb: fix adb usb operations on device.

Change-Id: I2907aa60f4b69cb09ef9d5d1d30797e84af21c7d
2016-04-25 17:36:20 +00:00
Yabin Cui
ad2021a1b1 Merge "adb: fix adb usb operations on device." 2016-04-25 17:19:03 +00:00
Raja M
79bf64dc66 GCC compiler warning fix for sprintf into snprintf
To fix GCC WARNINGS while building.
or
To support error free -D_FORTIFY_SOURCE=2 strict mode compilation.
2016-04-24 09:44:04 +05:30
Zach Riggle
ca80a278a8 Merge "Fix NULL deref on exec-in with insufficient arguments" am: 245e4dbfd4 am: a0690543da
am: f9f0b5f413

* commit 'f9f0b5f41351990968065020a67445d20b93616c':
  Fix NULL deref on exec-in with insufficient arguments

Change-Id: I0e57256c531c3bd1be2556abb03a3c13eaf4d38b
2016-04-22 15:57:43 +00:00
Zach Riggle
f9f0b5f413 Merge "Fix NULL deref on exec-in with insufficient arguments" am: 245e4dbfd4
am: a0690543da

* commit 'a0690543dac2792508caef09e9e97804b31fea24':
  Fix NULL deref on exec-in with insufficient arguments

Change-Id: Ic5e62d01fecc77aace676bf6cdf4218f93806860
2016-04-22 15:53:55 +00:00
Zach Riggle
a0690543da Merge "Fix NULL deref on exec-in with insufficient arguments"
am: 245e4dbfd4

* commit '245e4dbfd459f63bad100b09bd58e3931924e16f':
  Fix NULL deref on exec-in with insufficient arguments

Change-Id: I386257b6c30c4f02e161e2b0a827e73eca9d229e
2016-04-22 15:51:38 +00:00
Treehugger Robot
245e4dbfd4 Merge "Fix NULL deref on exec-in with insufficient arguments" 2016-04-22 15:40:58 +00:00
Zach Riggle
ccafc79de7 Fix NULL deref on exec-in with insufficient arguments
(cherry-pick of 566a28169b84836fddd5ae96db9b147237ea054f.)

Bug: 28152091
Change-Id: Ib59e3bf7f26974aa09d2e6a0e1d9281d7ce25511
2016-04-22 08:08:01 -07:00
Christopher Ferris
d77c5ecec8 Connect to activity manager as root. am: 0fc89f3
am: 420734b83c

* commit '420734b83cf0c16ba8b0e7b165599555e51818ef':

Change-Id: I350616336369afa1c67646253e111f8d35021ab4
2016-04-21 00:21:28 +00:00
Christopher Ferris
7b76d78a8a Merge "Connect to activity manager as root." am: d61bfb9 am: 2c0c529
am: c25bd56

* commit 'c25bd561ae4cfb0e517501f17ffad2158cdc8631':
  Connect to activity manager as root.

Change-Id: Ia0dffa2ea1f7c1c33eea7d4a7b81bbd8f740a11e
2016-04-20 23:52:06 +00:00
Treehugger Robot
c25bd561ae Merge "Connect to activity manager as root." am: d61bfb9
am: 2c0c529

* commit '2c0c52962796feb589e37dba948ba28aae992b01':
  Connect to activity manager as root.

Change-Id: Ic76dda3a7086d33262d51379a70b31b5846d9cdd
2016-04-20 23:46:05 +00:00
Christopher Ferris
2c0c529627 Merge "Connect to activity manager as root."
am: d61bfb9

* commit 'd61bfb9a79e3e7a85738341a8cbc67abf4e56e8b':
  Connect to activity manager as root.

Change-Id: I926f7a2e0f8929e999b424a63f38a00ec7a78501
2016-04-20 22:59:35 +00:00
Treehugger Robot
d61bfb9a79 Merge "Connect to activity manager as root." 2016-04-20 22:47:50 +00:00
Christopher Ferris
9fb0778836 Connect to activity manager as root. am: 0fc89f3
am: 1ba92f8

* commit '1ba92f874addd332554ebe7da245dbb1e3e7edd0':
  Connect to activity manager as root.

Change-Id: I077fc33e01b202f9e3dc218f755e7c90c801d427
2016-04-20 22:23:20 +00:00
Christopher Ferris
1ba92f874a Connect to activity manager as root.
am: 0fc89f3

* commit '0fc89f34b99f20f0ebc0111df74490f4ebd44076':
  Connect to activity manager as root.

Change-Id: I28ad7d209d6d94be790bd4ffd1e5b31da4cd8589
2016-04-20 21:58:06 +00:00
Christopher Ferris
420734b83c Connect to activity manager as root.
am: 0fc89f3

* commit '0fc89f34b99f20f0ebc0111df74490f4ebd44076':
  Connect to activity manager as root.

Change-Id: If3bbef7e2770483612e85fb4eccc6aedb10843a3
2016-04-20 21:46:30 +00:00
Christopher Ferris
8fb38ae82d Connect to activity manager as root.
Before dropping root privileges, connect to the activity manager.
Also, only connect to the activity manager if this is a crash.

Bug: 28210681
(cherry picked from commit 0fc89f34b9)

Change-Id: Id25b92e550d71ffe1b9eafe43976ef514a83714b
2016-04-20 14:38:44 -07:00
Christopher Ferris
0fc89f34b9 Connect to activity manager as root.
Before dropping root privileges, connect to the activity manager.
Also, only connect to the activity manager if this is a crash.

Bug: 28210681
Change-Id: Ie266031910519fa2aa6835644a95c1fc56e24d8d
2016-04-20 11:30:33 -07:00
Colin Cross
be418dae35 Merge "Update sanitize property format" am: 0652728 am: 9ba3f6d
am: c4dcc38

* commit 'c4dcc38e44a28d91922def85b1ff95802cdf50f7':
  Update sanitize property format

Change-Id: I6ba9b2b80adb9acd8ffd936ad4fbd3d3c9c85f4f
2016-04-19 22:57:52 +00:00
Colin Cross
c4dcc38e44 Merge "Update sanitize property format" am: 0652728
am: 9ba3f6d

* commit '9ba3f6db392f0f9b25cc5b3ad03c984fdc76094f':
  Update sanitize property format

Change-Id: I7ac818440c50c7166921d74dfb3b6c10af19ee09
2016-04-19 22:51:08 +00:00
Colin Cross
9ba3f6db39 Merge "Update sanitize property format"
am: 0652728

* commit '0652728e2aa101d066600e50f0c91555bd03bf92':
  Update sanitize property format

Change-Id: Id697be990e9a42ad321fc9be885d88ae453ccfc8
2016-04-19 22:47:51 +00:00
Christopher Wiley
9d24569b78 Merge "Don\'t include android-base/macros.h from android-base/unique_fd.h" am: 090003a am: df38f5e
am: 9428814

* commit '9428814b8e57e0562235776927c0d3ed99f73f2c':
  Don't include android-base/macros.h from android-base/unique_fd.h

Change-Id: I54c1a14226dab156e9aa40b83f6186b36fc3e459
2016-04-19 22:44:59 +00:00
Colin Cross
0652728e2a Merge "Update sanitize property format" 2016-04-19 22:42:04 +00:00
Treehugger Robot
9428814b8e Merge "Don\'t include android-base/macros.h from android-base/unique_fd.h" am: 090003a
am: df38f5e

* commit 'df38f5e20948b7dfe75f07346ba2961e25a1c32c':
  Don't include android-base/macros.h from android-base/unique_fd.h

Change-Id: I4aebfc31bea7225232636bae56e92a9460a5d6fb
2016-04-19 22:41:06 +00:00
Christopher Wiley
df38f5e209 Merge "Don\'t include android-base/macros.h from android-base/unique_fd.h"
am: 090003a

* commit '090003a8d19899abe3cb3126a89b9f5a97b52f57':
  Don't include android-base/macros.h from android-base/unique_fd.h

Change-Id: Ibad9225be050ff04077889a7b83cdf232112fb37
2016-04-19 22:37:47 +00:00
Treehugger Robot
090003a8d1 Merge "Don't include android-base/macros.h from android-base/unique_fd.h" 2016-04-19 22:34:57 +00:00
Raja M
5f442dc01c Merge "More secure and compiler warning fix for sprintf into snprintf" am: 4f21555 am: e05688a
am: 2af9f2f

* commit '2af9f2fe82d05c095779957d98c6987958ee9ce8':
  More secure and compiler warning fix for sprintf into snprintf

Change-Id: I738f4c0893fe0924008049c666a25d0f9bb9539f
2016-04-19 22:31:01 +00:00
Elliott Hughes
2af9f2fe82 Merge "More secure and compiler warning fix for sprintf into snprintf" am: 4f21555
am: e05688a

* commit 'e05688a176c27025d59c0a512501a411b56f1bb1':
  More secure and compiler warning fix for sprintf into snprintf

Change-Id: I93d4ff6d1c2674113d481ff06170d19f31951346
2016-04-19 22:23:33 +00:00
Raja M
e05688a176 Merge "More secure and compiler warning fix for sprintf into snprintf"
am: 4f21555

* commit '4f2155518a6a8988c36cb59bcf3af6a17554db17':
  More secure and compiler warning fix for sprintf into snprintf

Change-Id: Ifda61512ee281763a0bfbe8e918a4a2b346d2579
2016-04-19 22:19:57 +00:00
Elliott Hughes
4f2155518a Merge "More secure and compiler warning fix for sprintf into snprintf" 2016-04-19 22:03:58 +00:00