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
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
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
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
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
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
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
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
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
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
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
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
Christopher Wiley
2a7b86337f
Don't include android-base/macros.h from android-base/unique_fd.h
...
This prevents a ton of macro collisions when libfoo includes libbinder
includes unique_fd.h.
Bug: 27804373
Change-Id: Ide834afb1052b32e86fad3fcba10cff3dafeb899
2016-04-19 14:45:48 -07:00
Raja M
a2f37e4fd7
More secure and 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.
Change-Id: I999bd83785456a77247e5e1d708e2bdde2eb057b
2016-04-20 02:20:50 +05:30
Yabin Cui
e618f6cb36
Merge "adb: use a custom thread to poll for usb devices on mac." am: 09c5fcf
...
am: 507f38f
* commit '507f38f6d7e8dcae4b513ea6c5f638ae43204245':
adb: use a custom thread to poll for usb devices on mac.
Change-Id: Idc21e33a8b0942afe0f6fa18076718d71d9d34f6
2016-04-19 20:38:07 +00:00
Yabin Cui
507f38f6d7
Merge "adb: use a custom thread to poll for usb devices on mac."
...
am: 09c5fcf
* commit '09c5fcf7603f6e75b7859e109a0cec966f00ab3e':
adb: use a custom thread to poll for usb devices on mac.
Change-Id: Ifaa7385ea6866e27a1fe092fadb991563153fcab
2016-04-19 20:33:14 +00:00
Yabin Cui
09c5fcf760
Merge "adb: use a custom thread to poll for usb devices on mac."
2016-04-19 20:22:13 +00:00
Yabin Cui
48d4c0c42a
adb: use a custom thread to poll for usb devices on mac.
...
On mac, if the adb server kicks a transport on some error, mac usb driver
will not report a new usb device. So instead of relying on mac usb driver
to report new usb devices, this CL uses a loop to search for usb devices
not exist before. Note that this is also the behavior on windows and linux
host.
`adb reconnect` can be used to verity this CL.
Bug: 25935458
Change-Id: I890e0eb1fae173f2e7a0c962ededa294d821e015
2016-04-19 11:26:44 -07:00
Mark Salyzyn
eed4f10175
Merge "liblog: android_log_isloggable failing apct" into nyc-dev
...
am: ded0f36
* commit 'ded0f36822864506ca950466fb1de37de78ab51b':
liblog: android_log_isloggable failing apct
Change-Id: I56c06ae285c5cce927f72de28ff4f9d426f13c7a
2016-04-19 17:22:08 +00:00
TreeHugger Robot
ded0f36822
Merge "liblog: android_log_isloggable failing apct" into nyc-dev
2016-04-19 17:05:37 +00:00
Chih-hung Hsieh
f648232165
Merge "Fix google-runtime-int warnings." am: 603df0e
...
am: 6eaa916
* commit '6eaa91685fa69bd7bb4309933899a9e33fa61dfd':
Fix google-runtime-int warnings.
Change-Id: I2e0fd77a2c841e5279973f08e961bf2ffdd41c09
2016-04-19 16:25:05 +00:00
Chih-Hung Hsieh
6eaa91685f
Merge "Fix google-runtime-int warnings."
...
am: 603df0e
* commit '603df0e875a43cb045e9235b95f8a883f1722f1d':
Fix google-runtime-int warnings.
Change-Id: Idc70dd39818a14f11a6dd6fae7955700a0abac66
2016-04-19 16:21:46 +00:00
Chih-hung Hsieh
603df0e875
Merge "Fix google-runtime-int warnings."
2016-04-19 16:14:10 +00:00
Treehugger Robot
e992891624
Merge "Define LIKELY and UNLIKELY in a vendor friendly way" am: 7ed5194
...
am: 6590a92
* commit '6590a92777da96268ca3ed30958fac7cb8ea35dc':
Define LIKELY and UNLIKELY in a vendor friendly way
Change-Id: I56c6b834fa6646f37c7ca5618a74906a0445601e
2016-04-19 15:47:36 +00:00
Christopher Wiley
6590a92777
Merge "Define LIKELY and UNLIKELY in a vendor friendly way"
...
am: 7ed5194
* commit '7ed5194278dd9ffcda203dd3a8250c0cb2914d07':
Define LIKELY and UNLIKELY in a vendor friendly way
Change-Id: Ie782284f30e731b6ee26b99c39e532b27210eaec
2016-04-19 15:44:11 +00:00
Treehugger Robot
7ed5194278
Merge "Define LIKELY and UNLIKELY in a vendor friendly way"
2016-04-19 15:24:14 +00:00
Paul Lawrence
1a920d72dc
Merge "Don\'t start defaultcrypto twice" into nyc-dev
...
am: fe5d55a
* commit 'fe5d55a68b9dc3a593d3f6ee5be919b8a9de710c':
Don't start defaultcrypto twice
Change-Id: I0e9a27208ea046a2cf738992ba97141da9026c08
2016-04-19 14:46:48 +00:00
Paul Lawrence
fe5d55a68b
Merge "Don't start defaultcrypto twice" into nyc-dev
2016-04-19 14:44:26 +00:00