OSDN Git Service

android-x86/frameworks-native.git
7 years agoOtapreopt: Fix after shared-library work
Andreas Gampe [Fri, 3 Jun 2016 00:56:45 +0000 (17:56 -0700)]
Otapreopt: Fix after shared-library work

Commit b63d91fd2737680351876406277b6c759f4db33c broke the installd
to otapreopt connection. Fix this. Also refactor a bit to make an
inadvertant break harder.

Bug: 25612095
Change-Id: I8e7b944ecbd5457e4ac4d6ffffdb0468618cf65f
(cherry picked from commit aef445d1c659698612c0e5a8f3d5f2b9f8a2b778)

7 years agoMerge "Fix google-explicit-constructor warnings in inputflinger."
Chih-hung Hsieh [Fri, 2 Sep 2016 16:11:33 +0000 (16:11 +0000)]
Merge "Fix google-explicit-constructor warnings in inputflinger."

7 years agoMerge "Fix google-explicit-constructor warnings in vulkan."
Chih-hung Hsieh [Fri, 2 Sep 2016 02:25:41 +0000 (02:25 +0000)]
Merge "Fix google-explicit-constructor warnings in vulkan."

7 years agoFix google-explicit-constructor warnings in vulkan.
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:37:47 +0000 (11:37 -0700)]
Fix google-explicit-constructor warnings in vulkan.

* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I13c32bd5bc53fe897df58eda331ff70ebcf0b349

7 years agoFix google-explicit-constructor warnings in inputflinger.
Chih-Hung Hsieh [Thu, 1 Sep 2016 18:28:23 +0000 (11:28 -0700)]
Fix google-explicit-constructor warnings in inputflinger.

* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I8259317db74b177b6e62a0aa2ad21aead47f698e

7 years agoMerge "Remove FRAMEBUFFER_FORCE_FORMAT"
Treehugger Robot [Mon, 29 Aug 2016 22:36:05 +0000 (22:36 +0000)]
Merge "Remove FRAMEBUFFER_FORCE_FORMAT"

7 years agoRemove FRAMEBUFFER_FORCE_FORMAT
Dan Willemsen [Mon, 1 Aug 2016 08:12:35 +0000 (01:12 -0700)]
Remove FRAMEBUFFER_FORCE_FORMAT

It's no longer used, except for a debugging line.

Change-Id: I44e1c17129e71168b263e872e9aaab0f164d3832

7 years agoMerge changes from topic 'utf'
Martijn Coenen [Thu, 25 Aug 2016 20:08:14 +0000 (20:08 +0000)]
Merge changes from topic 'utf'

* changes:
  Add bound checks to utf16_to_utf8
  Unicode: specify destination length in utf8_to_utf16 methods

7 years agoMerge "binder: use ashmem_valid()"
Treehugger Robot [Thu, 25 Aug 2016 19:14:49 +0000 (19:14 +0000)]
Merge "binder: use ashmem_valid()"

7 years agoMerge "Fix memory ordering issues; document IMemory peculiarities"
Hans Boehm [Thu, 25 Aug 2016 18:39:01 +0000 (18:39 +0000)]
Merge "Fix memory ordering issues; document IMemory peculiarities"

7 years agobinder: use ashmem_valid()
Mark Salyzyn [Tue, 23 Aug 2016 23:15:04 +0000 (16:15 -0700)]
binder: use ashmem_valid()

Bug: 30310689
Change-Id: I38e2720843f1eebec39ce6c7d957ee9a1dafac59

7 years agoAdd bound checks to utf16_to_utf8
Sergio Giro [Tue, 28 Jun 2016 17:19:33 +0000 (18:19 +0100)]
Add bound checks to utf16_to_utf8

Bug: 29250543
Change-Id: I518e7b2fe10aaa3f1c1987586a09b1110aff7e1a
(cherry picked from commit 7e93b2ddcb49b5365fbe1dab134ffb38e6f1c719)

7 years agoUnicode: specify destination length in utf8_to_utf16 methods
Sergio Giro [Thu, 21 Jul 2016 13:46:35 +0000 (14:46 +0100)]
Unicode: specify destination length in utf8_to_utf16 methods

Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3

7 years agoFix memory ordering issues; document IMemory peculiarities
Hans Boehm [Wed, 13 Jul 2016 01:05:49 +0000 (18:05 -0700)]
Fix memory ordering issues; document IMemory peculiarities

Convert to standard atomics.

Correct mHeapId memory ordering. Required acquire ordering on loads
was missing in several places.

Remove atomic updates to count, since it is only updated with lock
held. (And would be missing fences if this were not true.)

Document the peculiar use of copy-in-write vectors in a context in
which copy-on-write is unsafe.

While we're here, consistently check dup() for errors.

Bug: 28816986

Merged-in: I05b9f96e3867fa2e0abe6f319be8c56b89624c41

Change-Id: I05b9f96e3867fa2e0abe6f319be8c56b89624c41

7 years agoMerge "libbinder: Support reading/writing out T[] lengths"
Christopher Wiley [Fri, 19 Aug 2016 23:25:59 +0000 (23:25 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"
am: b77d368d89

Change-Id: Ibc4639f6b1a4067b4c30ca294beb9e747736d3f8

7 years agoMerge "libbinder: Support reading/writing out T[] lengths"
Treehugger Robot [Fri, 19 Aug 2016 23:14:50 +0000 (23:14 +0000)]
Merge "libbinder: Support reading/writing out T[] lengths"

7 years agolibbinder: Support reading/writing out T[] lengths
Christopher Wiley [Fri, 19 Aug 2016 18:43:54 +0000 (11:43 -0700)]
libbinder: Support reading/writing out T[] lengths

T[] types are special: the length of the out array is written
into the inbound parcel to signal the expected length to the
server.

Bug: 30836680
Change-Id: I4f2f39fd7b1a6b94a25bd7f6c3baed430fd567bc
Test: integration tests pass with this change.

8 years agoMerge "Remove unused include."
Dmitriy Filchenko [Thu, 18 Aug 2016 03:17:36 +0000 (03:17 +0000)]
Merge "Remove unused include."
am: 5242fb42fb

Change-Id: Id3ccb5f3dfb9d2188b6e570eaaa6ba23438ae392

8 years agoMerge "Remove unused include."
Treehugger Robot [Thu, 18 Aug 2016 03:13:47 +0000 (03:13 +0000)]
Merge "Remove unused include."

8 years agoRemove unused include.
Dmitriy Filchenko [Thu, 18 Aug 2016 01:00:39 +0000 (18:00 -0700)]
Remove unused include.

BUG: 29824203

Change-Id: Ied8ccb8c30632b41f6c6c3d848dc94d7b1e731e0

8 years agoresolve merge conflicts of 0783d5f to stage-aosp-master
Dan Willemsen [Fri, 5 Aug 2016 21:06:41 +0000 (14:06 -0700)]
resolve merge conflicts of 0783d5f to stage-aosp-master

Change-Id: I4fe9c0391d6d41bae5fbbb0df6e00e264e87649f

8 years agoMerge "Start converting Android.mk to Android.bp"
Dan Willemsen [Fri, 5 Aug 2016 20:44:52 +0000 (20:44 +0000)]
Merge "Start converting Android.mk to Android.bp"

8 years agoStart converting Android.mk to Android.bp
Dan Willemsen [Tue, 26 Jul 2016 00:13:45 +0000 (17:13 -0700)]
Start converting Android.mk to Android.bp

See build/soong/README.md for more information.

Merged-In: Ifbe9b0072a63b4467c72b3a52148a606e5365f78
Change-Id: Ifbe9b0072a63b4467c72b3a52148a606e5365f78

8 years agoMerge "libsigchain: intercept bsd_signal on lp32"
Dimitry Ivanov [Mon, 1 Aug 2016 22:47:36 +0000 (22:47 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
am: 1c59b4b4e8

Change-Id: Ib0b9789d7a75928f7433557936b9fac81c53b049

8 years agoMerge "libsigchain: intercept bsd_signal on lp32"
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"

8 years agolibsigchain: intercept bsd_signal on lp32
Dimitry Ivanov [Mon, 1 Aug 2016 21:13:37 +0000 (14:13 -0700)]
libsigchain: intercept bsd_signal on lp32

bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.

libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.

Bug: http://b/30562229
Test: readelf --dyn-sym surfaceflinger and check that bsd_signal is exported for lp32
      and is not exported for lp64 binary version
Change-Id: If80e45502275b26c3ee4026ab12cadd77f8fbd3b

8 years agoMerge "libvulkan: Fix for -Wcast-calling-convention" into stage-aosp-master
Chia-I Wu [Fri, 29 Jul 2016 02:50:30 +0000 (02:50 +0000)]
Merge "libvulkan: Fix for -Wcast-calling-convention" into stage-aosp-master

8 years agoresolve merge conflicts of 75b79d3 to stage-aosp-master
Jesse Hall [Mon, 25 Jul 2016 06:14:18 +0000 (23:14 -0700)]
resolve merge conflicts of 75b79d3 to stage-aosp-master

Change-Id: Ia7201fb25389688231cbcfb1ac24aeef7dec79d8

8 years agoMerge \"egl: Enable EGL_KHR_GL_COLORSPACE\"
Sandeep Shinde [Mon, 25 Jul 2016 03:48:26 +0000 (03:48 +0000)]
Merge \"egl: Enable EGL_KHR_GL_COLORSPACE\"
am: 5271156353

Change-Id: I2c2538852782bef9026b354ad1c0aca1e0fedbeb

8 years agoMerge "egl: Call loseCurrent after eglReleaseThread"
Jesse Hall [Mon, 25 Jul 2016 03:38:04 +0000 (03:38 +0000)]
Merge "egl: Call loseCurrent after eglReleaseThread"

8 years agoMerge "egl: Enable EGL_KHR_GL_COLORSPACE"
Jesse Hall [Mon, 25 Jul 2016 03:36:53 +0000 (03:36 +0000)]
Merge "egl: Enable EGL_KHR_GL_COLORSPACE"

8 years agoMerge \"Fix a typo in the atrace help text.\"
Elliott Hughes [Fri, 22 Jul 2016 17:47:33 +0000 (17:47 +0000)]
Merge \"Fix a typo in the atrace help text.\"
am: 133650e5b1

Change-Id: Idc66112bedc8f6a31bd73e479bd8905a7875d360

8 years agoMerge "Fix a typo in the atrace help text."
Treehugger Robot [Fri, 22 Jul 2016 17:35:05 +0000 (17:35 +0000)]
Merge "Fix a typo in the atrace help text."

8 years agoFix a typo in the atrace help text.
Elliott Hughes [Fri, 22 Jul 2016 16:38:44 +0000 (09:38 -0700)]
Fix a typo in the atrace help text.

Change-Id: I1b9d04d3d17e851d08a8ae39e26483e106516b88

8 years agoresolve merge conflicts of f5b35b6 to stage-aosp-master
Elliott Hughes [Fri, 22 Jul 2016 16:00:59 +0000 (09:00 -0700)]
resolve merge conflicts of f5b35b6 to stage-aosp-master

Change-Id: Ie1ac182893214022a68746f563765f6a271f8d1d

8 years agoMerge "Clean up memory allocation in dumpTrace."
Treehugger Robot [Fri, 22 Jul 2016 15:49:13 +0000 (15:49 +0000)]
Merge "Clean up memory allocation in dumpTrace."

8 years agolibvulkan: Fix for -Wcast-calling-convention
Chia-I Wu [Fri, 22 Jul 2016 02:36:33 +0000 (10:36 +0800)]
libvulkan: Fix for -Wcast-calling-convention

It should be harmless, as NoOp does not use any argument and should never
be reached.

Bug: 30290462
Change-Id: I0592c3ce10c510713525b5aa0bd38a2f9adc5898

8 years agoClean up memory allocation in dumpTrace.
Elliott Hughes [Fri, 22 Jul 2016 00:12:15 +0000 (17:12 -0700)]
Clean up memory allocation in dumpTrace.

Bug: http://b/20674092
Change-Id: Id8ba2b0efc1641929790770714e48cde545fb3b0

8 years agoMerge "Dumpstate: Fix long lines." into stage-aosp-master
Dan Willemsen [Thu, 21 Jul 2016 20:50:00 +0000 (20:50 +0000)]
Merge "Dumpstate: Fix long lines." into stage-aosp-master

8 years agoMerge \"Add |readString8| method which returns failure\"
Roshan Pius [Thu, 21 Jul 2016 18:28:38 +0000 (18:28 +0000)]
Merge \"Add |readString8| method which returns failure\"
am: 115e6ec7e9

Change-Id: Iaf1ea3b66ed242dcd82a88ebc0556c08a5fdf85e

8 years agoMerge "Add |readString8| method which returns failure"
Roshan Pius [Thu, 21 Jul 2016 18:19:33 +0000 (18:19 +0000)]
Merge "Add |readString8| method which returns failure"

8 years agoAdd |readString8| method which returns failure
Roshan Pius [Mon, 18 Jul 2016 19:51:02 +0000 (12:51 -0700)]
Add |readString8| method which returns failure

Add a new method to return |String8| read failures from Parcels.

BUG: 30189542
Change-Id: I65b59887dd9a15068abe95d24d390aa577bc49a6

8 years agoMerge \"Change to include linux/android/binder.h.\"
Christopher Ferris [Wed, 20 Jul 2016 18:09:35 +0000 (18:09 +0000)]
Merge \"Change to include linux/android/binder.h.\"
am: b34400ea94

Change-Id: I1aab76bd51c448410d1d9ff3ae288013c81c8d52

8 years agoMerge "Change to include linux/android/binder.h."
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Change to include linux/android/binder.h."

8 years agoFix unused variable build errors
Christopher Wiley [Wed, 20 Jul 2016 15:28:14 +0000 (08:28 -0700)]
Fix unused variable build errors

Change-Id: Ia4f5dc95110b75eefc41b2828990cdbbcb75c033

8 years agoMerge \"libbinder: Tighten compiler warnings/errors\"
Christopher Wiley [Wed, 20 Jul 2016 15:10:31 +0000 (15:10 +0000)]
Merge \"libbinder: Tighten compiler warnings/errors\"
am: ead989c34d

Change-Id: I8d06de42b9ac861b3189db936656cf906ba3597f

8 years agoMerge "libbinder: Tighten compiler warnings/errors"
Treehugger Robot [Wed, 20 Jul 2016 15:04:31 +0000 (15:04 +0000)]
Merge "libbinder: Tighten compiler warnings/errors"

8 years agoDisable -Wcast-calling-convention for vulkan
Pirama Arumuga Nainar [Tue, 28 Jun 2016 21:45:29 +0000 (14:45 -0700)]
Disable -Wcast-calling-convention for vulkan

The following warning is triggered by the upcoming Clang update to
r271374:

frameworks/native/vulkan/libvulkan/stubhal.cpp:114:12: error: cast
between incompatible calling conventions 'cdecl' and 'aapcs-vfp'; calls
through thispointer may abort at runtime
[-Werror,-Wcast-calling-convention]
    return reinterpret_cast<PFN_vkVoidFunction>(NoOp);

Change-Id: I8de75fd6a3b579a91598aebbdd23bf74b57c3593
(cherry picked from commit b4c0eb1d203f88f0ef9ef9c360c03bcbb3e90efc)

8 years agoegl: Enable EGL_KHR_GL_COLORSPACE
Sandeep Shinde [Tue, 10 Feb 2015 10:34:15 +0000 (16:04 +0530)]
egl: Enable EGL_KHR_GL_COLORSPACE

Add EGL_KHR_GL_COLORSPACE extension to EGL header.
Enable EGL_KHR_GL_COLORSPACE extension handling in meta EGL layer.

Change-Id: If6d3fe26c411ddc83d8b23bf16e93862cf68c1b6

8 years agoDumpstate: Fix long lines.
Andreas Gampe [Tue, 19 Jul 2016 01:24:05 +0000 (18:24 -0700)]
Dumpstate: Fix long lines.

Follow-up to commit aff684300a3b7d6984d3b3c1efddb810cd0205e7.

Change-Id: I3faa645b0da7ea27ce3a8df2dbd3b6a50bc1c2bd
(cherry picked from commit 27cd7b256eb08bf9dec7e4e8af8375711ab10225)

8 years agoDumpstate: Use unique_fd
Andreas Gampe [Tue, 19 Jul 2016 01:01:27 +0000 (18:01 -0700)]
Dumpstate: Use unique_fd

ScopedFd has been deprecated (and removed) in favor of unique_fd.

Bug: 21192156
Change-Id: Ic46ca6d349bf0cc640b7d4008ac540d2c6d08568
(cherry picked from commit aff684300a3b7d6984d3b3c1efddb810cd0205e7)

8 years agoMerge \"Fix broken readNullableStrongBinder<T> implementation\"
Christopher Wiley [Tue, 19 Jul 2016 18:19:00 +0000 (18:19 +0000)]
Merge \"Fix broken readNullableStrongBinder<T> implementation\"
am: 6e81c9a4c6

Change-Id: I4342a65c92cbc70f716b21c730f355da3f98dbbb

8 years agoMerge "Fix broken readNullableStrongBinder<T> implementation"
Treehugger Robot [Tue, 19 Jul 2016 18:06:37 +0000 (18:06 +0000)]
Merge "Fix broken readNullableStrongBinder<T> implementation"

8 years agolibbinder: Tighten compiler warnings/errors
Christopher Wiley [Tue, 19 Jul 2016 16:40:13 +0000 (09:40 -0700)]
libbinder: Tighten compiler warnings/errors

Use all of -Wall -Wextra -Werror and fix the minor errors that result.

Change-Id: Id56e9c454dd3570f713d161577eed6aa8e8074aa

8 years agoFix broken readNullableStrongBinder<T> implementation
Christopher Wiley [Tue, 19 Jul 2016 16:23:25 +0000 (09:23 -0700)]
Fix broken readNullableStrongBinder<T> implementation

Added a missing return statement.  Omitting this statement
caused the compiler to silently cast a pointer to a status_t,
which in general wasn't the expected value of OK.

Only return an error when the type casted return value is null and
the IBinder we got back was not null, indicating a type error, rather
than the expected null binder.

Bug: 30160959
Change-Id: Ief3c924b902a607335eff2fcd4d860cd8523593a
Test: Integration tests in aidl that exercise this method now pass.

8 years agoChange to include linux/android/binder.h.
Christopher Ferris [Mon, 18 Jul 2016 23:57:34 +0000 (16:57 -0700)]
Change to include linux/android/binder.h.

The upstream kernels have binder.h as linux/android/binder.h, so
match that.

Bug: 30072483
Change-Id: Iacdc96629dd09c1f4be0a5767666ab64b3df8f15

8 years agoMerge \"Workaround alloc-dealloc-mismatch error on ASan device boot.\"
Evgenii Stepanov [Thu, 14 Jul 2016 21:50:29 +0000 (21:50 +0000)]
Merge \"Workaround alloc-dealloc-mismatch error on ASan device boot.\"
am: 7d8f246415

Change-Id: Ic34e6263619b98739f935e0aa05bf50aa7399829

8 years agoMerge "Workaround alloc-dealloc-mismatch error on ASan device boot."
Evgenii Stepanov [Thu, 14 Jul 2016 21:39:39 +0000 (21:39 +0000)]
Merge "Workaround alloc-dealloc-mismatch error on ASan device boot."

8 years agoWorkaround alloc-dealloc-mismatch error on ASan device boot.
Evgenii Stepanov [Thu, 14 Jul 2016 21:17:24 +0000 (14:17 -0700)]
Workaround alloc-dealloc-mismatch error on ASan device boot.

/proc/self/environ inaccessible in SurfaceFlinger
=> ASan fails to read ASAN_OPTIONS => alloc-dealloc-mismatch bug is not
suppressed and prevents the device from booting.

This is not perfect because, by enabling it in asan build only, the first several attempts to start
surfaceflinger fail while the /data partition is being encrypted. On the other hand, this does not affect
user builds, and device eventually gets up anyway.

BUG=b/30067360

Change-Id: Ieaa37ff7768a11450ea33fee1f7d70a41b246c6a

8 years agoMerge \"[mips] Resolve issue with .align directive, when using clang IAS\"
Lazar Trsic [Wed, 13 Jul 2016 18:39:54 +0000 (18:39 +0000)]
Merge \"[mips] Resolve issue with .align directive, when using clang IAS\"
am: febb7ea6a0

Change-Id: I38969dbcd1251355cf3b7bbbf2e25a20930c28df

8 years agoMerge "[mips] Resolve issue with .align directive, when using clang IAS"
Treehugger Robot [Wed, 13 Jul 2016 18:34:54 +0000 (18:34 +0000)]
Merge "[mips] Resolve issue with .align directive, when using clang IAS"

8 years ago[mips] Resolve issue with .align directive, when using clang IAS
Lazar Trsic [Wed, 13 Jul 2016 12:53:07 +0000 (14:53 +0200)]
[mips] Resolve issue with .align directive, when using clang IAS

Clang IAS does not support .align without args, concrete value is needed.

Change-Id: I03a9daca0be380daa744307b3510446f8d6c9b7e

8 years agoMerge \"Fix misc-macro-parentheses warnings in opengl.\"
Chih-Hung Hsieh [Thu, 7 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge \"Fix misc-macro-parentheses warnings in opengl.\"
am: d4ffb636d8

Change-Id: I93f0fca53e380f0272ef10c4d38ea0033cef7cc4

8 years agoMerge "Fix misc-macro-parentheses warnings in opengl."
Chih-hung Hsieh [Thu, 7 Jul 2016 21:55:37 +0000 (21:55 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."

8 years agoFix misc-macro-parentheses warnings in opengl.
Chih-Hung Hsieh [Wed, 29 Jun 2016 21:25:19 +0000 (14:25 -0700)]
Fix misc-macro-parentheses warnings in opengl.

Add parentheses around negative literals.
Bug: 28705665
Test: build with clang-tidy

Change-Id: I342f1d04ac08bbc28ee3ff4ebbbccbfa9f754a94

8 years agodumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
Mark Salyzyn [Fri, 24 Jun 2016 23:31:24 +0000 (23:31 +0000)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
am: ced6078b0e

Change-Id: I5972646a22b4a853d5e711d5574c6776a781a5bd

8 years agoMerge \\"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\...
Mark Salyzyn [Fri, 24 Jun 2016 21:37:00 +0000 (21:37 +0000)]
Merge \\"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\\" am: 00e3f2995f
am: db290501a5

Change-Id: Ib628ab8c43db208fa891d1e19f483a1f6bea21e0

8 years agoMerge \"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\"
Mark Salyzyn [Fri, 24 Jun 2016 21:35:07 +0000 (21:35 +0000)]
Merge \"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\"
am: 00e3f2995f

Change-Id: Ie0eed7a01655af927304b148005e9a37f9c11883

8 years agodumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG

(cherry pick from commit 7d0a762ecaf9f4d005f0f6db913034c2e084d362)

Bug: 29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50

8 years agoMerge "dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG"
Mark Salyzyn [Fri, 24 Jun 2016 21:26:16 +0000 (21:26 +0000)]
Merge "dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG"

8 years agodumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG

Bug: 29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50

8 years agoMerge \"Sensor: Make getId() more varied\" into nyc-dev
Greg Kaiser [Thu, 23 Jun 2016 03:31:57 +0000 (03:31 +0000)]
Merge \"Sensor: Make getId() more varied\" into nyc-dev
am: c0ca0ceaa5

Change-Id: Ifa6208fea63d830d07447d5232b39f9e3ccf870b

8 years agoMerge "Sensor: Make getId() more varied" into nyc-dev
Greg Kaiser [Thu, 23 Jun 2016 03:25:44 +0000 (03:25 +0000)]
Merge "Sensor: Make getId() more varied" into nyc-dev

8 years agoSensor: Make getId() more varied
Greg Kaiser [Tue, 21 Jun 2016 23:11:14 +0000 (16:11 -0700)]
Sensor: Make getId() more varied

Apps from different developers will now receive a different
ID for the same dynamic sensor.  Additionally, all apps
will now receive a different/new ID for the same dynamic
sensor after a factory reset.

Bug: 2877559029547335
Change-Id: I368655b0e4bdc16736a7fd163ea3f7dad2886b3b

8 years agoMerge \"Run iptables as root.\" into nyc-dev
Felipe Leme [Wed, 22 Jun 2016 20:29:24 +0000 (20:29 +0000)]
Merge \"Run iptables as root.\" into nyc-dev
am: ab69cc1f11

Change-Id: I1c45a731c685ddbde7630c588fb6e53a08489a75

8 years agoMerge "Run iptables as root." into nyc-dev
TreeHugger Robot [Wed, 22 Jun 2016 20:24:53 +0000 (20:24 +0000)]
Merge "Run iptables as root." into nyc-dev

8 years agoMerge \"SensorList: Don\'t output UUIDs\" into nyc-dev
Greg Kaiser [Mon, 20 Jun 2016 17:21:41 +0000 (17:21 +0000)]
Merge \"SensorList: Don\'t output UUIDs\" into nyc-dev
am: a0c08e2f8f

Change-Id: Ia791bb67a2351f68da06e0ddc35c224677e4cead

8 years agoRun iptables as root.
Felipe Leme [Sat, 18 Jun 2016 00:37:13 +0000 (17:37 -0700)]
Run iptables as root.

iptables requires root access and su is not available on user builds,
hence it must be ran before dropping uid to shell user.

BUG: 29455997

Change-Id: I10c6337b411875b061ae9556b6e9c44f83301ae1

8 years agoMerge "SensorList: Don't output UUIDs" into nyc-dev
Greg Kaiser [Mon, 20 Jun 2016 16:24:51 +0000 (16:24 +0000)]
Merge "SensorList: Don't output UUIDs" into nyc-dev

8 years agoMerge \"BufferQueueProducer: Signal consumer when a buffer is detached\" into nyc-dev
Eino-Ville Talvala [Sat, 18 Jun 2016 02:18:21 +0000 (02:18 +0000)]
Merge \"BufferQueueProducer: Signal consumer when a buffer is detached\" into nyc-dev
am: 51ed38bb13

Change-Id: I9adb021022e1ed4b1a5b74eaa59cc88c5de475a6

8 years agoMerge "BufferQueueProducer: Signal consumer when a buffer is detached" into nyc-dev
Eino-Ville Talvala [Sat, 18 Jun 2016 02:10:11 +0000 (02:10 +0000)]
Merge "BufferQueueProducer: Signal consumer when a buffer is detached" into nyc-dev

8 years agoSensorList: Don't output UUIDs
Greg Kaiser [Fri, 17 Jun 2016 22:27:12 +0000 (15:27 -0700)]
SensorList: Don't output UUIDs

We don't want the UUIDs of dynamic sensors to be in the logs.

Bug:28775590
Change-Id: I85ca83e0ad1a0a8ed6618999bd22d86d7ef972f9

8 years agovulkan: Updated IHV documentation
Jesse Hall [Fri, 17 Jun 2016 21:05:17 +0000 (21:05 +0000)]
vulkan: Updated IHV documentation
am: c2f184d9d8

Change-Id: I61d568218cedd32e7deb514fd092d7d424f26218

8 years agovulkan: Updated IHV documentation
Jesse Hall [Fri, 17 Jun 2016 20:54:53 +0000 (13:54 -0700)]
vulkan: Updated IHV documentation

Also deleted DevelopersGuide.pdf, which was very out of date and has
been superceded by public documentation on developer.android.com.

Change-Id: I7e47177191a773eea6db3ee2af0a287877cb8532

8 years agoMerge \"Revert \"Attach profiles to bug reports\"\" into nyc-dev
David Brazdil [Thu, 16 Jun 2016 13:24:01 +0000 (13:24 +0000)]
Merge \"Revert \"Attach profiles to bug reports\"\" into nyc-dev
am: ea1aa91a25

Change-Id: I736c406da5b866b712c02315a787019ad307c109

8 years agoMerge "Revert "Attach profiles to bug reports"" into nyc-dev
David Brazdil [Thu, 16 Jun 2016 13:11:05 +0000 (13:11 +0000)]
Merge "Revert "Attach profiles to bug reports"" into nyc-dev

8 years agoRevert "Attach profiles to bug reports"
David Brazdil [Thu, 16 Jun 2016 09:11:31 +0000 (09:11 +0000)]
Revert "Attach profiles to bug reports"

This reverts commit 0faf2b870f934c1cdd883d29642fd84da3b352e2.

Bug: 28610953
Bug: 29395357
Change-Id: I609fe344dfc61311e37b91b48480d9392764a598

8 years agoMerge \\"No need for dumpstate to explicitly reference \\'toybox\\'...\\" am: c1c06a7d6b
Elliott Hughes [Wed, 15 Jun 2016 16:37:43 +0000 (16:37 +0000)]
Merge \\"No need for dumpstate to explicitly reference \\'toybox\\'...\\" am: c1c06a7d6b
am: b660711d76

Change-Id: I09b62f9faa6c72e804a9c3199b518cd3c5edb676

8 years agoMerge \"No need for dumpstate to explicitly reference \'toybox\'...\"
Elliott Hughes [Wed, 15 Jun 2016 16:33:42 +0000 (16:33 +0000)]
Merge \"No need for dumpstate to explicitly reference \'toybox\'...\"
am: c1c06a7d6b

Change-Id: Icb2f2ba9cd42e7f3c209d2f7b9e14ec8443a9a16

8 years agoMerge "No need for dumpstate to explicitly reference 'toybox'..."
Treehugger Robot [Wed, 15 Jun 2016 16:29:53 +0000 (16:29 +0000)]
Merge "No need for dumpstate to explicitly reference 'toybox'..."

8 years agoNo need for dumpstate to explicitly reference 'toybox'...
Elliott Hughes [Tue, 14 Jun 2016 20:56:00 +0000 (13:56 -0700)]
No need for dumpstate to explicitly reference 'toybox'...

...now we've switched the symlinks over to the toybox implementations.

Change-Id: I6301e3bc8de7210bf111889ee3b014802aecf15c

8 years agoMerge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-dev...
Craig Donner [Tue, 14 Jun 2016 03:55:26 +0000 (03:55 +0000)]
Merge "resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-dev-plus-aosp

8 years agoMerge \\"Move dumpstate over to toybox top.\\" am: f5e4ac0338
Elliott Hughes [Tue, 14 Jun 2016 01:38:37 +0000 (01:38 +0000)]
Merge \\"Move dumpstate over to toybox top.\\" am: f5e4ac0338
am: 0498cc9683

Change-Id: Ie747d812296798d74d61bba4f9092ba0585b415d

8 years agoMerge \"Move dumpstate over to toybox top.\"
Elliott Hughes [Tue, 14 Jun 2016 01:33:47 +0000 (01:33 +0000)]
Merge \"Move dumpstate over to toybox top.\"
am: f5e4ac0338

Change-Id: Ib6fb7d2c0b7f5507b02dcd160cb0a24ab8ac1558

8 years agoMerge "Move dumpstate over to toybox top."
Treehugger Robot [Tue, 14 Jun 2016 01:29:49 +0000 (01:29 +0000)]
Merge "Move dumpstate over to toybox top."

8 years agoresolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp
Craig Donner [Tue, 14 Jun 2016 00:45:06 +0000 (17:45 -0700)]
resolve merge conflicts of 4931fb2 to nyc-mr1-dev-plus-aosp

Change-Id: Ic490104e9b7f01df5ea6404b3b5bab733fa46812

8 years agoMove dumpstate over to toybox top.
Elliott Hughes [Tue, 14 Jun 2016 00:35:07 +0000 (17:35 -0700)]
Move dumpstate over to toybox top.

Change-Id: I3715b0d217aaf263687d6cab24ca470caf7c70a0

8 years agoMerge "Revert "GLConsumer: add build-time disable of gpu protected content"" into...
Craig Donner [Mon, 13 Jun 2016 23:13:02 +0000 (23:13 +0000)]
Merge "Revert "GLConsumer: add build-time disable of gpu protected content"" into nyc-dev

8 years agoRevert "GLConsumer: add build-time disable of gpu protected content"
Craig Donner [Mon, 13 Jun 2016 22:14:15 +0000 (22:14 +0000)]
Revert "GLConsumer: add build-time disable of gpu protected content"

This reverts commit dea97b7aa2b5cfbb7d42f30bcbf86a01778b609b.

Bug: 28545166

Change-Id: I4b069e14c2b99e190ebdea6df1ed83827ffe17b6

8 years agoMerge \"Fixed file descriptor leak in IMemory\" into nyc-dev
John Eckerdal [Mon, 13 Jun 2016 18:44:38 +0000 (18:44 +0000)]
Merge \"Fixed file descriptor leak in IMemory\" into nyc-dev
am: a13a22649b

Change-Id: I8ab67bafd9c9031924cfb7cf3b2c07a7dce45795