OSDN Git Service

android-x86/frameworks-native.git
7 years agoMerge "Add fallback case in glGetShaderInfoLog"
Romain Guy [Wed, 30 Nov 2016 17:05:34 +0000 (17:05 +0000)]
Merge "Add fallback case in glGetShaderInfoLog"

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff452...
Jinguang Dong [Wed, 30 Nov 2016 06:40:02 +0000 (06:40 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff4527 am: 83f8bba2a5 am: 60f8850e70
am: f3fe700dc2

Change-Id: I13ae45fde822c625cd70b60db6fdbd1e1236a462

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff452...
Jinguang Dong [Wed, 30 Nov 2016 06:34:31 +0000 (06:34 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff4527 am: 83f8bba2a5
am: 60f8850e70

Change-Id: I5baca403532b095c89838dd0733439c09c430c16

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff4527
Jinguang Dong [Wed, 30 Nov 2016 06:28:30 +0000 (06:28 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test" am: 2792ff4527
am: 83f8bba2a5

Change-Id: Ie5a2b0f7cc37092618a7d35083cf53bf9f7f4212

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
Jinguang Dong [Wed, 30 Nov 2016 06:22:31 +0000 (06:22 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
am: 2792ff4527

Change-Id: Ia8c1ac3f9eff3680ed64235cb01043d0b7c434b9

7 years agoMerge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"
Treehugger Robot [Wed, 30 Nov 2016 06:11:21 +0000 (06:11 +0000)]
Merge "surfaceflinger:Fix potential crash issue when do AIDL FUZZ test"

7 years agoMerge "Delete HWC2to1Adapter unused code."
TreeHugger Robot [Wed, 30 Nov 2016 05:47:24 +0000 (05:47 +0000)]
Merge "Delete HWC2to1Adapter unused code."

7 years agoMerge "Delete unused mutex in HWC2to1Adapter"
TreeHugger Robot [Wed, 30 Nov 2016 05:40:43 +0000 (05:40 +0000)]
Merge "Delete unused mutex in HWC2to1Adapter"

7 years agoAdd fallback case in glGetShaderInfoLog
Romain Guy [Wed, 30 Nov 2016 02:36:46 +0000 (18:36 -0800)]
Add fallback case in glGetShaderInfoLog

Some drivers do not always report the proper info log length
through glGetShaderiv which causes the JNI bindings to return
an empty log string. This change falls back to a length of
512 bytes when the queried length is 0. This is the same
fallback used in libhwui.

Bug: 16624915
Test: CtsOpenGLTestCases
Change-Id: I8deea6a7454efceb7c5d862b7055a34964f5bded

7 years agoDelete HWC2to1Adapter unused code.
Fabien Sanglard [Tue, 29 Nov 2016 19:10:40 +0000 (11:10 -0800)]
Delete HWC2to1Adapter unused code.

HWC2to1Adapter supports forwarding Display requests from device
to client. However hwc1 does not support the request.

Change-Id: Id2e77b18823d319721473b3a8c8838aa20b7daec

7 years agoMerge "Move VP9 Encoder parameters to the end of the enum"
TreeHugger Robot [Tue, 29 Nov 2016 23:24:33 +0000 (23:24 +0000)]
Merge "Move VP9 Encoder parameters to the end of the enum"

7 years agoMerge "Even moar refactoring..."
TreeHugger Robot [Tue, 29 Nov 2016 22:34:18 +0000 (22:34 +0000)]
Merge "Even moar refactoring..."

7 years agoDelete unused mutex in HWC2to1Adapter
Fabien Sanglard [Tue, 29 Nov 2016 19:14:54 +0000 (11:14 -0800)]
Delete unused mutex in HWC2to1Adapter

Change-Id: I2fe5b8b6d35c07fc2243c88d5739a25be5c61686

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
Fabien Sanglard [Tue, 29 Nov 2016 09:53:54 +0000 (09:53 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224 am: b17adaa85f am: c261a17e51 am: ce40ad2441 am: 97ce922887 am: 95df778f8a
am: 86cd1cad61

Change-Id: I4f0e8f79fb07051f9a2c94eea4e5cd3f184602c8

7 years agoFix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169...
Fabien Sanglard [Tue, 29 Nov 2016 09:53:38 +0000 (09:53 +0000)]
Fix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169 am: 0517da2c5a am: b0dff427a1 am: 1852db9aa3 am: d4f7a66cf6 am: 0646227ad2 am: 8f2e06aaf3
am: 00b29980f2

Change-Id: Ia19d41e9c824b5ed6352834c2deefcbaf0220771

7 years agoCheck and restorecon cache/code_cache directories. am: 397ec26675 am: 6437218b85...
Jeff Sharkey [Tue, 29 Nov 2016 09:53:20 +0000 (09:53 +0000)]
Check and restorecon cache/code_cache directories. am: 397ec26675 am: 6437218b85 am: fefe4c8135
am: fadbc66aeb

Change-Id: I57408700aa66832aa7344fea33523e66cbf2aaef

7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd3...
Ruben Brunk [Tue, 29 Nov 2016 09:52:55 +0000 (09:52 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32 am: 323f83ef75 am: 6550cf9f5a
am: 9d8eca1953

Change-Id: I82cd38de1673fc4a12bf4a368f4333ab9ee581a6

7 years agoDo not set VR mode feature as handset default. am: 5ce292f55b am: f0f8f0a99d am:...
Ruben Brunk [Tue, 29 Nov 2016 09:52:43 +0000 (09:52 +0000)]
Do not set VR mode feature as handset default. am: 5ce292f55b am: f0f8f0a99d am: e69143f83e
am: 718bf38829

Change-Id: I6bc0bf3c43bc9c9dcac922477cc54c95ec092243

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665...
Steve Pfetsch [Tue, 29 Nov 2016 09:52:27 +0000 (09:52 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665 am: b3f571bc1e am: 578beb39f3
am: 0c11212c29

Change-Id: I563dae11c7815413e48563a1eb07ac341da39e55

7 years agoRevert "services: surfaceflinger: ASAN fix" am: 598f6d5429 am: d5156b70ff am: 537939b99b
Steve Pfetsch [Tue, 29 Nov 2016 09:52:12 +0000 (09:52 +0000)]
Revert "services: surfaceflinger: ASAN fix" am: 598f6d5429 am: d5156b70ff am: 537939b99b
am: 377311b5a1

Change-Id: Ibd9e827bd26355769f84b222b206fcb7f08176c0

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
Felipe Leme [Tue, 29 Nov 2016 09:51:56 +0000 (09:51 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccbc3 am: dca861e167 am: d5473a08d2
am: 61fd9f386e  -s ours

Change-Id: Ia2b4d504c4b91f5d466ae7776a62d67475ebe650

7 years agoresolve merge conflicts of 3069899 to nyc-mr2-dev-plus-aosp
Narayan Kamath [Tue, 29 Nov 2016 09:51:41 +0000 (09:51 +0000)]
resolve merge conflicts of 3069899 to nyc-mr2-dev-plus-aosp
am: 2df9dc0a00

Change-Id: I704dd216fc7db667558fade9dd0ac6ea42cca885

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
Fabien Sanglard [Tue, 29 Nov 2016 09:48:42 +0000 (09:48 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224 am: b17adaa85f am: c261a17e51 am: ce40ad2441 am: 97ce922887
am: 95df778f8a

Change-Id: Ib4408703114f6c7ebd71c1f29deee2a79f105969

7 years agoFix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169...
Fabien Sanglard [Tue, 29 Nov 2016 09:48:27 +0000 (09:48 +0000)]
Fix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169 am: 0517da2c5a am: b0dff427a1 am: 1852db9aa3 am: d4f7a66cf6 am: 0646227ad2
am: 8f2e06aaf3

Change-Id: Ib4ae67ba1b8a3b8c30b69af2cdac5774f1c7b008

7 years agoCheck and restorecon cache/code_cache directories. am: 397ec26675 am: 6437218b85
Jeff Sharkey [Tue, 29 Nov 2016 09:48:10 +0000 (09:48 +0000)]
Check and restorecon cache/code_cache directories. am: 397ec26675 am: 6437218b85
am: fefe4c8135

Change-Id: I0b5e66f0187dc832721acceeb8886f8f7ac82a31

7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd3...
Ruben Brunk [Tue, 29 Nov 2016 09:47:42 +0000 (09:47 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32 am: 323f83ef75
am: 6550cf9f5a

Change-Id: Id65aff2541601605c4e0e939d1214b525ac3984d

7 years agoDo not set VR mode feature as handset default. am: 5ce292f55b am: f0f8f0a99d
Ruben Brunk [Tue, 29 Nov 2016 09:47:30 +0000 (09:47 +0000)]
Do not set VR mode feature as handset default. am: 5ce292f55b am: f0f8f0a99d
am: e69143f83e

Change-Id: I724c089a43b21a22520c708bb816581e7d4f183d

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665...
Steve Pfetsch [Tue, 29 Nov 2016 09:47:13 +0000 (09:47 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665 am: b3f571bc1e
am: 578beb39f3

Change-Id: I04a8336ff7937ccc5722476f79bb46ee360a2ebf

7 years agoRevert "services: surfaceflinger: ASAN fix" am: 598f6d5429 am: d5156b70ff
Steve Pfetsch [Tue, 29 Nov 2016 09:46:57 +0000 (09:46 +0000)]
Revert "services: surfaceflinger: ASAN fix" am: 598f6d5429 am: d5156b70ff
am: 537939b99b

Change-Id: Ic7fbfdccd87cace5b0e1d10a1548605df7ffa845

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
Felipe Leme [Tue, 29 Nov 2016 09:46:42 +0000 (09:46 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccbc3 am: dca861e167
am: d5473a08d2

Change-Id: I5306cb7a1e8e9b3a377922285cfec5682ee3ed63

7 years agoresolve merge conflicts of 3069899 to nyc-mr2-dev-plus-aosp
Narayan Kamath [Tue, 29 Nov 2016 09:36:52 +0000 (09:36 +0000)]
resolve merge conflicts of 3069899 to nyc-mr2-dev-plus-aosp

Change-Id: I4fc296d7e1cf36be40a1aadffd663df4fea5f521

7 years agosurfaceflinger:Fix potential crash issue when do AIDL FUZZ
Jinguang Dong [Tue, 29 Nov 2016 05:55:57 +0000 (13:55 +0800)]
surfaceflinger:Fix potential crash issue when do AIDL FUZZ
test

There will be trigger exception when we provide invalid
inputs parameter for surfaceflinger  JNI interface

Test: 1.Run adb shell and open AIDLer tools;
      2.change to Dir /sdcard/elong.AIDLer
      3.run commond service list > service_list.txt
      4.Rerun AIDL FUZZ test

Change-Id: I0a63adc1e8ae5d9c9e43cb6df6aa13503c40a0c5

7 years agoFix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409...
Fabien Sanglard [Tue, 29 Nov 2016 07:36:58 +0000 (07:36 +0000)]
Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224 am: b17adaa85f am: c261a17e51 am: ce40ad2441
am: 97ce922887

Change-Id: I198eccaf1f86d250088edb48bd5ef3dcb4cebc00

7 years agoFix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169...
Fabien Sanglard [Tue, 29 Nov 2016 07:36:41 +0000 (07:36 +0000)]
Fix SF security vulnerability: 32706020 am: d073eb7a3f am: 230b943c6b am: a928cc7169 am: 0517da2c5a am: b0dff427a1 am: 1852db9aa3 am: d4f7a66cf6
am: 0646227ad2

Change-Id: I8c2d45d95b205e32545f39f7ccf746b1707ca682

7 years agoCheck and restorecon cache/code_cache directories. am: 397ec26675
Jeff Sharkey [Tue, 29 Nov 2016 07:36:25 +0000 (07:36 +0000)]
Check and restorecon cache/code_cache directories. am: 397ec26675
am: 6437218b85

Change-Id: I947b61f97b8a8c53f9072a3a3900566d91b5c6e8

7 years agoMerge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32
Ruben Brunk [Tue, 29 Nov 2016 07:35:58 +0000 (07:35 +0000)]
Merge "Do not set VR mode feature as handset default." into nyc-mr1-dev am: 4e1d67bd32
am: 323f83ef75

Change-Id: If4b5699338640018b9fbb2a636ad33e906404a78

7 years agoDo not set VR mode feature as handset default. am: 5ce292f55b
Ruben Brunk [Tue, 29 Nov 2016 07:35:47 +0000 (07:35 +0000)]
Do not set VR mode feature as handset default. am: 5ce292f55b
am: f0f8f0a99d

Change-Id: I9749d2c9ec2210771ca19a3bc0f7b50c3264be99

7 years agoMerge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665
Steve Pfetsch [Tue, 29 Nov 2016 07:35:02 +0000 (07:35 +0000)]
Merge "Revert "services: surfaceflinger: ASAN fix"" into nyc-mr1-dev am: 103ba31665
am: b3f571bc1e

Change-Id: I065826c95fd835e79ed90dda6cbe8086624eb1a4

7 years agoRevert "services: surfaceflinger: ASAN fix" am: 598f6d5429
Steve Pfetsch [Tue, 29 Nov 2016 07:34:47 +0000 (07:34 +0000)]
Revert "services: surfaceflinger: ASAN fix" am: 598f6d5429
am: d5156b70ff

Change-Id: I87e368e8ee4770d02fbe75a031f01ff163e0c372

7 years agoMerge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report...
Felipe Leme [Tue, 29 Nov 2016 07:34:33 +0000 (07:34 +0000)]
Merge "DO NOT MERGE. Revert "Dumpstate should hold a wakelock to save bug report time."" into nyc-mr1-dev am: 7781eccbc3
am: dca861e167

Change-Id: I19219da414ef75e519c5a03f8590ff5cabcc9b71

7 years agoMove VP9 Encoder parameters to the end of the enum
Vignesh Venkatasubramanian [Tue, 29 Nov 2016 00:05:03 +0000 (16:05 -0800)]
Move VP9 Encoder parameters to the end of the enum

Addressing comment on http://ag/867042

https://googleplex-android-review.git.corp.google.com/#/c/867042/2/include/media/openmax/OMX_IndexExt.h@79

Change-Id: Idec839f62609e659c4de5c9c8de94ecb88a82421

7 years agoEven moar refactoring...
Felipe Leme [Tue, 22 Nov 2016 21:57:05 +0000 (13:57 -0800)]
Even moar refactoring...

- Moved DumpstateUtil functions to its own .cpp file.
- Created a DumpstateInternal file.
- Moved properties setting to a PropertiesHelper class.
- Added title to functions that uses a FD.
- Moved Nanotime() out of DurationReporter.
- Restricted number of default CommandOptions constants.

BUG: 31982882
Test: manual verification
Test: dumpstate_test pass

Change-Id: Iab3e61594f6f7298484185f6f302472d31064f7d

7 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission am: 1f24f0f597 -s ours am: 8d4f6a3...
Nick Vaccaro [Mon, 28 Nov 2016 22:39:50 +0000 (22:39 +0000)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission am: 1f24f0f597  -s ours am: 8d4f6a3fb2  -s ours
am: 8378b7f6f2  -s ours

Change-Id: Ia549cba9d6041f1a1343b68345a0cb1c4f6a5feb

7 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission am: 1f24f0f597 -s ours
Nick Vaccaro [Mon, 28 Nov 2016 22:32:28 +0000 (22:32 +0000)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission am: 1f24f0f597  -s ours
am: 8d4f6a3fb2  -s ours

Change-Id: Ibb5d37380fbf787fef2b6e4ec1d52defc750331d

7 years agoresolve merge conflicts of dfc9df4 to nyc-mr1-dev-plus-aosp
Felipe Leme [Mon, 28 Nov 2016 22:29:38 +0000 (14:29 -0800)]
resolve merge conflicts of dfc9df4 to nyc-mr1-dev-plus-aosp

Change-Id: I5da1f949bc1edb7dae110f3ab2a7328f9b1b02e9

7 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Mon, 28 Nov 2016 22:27:57 +0000 (22:27 +0000)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
am: 1f24f0f597  -s ours

Change-Id: Ibd13d13a5ba368b8c700f02d049ffbf92a2abac2

7 years agoMerge "libui: update for IAllocator changes"
Chia-I Wu [Mon, 28 Nov 2016 21:59:59 +0000 (21:59 +0000)]
Merge "libui: update for IAllocator changes"

7 years agoMerge "Adjust installd with new dexopt return values." am: b29c82b67e am: f118868549...
Nicolas Geoffray [Mon, 28 Nov 2016 13:48:44 +0000 (13:48 +0000)]
Merge "Adjust installd with new dexopt return values." am: b29c82b67e am: f118868549 am: 6d938865ea
am: fe27746e5f

Change-Id: I66106139d63eb0095d05c240ab48dec8a194ec79

7 years agoMerge "Adjust installd with new dexopt return values." am: b29c82b67e am: f118868549
Nicolas Geoffray [Mon, 28 Nov 2016 13:40:29 +0000 (13:40 +0000)]
Merge "Adjust installd with new dexopt return values." am: b29c82b67e am: f118868549
am: 6d938865ea

Change-Id: I1174d7e2c630073a9c979172cfc0c4a21d10b5e7

7 years agoMerge "Adjust installd with new dexopt return values." am: b29c82b67e
Nicolas Geoffray [Mon, 28 Nov 2016 13:33:11 +0000 (13:33 +0000)]
Merge "Adjust installd with new dexopt return values." am: b29c82b67e
am: f118868549

Change-Id: I663a65ac5070782052a2a8676bc1df14074a49bb

7 years agoMerge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Mon, 28 Nov 2016 13:25:26 +0000 (13:25 +0000)]
Merge "Adjust installd with new dexopt return values."
am: b29c82b67e

Change-Id: Ib0f3811c5891d6871d7b9d44c615954b06f261c6

7 years agoMerge "Adjust installd with new dexopt return values."
Nicolas Geoffray [Mon, 28 Nov 2016 13:15:55 +0000 (13:15 +0000)]
Merge "Adjust installd with new dexopt return values."

7 years agoAdjust installd with new dexopt return values.
Nicolas Geoffray [Fri, 25 Nov 2016 11:33:31 +0000 (11:33 +0000)]
Adjust installd with new dexopt return values.

Bug: 30937355
Test: device boots, mimic system update, apps get updated.
Change-Id: I9539892dfcdd0cc722a292140accd7525ee132d0

7 years agoMerge "Add options to specify payload size and use client/server pairs"
Todd Kjos [Wed, 23 Nov 2016 17:00:41 +0000 (17:00 +0000)]
Merge "Add options to specify payload size and use client/server pairs"

7 years ago[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Wed, 23 Nov 2016 16:44:15 +0000 (08:44 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission

Bug: 33094188
Change-Id: I1d91e855163954666a18b2f8daadb2639b946b24

7 years agoMerge "Fix clang static analyzer warnings." am: b10d705f51 am: 87b2535ff8 am: 0405b428f8
Manoj Gupta [Wed, 23 Nov 2016 06:48:37 +0000 (06:48 +0000)]
Merge "Fix clang static analyzer warnings." am: b10d705f51 am: 87b2535ff8 am: 0405b428f8
am: 37e1c4e1ae

Change-Id: Idcd308c1a59ec9f4be15ecad66308e4543308c2c

7 years agoMerge "Fix clang static analyzer warnings." am: b10d705f51 am: 87b2535ff8
Manoj Gupta [Wed, 23 Nov 2016 06:46:06 +0000 (06:46 +0000)]
Merge "Fix clang static analyzer warnings." am: b10d705f51 am: 87b2535ff8
am: 0405b428f8

Change-Id: I23292033bc37b2dcb8f254be2cfacc21e67deaaf

7 years agoMerge "Fix clang static analyzer warnings." am: b10d705f51
Manoj Gupta [Wed, 23 Nov 2016 06:44:06 +0000 (06:44 +0000)]
Merge "Fix clang static analyzer warnings." am: b10d705f51
am: 87b2535ff8

Change-Id: I24784df53a0574974f822ee01e2a1f13729176c5

7 years agoMerge "Fix clang static analyzer warnings."
Manoj Gupta [Wed, 23 Nov 2016 06:40:36 +0000 (06:40 +0000)]
Merge "Fix clang static analyzer warnings."
am: b10d705f51

Change-Id: Ibdd7df4af9766b5d00515254cbb8d5e9370a4971

7 years agoMerge "Fix clang static analyzer warnings."
Treehugger Robot [Wed, 23 Nov 2016 06:35:32 +0000 (06:35 +0000)]
Merge "Fix clang static analyzer warnings."

7 years agoMerge "Lotta of small dumpstate fixes..."
TreeHugger Robot [Wed, 23 Nov 2016 02:01:19 +0000 (02:01 +0000)]
Merge "Lotta of small dumpstate fixes..."

7 years agoAdd options to specify payload size and use client/server pairs
Todd Kjos [Wed, 23 Nov 2016 00:46:36 +0000 (16:46 -0800)]
Add options to specify payload size and use client/server pairs

Test: tested manually

Change-Id: I744d84b1621c2dd19525d3a65ed543d9dea575d4

7 years agoMerge "Fix 5x and 6P crash when using HWC2to1adapter"
TreeHugger Robot [Tue, 22 Nov 2016 23:23:56 +0000 (23:23 +0000)]
Merge "Fix 5x and 6P crash when using HWC2to1adapter"

7 years agoLotta of small dumpstate fixes...
Felipe Leme [Tue, 22 Nov 2016 01:40:45 +0000 (17:40 -0800)]
Lotta of small dumpstate fixes...

- Fixed RunCommandToFd() so it respects DROP_ROOT.
- Renamed enums to be more consistent with fd model.
- Added tests to RunCommandToFd() and DumpFileToFd().
- Fixed RunCommandToFd() and DumpFileToFd(), which were rushed in.
- Disable tests that fail when running as suite.

BUG: 31982882
Test: manual verification
Test: dumpstate_tests pass

Change-Id: I1d8352a17be10a707a101fc1ac9c7d735e38f9fe

7 years agoFix 5x and 6P crash when using HWC2to1adapter
Fabien Sanglard [Sat, 19 Nov 2016 00:12:31 +0000 (16:12 -0800)]
Fix 5x and 6P crash when using HWC2to1adapter

Angler and Bullhead crash when a SolidColor layer is used in
combination with HWC2to1Adapter. This is due to assumptions in
the HWC1 code (non-null handle field = valid pointer). This
assumption is incorrect with a background layer because it will
set the field backgroundcolor...which occupies the same location
as handle field in hwc_layer_1_t.
This patch detects whether the HWC supports BACKGROUND layer and
sets backgroundcolor/handle accordingly to HWC assumption.

Test: Manual on Angler and Bullhead.

Change-Id: Ic5c3366a4a8989f3a82b6367258bad8af25d3990

7 years agoUses Dumpstate HIDL instead of dumpstate_board.
Felipe Leme [Sat, 19 Nov 2016 01:10:33 +0000 (17:10 -0800)]
Uses Dumpstate HIDL instead of dumpstate_board.

BUG: 31982882
Test: manual verification
Test: dumpstate_tests pass

Change-Id: I2d9a2658b52fba916984f0095edbd26ccd45a278

7 years agoMerge "atrace: support HAL services as well." am: 1aea108920 am: 7d7cd0cc88 am: 14ee7...
Martijn Coenen [Tue, 22 Nov 2016 17:50:06 +0000 (17:50 +0000)]
Merge "atrace: support HAL services as well." am: 1aea108920 am: 7d7cd0cc88 am: 14ee7d4b21
am: 071ce9d83c

Change-Id: I80063296594ff5d4b3eff9c940ef1582109dca34

7 years agoMerge "Add definition for accessibility volume control appOps"
Jean-Michel Trivi [Tue, 22 Nov 2016 16:28:44 +0000 (16:28 +0000)]
Merge "Add definition for accessibility volume control appOps"

7 years agoMerge "atrace: support HAL services as well." am: 1aea108920 am: 7d7cd0cc88
Martijn Coenen [Tue, 22 Nov 2016 10:00:49 +0000 (10:00 +0000)]
Merge "atrace: support HAL services as well." am: 1aea108920 am: 7d7cd0cc88
am: 14ee7d4b21

Change-Id: I17df2efc0a20d6e683f766f107a47c76d53942d8

7 years agoMerge "atrace: support HAL services as well." am: 1aea108920
Martijn Coenen [Tue, 22 Nov 2016 09:55:14 +0000 (09:55 +0000)]
Merge "atrace: support HAL services as well." am: 1aea108920
am: 7d7cd0cc88

Change-Id: I52a8b3ffcc4bea2b2adb290de6a989b225f447e4

7 years agoMerge "atrace: support HAL services as well."
Martijn Coenen [Tue, 22 Nov 2016 09:49:27 +0000 (09:49 +0000)]
Merge "atrace: support HAL services as well."
am: 1aea108920

Change-Id: Iac0430699cd15f59ed68b41d20010165a50a50e2

7 years agoMerge "atrace: support HAL services as well."
Treehugger Robot [Tue, 22 Nov 2016 09:43:23 +0000 (09:43 +0000)]
Merge "atrace: support HAL services as well."

7 years agoUse hidl_handle instead of native_handle_t*.
Martijn Coenen [Mon, 21 Nov 2016 09:01:07 +0000 (10:01 +0100)]
Use hidl_handle instead of native_handle_t*.

To ensure 32/64 compatibility.

Bug: 32089785
Test: builds
Change-Id: Ie86e5734c4a66db7dddd9e93f6dd26990f245d71

7 years agolibui: update for IAllocator changes
Chia-I Wu [Tue, 22 Nov 2016 05:29:49 +0000 (13:29 +0800)]
libui: update for IAllocator changes

Create an IAllocatorClient to allocate/free graphics buffers.

Test: builds and boots
Change-Id: I9978b61ee2cb6302cce34ed6d740a5616fb7e8f1

7 years agoMerge "Moved some functions to DumpstateUtil.h."
TreeHugger Robot [Tue, 22 Nov 2016 01:22:48 +0000 (01:22 +0000)]
Merge "Moved some functions to DumpstateUtil.h."

7 years agoMoved some functions to DumpstateUtil.h.
Felipe Leme [Thu, 17 Nov 2016 01:48:25 +0000 (17:48 -0800)]
Moved some functions to DumpstateUtil.h.

dumpstate_board() is been refactored into a HIDL interface, and the HIDL
implementations will need help functions to dump files and run commands into
a file descriptor.

BUG: 31982882
Test: dumpstate_test passes
Test: manual verification

Change-Id: I7a32f0ac236dae34fd85abe47bed0e52a34c5f36

7 years agoMerge "Remove modem log after they are added to bugreport" into nyc-mr2-dev am: f78f0...
Naveen Kalla [Mon, 21 Nov 2016 22:50:11 +0000 (22:50 +0000)]
Merge "Remove modem log after they are added to bugreport" into nyc-mr2-dev am: f78f0983c1
am: d9f792c5c4

Change-Id: I782b85efc9e7848e26096e1afb41e41f45bfc553

7 years agoRemove modem log after they are added to bugreport am: b77df78ad6
Naveen Kalla [Mon, 21 Nov 2016 22:49:56 +0000 (22:49 +0000)]
Remove modem log after they are added to bugreport am: b77df78ad6
am: 1ab8369558

Change-Id: Iedbb175cd39d88fcd29fe6551f9e66972f74ff65

7 years agoMerge "Remove modem log after they are added to bugreport" into nyc-mr2-dev
Naveen Kalla [Mon, 21 Nov 2016 22:40:59 +0000 (22:40 +0000)]
Merge "Remove modem log after they are added to bugreport" into nyc-mr2-dev
am: f78f0983c1

Change-Id: I688a229150fd7949cde8ee2a79e9c0344174cad3

7 years agoRemove modem log after they are added to bugreport
Naveen Kalla [Mon, 21 Nov 2016 22:40:57 +0000 (22:40 +0000)]
Remove modem log after they are added to bugreport
am: b77df78ad6

Change-Id: I4cec31388deed3d321e3e1b8c407af31b5916542

7 years agoMerge "Remove modem log after they are added to bugreport" into nyc-mr2-dev
TreeHugger Robot [Mon, 21 Nov 2016 22:38:23 +0000 (22:38 +0000)]
Merge "Remove modem log after they are added to bugreport" into nyc-mr2-dev

7 years agoatrace.rc: move to post-fs trigger am: 04097337a9
Wei Wang [Mon, 21 Nov 2016 19:28:46 +0000 (19:28 +0000)]
atrace.rc: move to post-fs trigger am: 04097337a9
am: 65666ba020

Change-Id: I6ae8460f215cab7042bce3161f96651b0cc41941

7 years agoatrace.rc: move to post-fs trigger
Wei Wang [Mon, 21 Nov 2016 19:22:07 +0000 (19:22 +0000)]
atrace.rc: move to post-fs trigger
am: 04097337a9

Change-Id: I02765b9628b48b38f4a7c4e5928febfded79f0a3

7 years agoatrace.rc: move to post-fs trigger
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger

Test: manually
Bug: 32025203
(cherrypicked from commit 835180a675147ef7dd2a325016efd3b45523acc7)
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd

7 years agoatrace: support HAL services as well.
Martijn Coenen [Wed, 16 Nov 2016 15:00:26 +0000 (16:00 +0100)]
atrace: support HAL services as well.

Also poke services that are only registered with
hwbinder, so that they update their props (trace
categories) immediately.

Bug: 31262344
Test: builds, atrace works
Change-Id: I355ddd5f950acc27d598cd972e63f9711426b943

7 years agoMerge "Use android.hardware.graphics.common@1.0"
Chia-I Wu [Mon, 21 Nov 2016 02:52:34 +0000 (02:52 +0000)]
Merge "Use android.hardware.graphics.common@1.0"

7 years agoMerge "atrace.rc: move to post-fs trigger" am: 3749a60b42 am: 5b30ae185e am: 984d5f2b04
Wei Wang [Sun, 20 Nov 2016 16:40:31 +0000 (16:40 +0000)]
Merge "atrace.rc: move to post-fs trigger" am: 3749a60b42 am: 5b30ae185e am: 984d5f2b04
am: dfcfd94f74

Change-Id: I7c75051c1dab9b7c8b0bcc0286b42d3ade4b1dac

7 years agoMerge "atrace.rc: move to post-fs trigger" am: 3749a60b42 am: 5b30ae185e
Wei Wang [Sun, 20 Nov 2016 16:36:01 +0000 (16:36 +0000)]
Merge "atrace.rc: move to post-fs trigger" am: 3749a60b42 am: 5b30ae185e
am: 984d5f2b04

Change-Id: I92502fcf5adad5b8a88b2811efb8a3083b68ed6c

7 years agoMerge "atrace.rc: move to post-fs trigger" am: 3749a60b42
Wei Wang [Sun, 20 Nov 2016 16:31:01 +0000 (16:31 +0000)]
Merge "atrace.rc: move to post-fs trigger" am: 3749a60b42
am: 5b30ae185e

Change-Id: Ibb5370034f45a00e1ec9166abc4a66afc32b4847

7 years agoMerge "atrace.rc: move to post-fs trigger"
Wei Wang [Sun, 20 Nov 2016 16:26:31 +0000 (16:26 +0000)]
Merge "atrace.rc: move to post-fs trigger"
am: 3749a60b42

Change-Id: Ib2675cf4047d6ce1b9b6285538bb7f7be7ed1649

7 years agoMerge "atrace.rc: move to post-fs trigger"
Treehugger Robot [Sun, 20 Nov 2016 16:22:22 +0000 (16:22 +0000)]
Merge "atrace.rc: move to post-fs trigger"

7 years agoatrace.rc: move to post-fs trigger
Wei Wang [Sun, 20 Nov 2016 04:49:09 +0000 (20:49 -0800)]
atrace.rc: move to post-fs trigger

Test: manually
Bug: 32025203
Change-Id: I787984fc8ab7151ecce9e62a25fa03b0ecf263cd

7 years agoRemove modem log after they are added to bugreport
Naveen Kalla [Sat, 19 Nov 2016 01:32:23 +0000 (17:32 -0800)]
Remove modem log after they are added to bugreport

Delete the modem logfiles after it is added to the
bugreport zip file.

Bug: 32871032
Test: Take bugreports on the device and ensure that
      the modem log file is deleted. Also ensure that
      the generated bugreport zip file contains modem
      logs on userdebug builds

Change-Id: Ia512c11cae95e370b77024492898b3ad697fa8b0

7 years agoMerge "Switch from deprecated tempnam to TemporaryFile"
Kalle Raita [Sat, 19 Nov 2016 01:07:56 +0000 (01:07 +0000)]
Merge "Switch from deprecated tempnam to TemporaryFile"

7 years agoMerge "Split libhidl into base and transport."
TreeHugger Robot [Fri, 18 Nov 2016 15:32:52 +0000 (15:32 +0000)]
Merge "Split libhidl into base and transport."

7 years agoMerge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5 am: 7354c237ea...
Colin Cross [Fri, 18 Nov 2016 02:04:38 +0000 (02:04 +0000)]
Merge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5 am: 7354c237ea am: 2c160be5b0
am: ea7e880c68

Change-Id: I232c7f4a0e448d46afd9c2f13fafa07a3b6727d0

7 years agoMerge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5 am: 7354c237ea
Colin Cross [Fri, 18 Nov 2016 02:00:54 +0000 (02:00 +0000)]
Merge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5 am: 7354c237ea
am: 2c160be5b0

Change-Id: I4b3b0a0cab4dc51a673fe2da4d72f26c74c5fb23

7 years agoMerge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5
Colin Cross [Fri, 18 Nov 2016 01:58:23 +0000 (01:58 +0000)]
Merge "Fix warnings in framworks/native/opengl/include" am: d12c9369d5
am: 7354c237ea

Change-Id: I43d772721d8ad9538b0ced7bb9592ad0f1dd0dd8

7 years agoMerge "Fix warnings in framworks/native/opengl/include"
Colin Cross [Fri, 18 Nov 2016 01:55:54 +0000 (01:55 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"
am: d12c9369d5

Change-Id: Ifbbccbd890d3ab80910586c52f263e903e36dbbd

7 years agoMerge "Fix warnings in framworks/native/opengl/include"
Treehugger Robot [Fri, 18 Nov 2016 01:50:49 +0000 (01:50 +0000)]
Merge "Fix warnings in framworks/native/opengl/include"