OSDN Git Service

android-x86/frameworks-native.git
6 years agoAdd runpath to lshal_test
Jiyong Park [Wed, 13 Sep 2017 08:37:40 +0000 (17:37 +0900)]
Add runpath to lshal_test

android.hardware.test.baz@1.0.so is installed to /data/nativetest(64),
and no longer to /system/lib(64) or /system/lib(64)/vndk, because the
interface library is only for testing.

Set runpath so that lshal_test can find the interface library in the
non-standard directory.

Bug: 65603915
Test: m -j lshal_test
adb push out/target/product/<name>/data/nativetest* /data
adb shell /data/nativetest/lshal_test/lshal_test

Change-Id: I854b08acb6442990ed369bfbc517ad1a93c94584

6 years agoMerge "Fix stack use-after-scope in InputReader" into oc-mr1-dev
TreeHugger Robot [Fri, 8 Sep 2017 23:49:30 +0000 (23:49 +0000)]
Merge "Fix stack use-after-scope in InputReader" into oc-mr1-dev

6 years agoMerge "surfaceflinger: handle executeCommands transaction errors" into oc-mr1-dev
Chia-I Wu [Fri, 8 Sep 2017 22:31:32 +0000 (22:31 +0000)]
Merge "surfaceflinger: handle executeCommands transaction errors" into oc-mr1-dev

6 years agosurfaceflinger: handle executeCommands transaction errors
Chia-I Wu [Fri, 8 Sep 2017 17:14:34 +0000 (10:14 -0700)]
surfaceflinger: handle executeCommands transaction errors

Unlike other functions, executeCommands both sends and receives
handles.  It can fail for reasons such as out-of-fd.  We want to
protect SurfaceFlinger against out-of-fd.

Bug: 65449888
Test: manual
Change-Id: Id9420dbd6d0a943737c90bd3a1ae0df3805a4cb0

6 years agoSet the layer composition type in HWC
Pat Plunkett [Wed, 12 Jul 2017 21:09:27 +0000 (14:09 -0700)]
Set the layer composition type in HWC

Setting up the VR hardware composer was causing a call to
setLayerCompositionType with an invalid composition type. This removes the
call, since setting the layer composition type is already handled in
Layer::Prepare().

Bug: 63633934
Test: Start VR mode, check that the logcat errors are no longer present.
Change-Id: I94f9a253bce9c5c25be7927d0003adbb9409ab36

6 years agoMerge "Set enum to fixed size type" into oc-mr1-dev
TreeHugger Robot [Fri, 8 Sep 2017 06:13:48 +0000 (06:13 +0000)]
Merge "Set enum to fixed size type" into oc-mr1-dev

6 years agoSet enum to fixed size type
Marie White [Thu, 7 Sep 2017 23:12:13 +0000 (16:12 -0700)]
Set enum to fixed size type

Bug: 63683612
Test: Manual. Ran O2 on Marlin, tested image streaming manually.

Since DvrPoseRawDataType enum will be part of the public DVR API,
explicitly define the size of the enum.

Change-Id: I3900470ccb3ca7a2c4e7ed8e7f5586c60486d9e6

6 years agoMerge "Clean up handling of VR surface updates." into oc-mr1-dev
Corey Tabaka [Fri, 8 Sep 2017 00:54:10 +0000 (00:54 +0000)]
Merge "Clean up handling of VR surface updates." into oc-mr1-dev

6 years agoMerge "Add a new keycode for TV (ALL_APPS)" into oc-dev am: 6afce442ea
Sujith Ramakrishnan [Thu, 7 Sep 2017 02:09:03 +0000 (02:09 +0000)]
Merge "Add a new keycode for TV (ALL_APPS)" into oc-dev am: 6afce442ea
am: 047fcbf671

Change-Id: I17bac0d425207b1edc0ffbe997953502aae324e0

6 years agoMerge "Add a new keycode for TV (ALL_APPS)" into oc-dev
Sujith Ramakrishnan [Thu, 7 Sep 2017 02:00:12 +0000 (02:00 +0000)]
Merge "Add a new keycode for TV (ALL_APPS)" into oc-dev
am: 6afce442ea

Change-Id: I7933009ee4c64025245373ee6b5ad1b0d77291e9

6 years agoMerge "Add a new keycode for TV (ALL_APPS)" into oc-dev
Sujith Ramakrishnan [Thu, 7 Sep 2017 00:09:22 +0000 (00:09 +0000)]
Merge "Add a new keycode for TV (ALL_APPS)" into oc-dev

6 years agoFix race conditions when using mHwc off the main thread
Steven Thomas [Fri, 1 Sep 2017 01:24:21 +0000 (18:24 -0700)]
Fix race conditions when using mHwc off the main thread

In a few cases we were accessing mHwc off the main thread without
acquiring mStateLock, resulting in crashes and other incorrect
behavior. This CL adds the missing locks. Since the locking semantics
are somewhat hard to understand, also add a clarifying comment to the
mHwc member declaration in SurfaceFlinger.h.

Bug: 64586546

Test: I manually tested normal surface flinger operation and vr behavior
on different devices, and confirmed everything looks fine. The crashes
we saw that were caused by these mHwc race conditions are hard to
reproduce, so I couldn't empirically verify this fixes the crash. I'm
relying on manual code inspection to confirm the issue is in fact fixed.

Regarding performance, I added profiling code (not part of this CL) to
check for lock contention and hold times with the newly added locks. I
confirmed that contention is low, so these calls shouldn't be
significantly slower as a result of adding the locks. The time spent
holding these new locks is also low, except for getDisplayColorModes(),
which makes a call to hardware composer service and can in some cases
take over a millisecond. That function is called so rarely though, only
once at boot, or twice at boot after a fresh flash, that it's not worth
optimizing.

Change-Id: I3854779c12a61983aaaecddb9f6316f218e519e3

6 years agoMerge "Remove unbundled IME feature from automotive confg" into oc-mr1-dev
TreeHugger Robot [Wed, 6 Sep 2017 00:23:07 +0000 (00:23 +0000)]
Merge "Remove unbundled IME feature from automotive confg" into oc-mr1-dev

6 years agoFix stack use-after-scope in InputReader
Michael Spang [Wed, 6 Sep 2017 00:17:16 +0000 (20:17 -0400)]
Fix stack use-after-scope in InputReader

READ of size 4 at 0x0079b1ac3a20 thread T121 (InputReader)

Viewport [1] to add: virtual:android:277f1a09-b88d-4d1e-8716-796f114d080b
   #0 0x79b8820d53 in android::InputReaderConfiguration::getDisplayViewport(android::ViewportType, android::String8 const*, android::DisplayViewport*) const frameworks/native/services/inputflinger/InputReader.cpp:246:39
   #1 0x79b8843fab in android::TouchInputMapper::configureSurface(long, bool*) frameworks/native/services/inputflinger/InputReader.cpp:3472:22
   #2 0x79b88411b3 in android::TouchInputMapper::configure(long, android::InputReaderConfiguration const*, unsigned int) frameworks/native/services/inputflinger/InputReader.cpp:3248:9
   #3 0x79b8825ff3 in android::InputDevice::configure(long, android::InputReaderConfiguration const*, unsigned int) frameworks/native/services/inputflinger/InputReader.cpp:1126:21
   #4 0x79b8822653 in android::InputReader::refreshConfigurationLocked(unsigned int) frameworks/native/services/inputflinger/InputReader.cpp:612:25
   #5 0x79b88239fb in android::InputReader::loopOnce() frameworks/native/services/inputflinger/InputReader.cpp:343:13
   #6 0x79b882d507 in android::InputReaderThread::threadLoop() frameworks/native/services/inputflinger/InputReader.cpp:1004:14
   #7 0x79d79e6113 in android::Thread::_threadLoop(void*) system/core/libutils/Threads.cpp:747:28
   #8 0x79da914bbb in android::AndroidRuntime::javaThreadShell(void*) frameworks/base/core/jni/AndroidRuntime.cpp:1199:14
   #9 0x79da20f31b in __pthread_start(void*) bionic/libc/bionic/pthread_create.cpp:214:18
   #10 0x79da1c6dff in __start_thread bionic/libc/bionic/clone.cpp:47:16

Bug: 65378805
Test: asan build
Change-Id: I5a65cb007fe4879ce9635572014a568583a2ef4a

6 years agoMerge "Add api's to dvr_pose to retrieve data from sensord" into oc-mr1-dev
TreeHugger Robot [Tue, 5 Sep 2017 17:05:09 +0000 (17:05 +0000)]
Merge "Add api's to dvr_pose to retrieve data from sensord" into oc-mr1-dev

6 years agoMerge "Fixed dumpstate_test_fixture so it runs on 64 bits as well." into oc-mr1-dev
TreeHugger Robot [Sun, 3 Sep 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Fixed dumpstate_test_fixture so it runs on 64 bits as well." into oc-mr1-dev

6 years agoMerge "Drop capabilities in reconcileSecondaryDexFiles" into oc-mr1-dev
Shubham Ajmera [Sun, 3 Sep 2017 03:19:58 +0000 (03:19 +0000)]
Merge "Drop capabilities in reconcileSecondaryDexFiles" into oc-mr1-dev

6 years agoAdd api's to dvr_pose to retrieve data from sensord
Marie White [Wed, 9 Aug 2017 05:23:45 +0000 (22:23 -0700)]
Add api's to dvr_pose to retrieve data from sensord

Bug: 63683612
Test: Manually tested through VrCore cl/164799996.

To retrieve raw data from Tango, added below api's to dvr_api:
- dvrPoseClientGetDataReader
- dvrPoseClientDataCapture
- dvrPoseClientDataReaderDestroy

Note: These changes have already been reviewed in branch
oc-dr1-daydream-dev branch. See change 2729572.

Changes tested on Pixel XL with and without 02 rendering path. Daydream
Home rendering in VR Mode correctly. Pixel functioning as normal.

Change-Id: Ia934d6a1a0b89edfd4408dde19d38e757d44f785

6 years agoMerge "Temporary fix for memory leak on DumpRunningServiceTimeout." into oc-mr1-dev
TreeHugger Robot [Sat, 2 Sep 2017 00:26:05 +0000 (00:26 +0000)]
Merge "Temporary fix for memory leak on DumpRunningServiceTimeout." into oc-mr1-dev

6 years agoClean up handling of VR surface updates.
Corey Tabaka [Fri, 1 Sep 2017 03:01:15 +0000 (20:01 -0700)]
Clean up handling of VR surface updates.

- Fix bug where adding a new hardware layer causes existing single-
  buffered surface layers to unlatch their buffer.
- Rename variables holding Composer pointers from hidl to composer
  to improve readability.
- Remove the arbitrary hardware layer limit, moving responsibility
  for efficient use of hardware layers to the VR display manager.

Bug: 64987282
Bug: 64756801
Test: Build system for multiple devices and manually test operation.
Change-Id: I8f05ca83830f62e15b18cd52df3014432c887681

6 years agoRemove unbundled IME feature from automotive confg
Pavel Maltsev [Fri, 1 Sep 2017 21:46:08 +0000 (14:46 -0700)]
Remove unbundled IME feature from automotive confg

Test: make -j && flash && adb shell pm list feature

Bug: 64546952
Change-Id: I87cb2662cf0b41eb6e13e237831fcfdb68d0eb44

6 years agoDrop capabilities in reconcileSecondaryDexFiles
Shubham Ajmera [Fri, 25 Aug 2017 20:07:44 +0000 (13:07 -0700)]
Drop capabilities in reconcileSecondaryDexFiles

... while unlinking oat files.

Test: adb shell cmd package reconcile-secondary-dex-files \
      com.android.google.gms

Bug: 64461549
Change-Id: Ib2c59686233faab22088fc40a706736feb9964ee
(cherry-picked from commit 5a9ef99046e7324f5e821b05ad956e5e953a1e84)

6 years agoMerge "Export libui_headers as vndk header only library" into oc-mr1-dev
Isaac Chen [Fri, 1 Sep 2017 00:36:28 +0000 (00:36 +0000)]
Merge "Export libui_headers as vndk header only library" into oc-mr1-dev

6 years agoExport libui_headers as vndk header only library
Isaac Chen [Thu, 31 Aug 2017 11:05:25 +0000 (19:05 +0800)]
Export libui_headers as vndk header only library

Emulator EGL uses libui headers and needs to be built
successfully when BOARD_VNDK_VERSION is enabled.

Bug: 64704866
Test: Built aosp_x86 with BOARD_VNDK_VERSION set to current and
      BOARD_VNDK_RUNTIME_DISABLE set to true. Booted on x86 emulator.

Change-Id: Ic26fc14e61330fcc555501c906a64393afe6145d

6 years agoMerge "Rename WriteBufferQueueGetExternalSurface: Step 1" into oc-mr1-dev
TreeHugger Robot [Thu, 31 Aug 2017 03:27:37 +0000 (03:27 +0000)]
Merge "Rename WriteBufferQueueGetExternalSurface: Step 1" into oc-mr1-dev

6 years agoAdd a new keycode for TV (ALL_APPS)
Sujith Ramakrishnan [Wed, 19 Jul 2017 01:54:15 +0000 (18:54 -0700)]
Add a new keycode for TV (ALL_APPS)

    - KEYCODE_ALL_APPS: Launches all apps. For TV, this checks for
      launcher package in system image.

Test: Manual: ALL_APPS: adb shell input keyevent 284
Test: also tested with --longpress for these keys

Bug: 38496261
Change-Id: I2e50a569533f01d93c020adde672c842540f0193

6 years agoRename WriteBufferQueueGetExternalSurface: Step 1
Jiwen 'Steve' Cai [Wed, 30 Aug 2017 18:26:20 +0000 (11:26 -0700)]
Rename WriteBufferQueueGetExternalSurface: Step 1

Add new API WriteBufferQueueGetANativeWindow and forward all calls to
the old one with a warning.

Bug: 65133502
Test: dvr_api-test
Change-Id: I6787bc5d341f7e36a8a35102a5ce651c3aa296f8

6 years agoMerge fences when needed for accurate timestamps.
Brian Anderson [Tue, 8 Aug 2017 23:31:37 +0000 (16:31 -0700)]
Merge fences when needed for accurate timestamps.

There's an optimization in ConsumerBase that checks the status
of the current fence before merging it with a new fence. If
the current fence has already signaled, then it just picks up
the new fence without merging.

Unfortunately, if the new fence is already signaled too, then
it's possible that it signaled long before the current fence,
which can result in an inaccurate timestamp with the current
logic.

The new logic merges the fences when the statuses of the current
and new fences are the same. If they differ, then it takes the
unsignaled fence.

This fixes the reads done timestamps in the GetFrameTimestamps
dEQP tests so that they are always monotonic and always arrive
after rendering completes.

Test: --deqp-case=dEQP-EGL*get_frame_timestamps*
Bug: 37513882

Change-Id: I345e48aae0fbb3c28c2f2c0dc035e6b0fa70df43
(cherry picked from commit 7b097e2e3d9dd9444916ddf77d75ca394e6b753e)

6 years agoAdd vulkan_headers_ndk cc_library_headers module
Jesse Hall [Tue, 29 Aug 2017 04:55:32 +0000 (21:55 -0700)]
Add vulkan_headers_ndk cc_library_headers module

We had a cc_library_headers module for the Vulkan headers, for use by
platform and vendor modules. We also had an ndk_headers module to copy
the headers into the NDK. This adds another cc_library_headers module
which allows things in the Android tree but which are built against
the NDK (like CTS) to use our copy of the header, rather than an NDK
prebuilt. That allows CTS tests to use extensions that aren't yet
present in the prebuilt NDK Vulkan header.

Bug: 34745152
Test: build with accompanying external/vulkan-validation-layers changes
Change-Id: Ia5f1bc086210403f8e6c023ce3c6413f74f91ff3

6 years agoMerge "thermalservice: don't register IThermalCallback service" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 03:14:24 +0000 (03:14 +0000)]
Merge "thermalservice: don't register IThermalCallback service" into oc-mr1-dev

6 years agoMerge "vulkan: Update Vulkan headers to 1.0.54" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 20:01:21 +0000 (20:01 +0000)]
Merge "vulkan: Update Vulkan headers to 1.0.54" into oc-mr1-dev

6 years agovulkan: Update Vulkan headers to 1.0.54
Jesse Hall [Mon, 28 Aug 2017 19:10:06 +0000 (12:10 -0700)]
vulkan: Update Vulkan headers to 1.0.54

Key changes since 1.0.53:
* Updated several KHX extensions and promoted to KHR:
  * VK_KHR_external_memory_capabilities
  * VK_KHR_external_memory_win32
  * VK_KHR_external_memory_fd
  * VK_KHR_external_semaphore_capabilities
  * VK_KHR_external_semaphore
  * VK_KHR_external_semaphore_win32
  * VK_KHR_external_semaphore_fd
  * VK_KHR_win32_keyed_mutex
* Added new extensions:
  * VK_KHR_external_fence_capabilities
  * VK_KHR_external_fence
  * VK_KHR_external_fence_win32
  * VK_KHR_external_fence_fd
  * VK_KHR_storage_buffer_storage_class
  * VK_KHR_variable_pointers
  * VK_KHR_dedicated_allocation
  * VK_KHR_get_memory_requirements2

Test: build
Bug: 34745152
Change-Id: I790143b0d5160c02a016f1e67720edbf6bc45636
Merged-In: I790143b0d5160c02a016f1e67720edbf6bc45636
(cherry picked from commit 9492f99cb57d97aa5df908773738fe7fe6a86acf)

6 years agoMerge "Dumpstate: Add tombstone filtering" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 15:27:35 +0000 (15:27 +0000)]
Merge "Dumpstate: Add tombstone filtering" into oc-mr1-dev

6 years agothermalservice: don't register IThermalCallback service
Todd Poynor [Sat, 26 Aug 2017 07:53:06 +0000 (00:53 -0700)]
thermalservice: don't register IThermalCallback service

This service is only to be registered with IThermal 1.1 HALs via a
registration method, not for lookup via hwservicemanager.

Bug: 64986538
Bug: 30982366
Test: manual on w
Change-Id: I2c14a454dd4446267529f2e1cbf99ff23fbd1737

6 years agoTemporary fix for memory leak on DumpRunningServiceTimeout.
Felipe Leme [Fri, 25 Aug 2017 20:39:04 +0000 (13:39 -0700)]
Temporary fix for memory leak on DumpRunningServiceTimeout.

Test: mmm -j32 frameworks/native/cmds/dumpsys && \
      adb sync && adb shell /data/nativetest/dumpsys_test/dumpsys_test && \
      adb shell /data/nativetest64/dumpsys_test/dumpsys_test && \
      printf "\n\n#### ALL TESTS PASSED ####\n"

Bug: 65056227
Change-Id: I328806e9edf8e156039fb5dd963c3750c67c98d9

6 years agoFixed dumpstate_test_fixture so it runs on 64 bits as well.
Felipe Leme [Fri, 25 Aug 2017 17:15:01 +0000 (10:15 -0700)]
Fixed dumpstate_test_fixture so it runs on 64 bits as well.

Test: mmm -j32 frameworks/native/cmds/dumpstate/ && adb sync && \
      adb shell /data/nativetest/dumpstate_test/dumpstate_test && \
      adb shell /data/nativetest64/dumpstate_test/dumpstate_test

Fixes: 64954094

Change-Id: I47fa6a6dcee0c3386c5a9b574583d84b20d30661

6 years agoEnsure history has pointer id of interest.
Siarhei Vishniakou [Fri, 25 Aug 2017 03:36:28 +0000 (20:36 -0700)]
Ensure history has pointer id of interest.

When two events with different pointer id's end up
next to each other in touch history, then crash may
occur by trying to access the data associated with
the second to last pointer id by using the last event's
pointer id.

Test: monkey testing on sailfish
Command: adb shell monkey -p com.google.android.deskclock -p
com.android.calculator2 -p com.google.android.contacts -p
com.android.launcher -p com.google.android.launcher -p com.android.mms
-p com.google.android.apps.messaging -p com.android.phone -p
com.google.android.dialer -p com.android.providers.downloads.ui -p
com.android.settings -p com.google.android.calendar -p
com.google.android.GoogleCamera -p com.google.android.apps.photos -p
com.google.android.gms -p com.google.android.setupwizard -p
com.google.android.googlequicksearchbox -p
com.google.android.packageinstaller -p
com.google.android.apps.nexuslauncher -c
android.intent.category.LAUNCHER --ignore-security-exceptions
--monitor-native-crashes -s 611 -v -v -v 125000
Native tests will be added later.
Fixes: 65012433

Change-Id: I560a54d7f59a8892adfad3a54db9c436e4089343

6 years agoomx: fix constrained profile support
Lajos Molnar [Thu, 24 Aug 2017 21:48:43 +0000 (14:48 -0700)]
omx: fix constrained profile support

Bug: 64691727
Change-Id: Idd4639466bc53cc2a49e31a6107209adfb250765

6 years agoDumpstate: Add tombstone filtering
Andreas Gampe [Tue, 22 Aug 2017 20:08:37 +0000 (13:08 -0700)]
Dumpstate: Add tombstone filtering

Only package the ten latest tombstones. This recovers the old behavior
when tombstones were limited to ten by tombstoned, and ensures that
bugreports stay small in size.

It is future work to optimize this, e.g., by packaging as many as possible.

(cherry picked from commit d0d7695ecbfd12aaecc8aec66aacb487b116ac0b)

Bug: 64290162
Test: m
Test: adb root && for ((i=0;i<50;i++)) ; do adb shell touch /data/tombstones/tombstone_$i ; done ; adb bugreport test.zip ; unzip -l test.zip | grep tomb
Merged-In: I4072b5fbcf1e0314aa3eebeefbadc61d5ec10787
Change-Id: I4072b5fbcf1e0314aa3eebeefbadc61d5ec10787

6 years agoFix resampling logic for duplicate events.
Siarhei Vishniakou [Mon, 12 Jun 2017 14:01:41 +0000 (15:01 +0100)]
Fix resampling logic for duplicate events.

When events with identical coordinates are
reported by the input driver, resampling can lead to
false change of direction due to extrapolation.
The added logic will compare the current event to the
previous event, and will use the previously resampled values
for the new event if the raw (as reported by the driver)
coordinates of the two events match.
This commit makes events with identical coordinates possible,
so it must be submitted together with the new impulse-based
VelocityTracker strategy commit. The currently used 2nd degree
polynomical unweighted least squares strategy cannot handle
consecutive events with identical coordinates.

Bug: 35412046
Test: Recorded bad scroll event on swordfish, and replayed
the event to reproduce this bug. To twitch is no longer observed.
Also tested common usecase scenarios on sailfish, no regressions observed.

Change-Id: Icb5cf6c76959f3514b8b94c09e38cc5434f31b23
(cherry picked from commit 0aeec07971d86c635412c672bd69d91f589a0cd9)
Merged-In: Icb5cf6c76959f3514b8b94c09e38cc5434f31b23

6 years agoMerge "Add dumpsys finish timestamp" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 00:51:22 +0000 (00:51 +0000)]
Merge "Add dumpsys finish timestamp" into oc-mr1-dev

6 years agoMerge "Rename servicetool to pdx_tool" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:42:11 +0000 (22:42 +0000)]
Merge "Rename servicetool to pdx_tool" into oc-mr1-dev

6 years agoRename servicetool to pdx_tool
Jiwen 'Steve' Cai [Mon, 21 Aug 2017 23:23:06 +0000 (16:23 -0700)]
Rename servicetool to pdx_tool

As we are planning to include the pdx diagnosis binary into Android
system image, the name of servicetool is too general to fit in. Rename
it to pdx_tool as it's quite unique, short and sufficiently descriptive
to what it actually is.

Bug: 64802424
Test: Build pdx binary, push to device and dump
Change-Id: I9b5e9094e2253e994bd4b7ec9e47af5c0b442531

6 years agoMerge "Fix VR surface attributes not being read on surface create." into oc-mr1-dev
TreeHugger Robot [Mon, 21 Aug 2017 23:27:00 +0000 (23:27 +0000)]
Merge "Fix VR surface attributes not being read on surface create." into oc-mr1-dev

6 years agoMerge "Clarify docs a bit" into oc-mr1-dev
TreeHugger Robot [Sat, 19 Aug 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Clarify docs a bit" into oc-mr1-dev

6 years agoClarify docs a bit
John Reck [Fri, 18 Aug 2017 16:44:38 +0000 (09:44 -0700)]
Clarify docs a bit

Bug: 64394076
Test: N/A
Change-Id: I79756c90fdafc076f51097af709e1f44d60738c9

6 years agoMerge "surfaceflinger: fix a nullptr dereference" into oc-dev am: 29e5fa3fda
Chia-I Wu [Thu, 17 Aug 2017 23:58:18 +0000 (23:58 +0000)]
Merge "surfaceflinger: fix a nullptr dereference" into oc-dev am: 29e5fa3fda
am: cefb8a6742

Change-Id: I6d3e51289f6a7c435523a8cb9bc6ccc677923fae

6 years agoMerge "surfaceflinger: fix a nullptr dereference" into oc-dev
Chia-I Wu [Thu, 17 Aug 2017 23:54:07 +0000 (23:54 +0000)]
Merge "surfaceflinger: fix a nullptr dereference" into oc-dev
am: 29e5fa3fda

Change-Id: I8b183fcc791880d464847340b8024a81d9f3b498

6 years agoMerge "surfaceflinger: fix a nullptr dereference" into oc-dev
TreeHugger Robot [Thu, 17 Aug 2017 23:35:14 +0000 (23:35 +0000)]
Merge "surfaceflinger: fix a nullptr dereference" into oc-dev

6 years agoMerge "Fix HdrCapabilities flattening" into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 17:39:09 +0000 (17:39 +0000)]
Merge "Fix HdrCapabilities flattening" into oc-mr1-dev

6 years agoMerge "Add cpuset switching to scheduler policy mechanism." into oc-mr1-dev
TreeHugger Robot [Thu, 17 Aug 2017 03:56:30 +0000 (03:56 +0000)]
Merge "Add cpuset switching to scheduler policy mechanism." into oc-mr1-dev

6 years agoFix VR surface attributes not being read on surface create.
Corey Tabaka [Thu, 17 Aug 2017 02:59:48 +0000 (19:59 -0700)]
Fix VR surface attributes not being read on surface create.

The API to create VR surfaces allows attributes to be passed during
creation. Attributes can also be set/unset after creation. This CL
fixes an issue where visible and z-order attributes are not honored
when passed during creation, only when set after creation. This
required redundant IPCs and confused a lot of people using this
API.

Bug: 64127728
Test: dvr_api-test
Change-Id: Ife319bcca86115ba1bd2ece0ae93f71f15c0dd0e

6 years agoAdd cpuset switching to scheduler policy mechanism.
Corey Tabaka [Wed, 16 Aug 2017 21:52:01 +0000 (14:52 -0700)]
Add cpuset switching to scheduler policy mechanism.

Add the ability to add a cpuset to the supported scheduler policies.
This enables services that use the scheduler policy API to run in
the correct cpuset without explicitly requesting a cpuset via the
deprecated API.

Add tests to confirm the correct operation and fix flaky test due
to racing with thread.join().

Also fix log messages on performanced startup related to failure to
access /proc/<pid> directories for certain tasks: this failure is
expected due to sepolicy settings and the log spam is unnecessary.

Bug: 64337476
Test: performance_service_tests passes.
Change-Id: I8a82852e63e39fe72fa3b731e03237f3652cddc7

6 years agoFix HdrCapabilities flattening
Jay Patel [Wed, 16 Aug 2017 21:51:09 +0000 (14:51 -0700)]
Fix HdrCapabilities flattening

Modify vector reserve() to resize() to allocate and initialize the
updated vector

Bug: 64309771
Test: n/a
Change-Id: I76fd088493327b00cca39ef67e2362e4c79314be

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 22:23:04 +0000 (22:23 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours am: 4c0b934cca  -s ours am: 56618d838c  -s ours am: fd78a0345a  -s ours am: 693e897408  -s ours am: 2a46ddbd61  -s ours am: 2566e4686a  -s ours am: ce50585702  -s ours
am: 14f845729b  -s ours

Change-Id: I1711a931c7551918db7c247723e24edf8004ba1f

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 22:00:38 +0000 (22:00 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours am: 4c0b934cca  -s ours am: 56618d838c  -s ours am: fd78a0345a  -s ours am: 693e897408  -s ours am: 2a46ddbd61  -s ours am: 2566e4686a  -s ours
am: ce50585702  -s ours

Change-Id: Ifa1dac1ddb5c9ab76527f90e1ca900b79215f5da

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 21:51:09 +0000 (21:51 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours am: 4c0b934cca  -s ours am: 56618d838c  -s ours am: fd78a0345a  -s ours am: 693e897408  -s ours am: 2a46ddbd61  -s ours
am: 2566e4686a  -s ours

Change-Id: Id8eaeb73beca2ed388f6446a2bca3048c65831fa

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 21:43:04 +0000 (21:43 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours am: 4c0b934cca  -s ours am: 56618d838c  -s ours am: fd78a0345a  -s ours am: 693e897408  -s ours
am: 2a46ddbd61  -s ours

Change-Id: I88bc5be0fb0672a9edd7d9571b8bcd7db938a6fc

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 21:33:01 +0000 (21:33 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours am: 4c0b934cca  -s ours am: 56618d838c  -s ours am: fd78a0345a  -s ours
am: 693e897408  -s ours

Change-Id: I1368abe1a36bfa8f32fc3d5c7e173e28a9d18ef9

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 21:26:02 +0000 (21:26 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours am: 4c0b934cca  -s ours am: 56618d838c  -s ours
am: fd78a0345a  -s ours

Change-Id: I04e14d78a5d0ced89b7ad6220c056efe51dbddc2

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 21:14:32 +0000 (21:14 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours am: 4c0b934cca  -s ours
am: 56618d838c  -s ours

Change-Id: Id92244f080cf20e87d76e0b8df1155b6a989cbc3

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 21:07:08 +0000 (21:07 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours am: f5b4455491  -s ours
am: 4c0b934cca  -s ours

Change-Id: I45a115d25132a6211c656def10417033ae22296b

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 20:59:30 +0000 (20:59 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours am: 2f1a072f37  -s ours
am: f5b4455491  -s ours

Change-Id: I20195d51ae2fcb2ddee1237d3f7d8013769cd1f2

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 20:51:58 +0000 (20:51 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours am: 27f3e039d8  -s ours
am: 2f1a072f37  -s ours

Change-Id: Ie134ebccadc7984c7c674f1515ba7b7b756213ce

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3...
Siarhei Vishniakou [Wed, 16 Aug 2017 20:46:40 +0000 (20:46 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8 am: 3cc2b38fe3  -s ours
am: 27f3e039d8  -s ours

Change-Id: I7b5770ee14516de87179470d398f33f34b36ad20

6 years agoRemove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8
Siarhei Vishniakou [Wed, 16 Aug 2017 20:39:48 +0000 (20:39 +0000)]
Remove window obscurement information. am: ff7dd3b9ea am: f431a7cbf8
am: 3cc2b38fe3  -s ours

Change-Id: Ia2b6838ce682d4e361c9cff9502d6ed6623704e0

6 years agoRemove window obscurement information. am: ff7dd3b9ea
Siarhei Vishniakou [Wed, 16 Aug 2017 20:32:41 +0000 (20:32 +0000)]
Remove window obscurement information. am: ff7dd3b9ea
am: f431a7cbf8

Change-Id: Ifdaed9e6e75c06fc89b042c37ded20b2b273531b

6 years agoRemove window obscurement information.
Siarhei Vishniakou [Wed, 16 Aug 2017 20:24:33 +0000 (20:24 +0000)]
Remove window obscurement information.
am: ff7dd3b9ea

Change-Id: I3da41df019f3d660a5fd10d1f4239846158c62fe

6 years agoMerge "Add dvr API to create write queue locally" into oc-mr1-dev
TreeHugger Robot [Wed, 16 Aug 2017 19:58:47 +0000 (19:58 +0000)]
Merge "Add dvr API to create write queue locally" into oc-mr1-dev

6 years agoMerge "surfaceflinger: fix z-relative layer destruction" into oc-mr1-dev
Chia-I Wu [Wed, 16 Aug 2017 15:57:15 +0000 (15:57 +0000)]
Merge "surfaceflinger: fix z-relative layer destruction" into oc-mr1-dev

6 years agoMerge "Unconditionally unlink image." into oc-mr1-dev
Nicolas Geoffray [Wed, 16 Aug 2017 15:15:47 +0000 (15:15 +0000)]
Merge "Unconditionally unlink image." into oc-mr1-dev

6 years agoUnconditionally unlink image.
Nicolas Geoffray [Tue, 15 Aug 2017 13:51:05 +0000 (14:51 +0100)]
Unconditionally unlink image.

In case there is a stale one. Useful when doing:
adb shell cmd package compile --reset ...

bug: 64708178
Test: adb shell cmd package compile removes the app image
Change-Id: I459920d8ddd6071aee60668c90ee082d86e1e282

6 years agoAdd dvr API to create write queue locally
Jiwen 'Steve' Cai [Tue, 15 Aug 2017 20:44:08 +0000 (13:44 -0700)]
Add dvr API to create write queue locally

Currently, this API is mostly for testing purpose. But also note that
this API might eventually deemed useful if BufferHub-based ANativeWindow
becomes binder parseable.

Bug: 3751776164723700
Test: dvr_api-test --gtest_filter='DvrBufferQueueTest.*'
Change-Id: I9429079a4936d474fabb0026c38d3a1a4dcab92e

6 years agoRevert "Postpone color mode change until after boot animation"
Thierry Strudel [Wed, 16 Aug 2017 01:46:14 +0000 (01:46 +0000)]
Revert "Postpone color mode change until after boot animation"
am: 2924d01304

Change-Id: If182308e0602e3e5af0998698f0e428f7c3ff18d

6 years agoAdd dumpsys finish timestamp
Kevin Rocard [Tue, 15 Aug 2017 03:40:24 +0000 (20:40 -0700)]
Add dumpsys finish timestamp

Dumpsys are very helpful to debug issues.
Nevertheless a recurrent problem is that the dumpsys take time especially
if multiple are taken like during a bug report generation.
Due to this delay, it can be hard to understand during
which logs a dumpsys was taken.

This commit changes the last line of a dumpsys to contain the time it
was generated.
Here is an example:

[... normal dumpsys...]
    - Mix ID 8 I/O handle 37
  - 1 sinks:
    - Device ID 7 AUDIO_DEVICE_OUT_TELEPHONY_TX
Audio Policy Mix:
--------- 0.036s was the duration of dumpsys media.audio_policy, ending at: 2017-08-14 20:35:43

This patch adds the last part:
*, ending at: 2017-08-14 20:35:43*

Bug: 64699427
Test: adb bugreport
Test:  mmm -j32 frameworks/native/cmds/dumpsys && adb sync data && adb shell /data/nativetest/dumpsys_test/dumpsys_test --gtest_filter=-DumpsysTest.DumpRunningServiceTimeout
       # DumpRunningServiceTimeout is broken independently of this patch
Change-Id: I9873e7dd915b4f7cdd6eac5c44487ae5740fa805
Signed-off-by: Kevin Rocard <krocard@google.com>
6 years agosurfaceflinger: fix z-relative layer destruction
Chia-I Wu [Tue, 15 Aug 2017 18:18:17 +0000 (11:18 -0700)]
surfaceflinger: fix z-relative layer destruction

Layer::commitTransaction is called before Layer::onRemoved.  The
removal of a layer from another layer's zOrderRelatives is not
reflected in Layer::mDrawingState until Layer::commitTransaction is
called again.  As a result, we may draw a removed layer, which is
not supposed to own any HWC or GL resource.

Add Layer::onRemovedFromCurrentState that is called when a layer is
removed from mCurrentState to mLayersPendingRemoval.  Move
zOrderRelative* updates from onRemoved to the new
onRemovedFromCurrentState, and set eTraversalNeeded as needed.

Also fix Layer::~Layer to restore the old behavior and destroy all
stale HWC layers just in case.

Bug: 64572777
Test: manual and AUPT
Change-Id: I546c5b4b7ecac0937fead655733402fae664331c

6 years agoRevert "Postpone color mode change until after boot animation"
Thierry Strudel [Mon, 14 Aug 2017 22:19:37 +0000 (15:19 -0700)]
Revert "Postpone color mode change until after boot animation"

This reverts commit c53d3558d55dfd1d1c424b0d632fea693113e83e.

To have better control on when the color shift is happening, the
bootloader asset will be aligned with the Android OS applied
saturation. So apply the color setting as soon as SF is up.

Bug: 63520186
Bug: 63823274
Test: Verify that sRGB is applied at the start of boot animation
Change-Id: I611eb61266c909fde50e7ea2b4c1314541228736

6 years agoMerge "Mark libEGL, GLESv1_CM, GLESv2, and GLESv3 as LLNDK" into oc-mr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 10:16:18 +0000 (10:16 +0000)]
Merge "Mark libEGL, GLESv1_CM, GLESv2, and GLESv3 as LLNDK" into oc-mr1-dev

6 years agoMerge "omx: add constrained AVC profile constants" into oc-mr1-dev
Lajos Molnar [Tue, 15 Aug 2017 03:13:39 +0000 (03:13 +0000)]
Merge "omx: add constrained AVC profile constants" into oc-mr1-dev

6 years agoMerge "media/omx: fix VP9 level enums" into oc-mr1-dev
TreeHugger Robot [Tue, 15 Aug 2017 00:37:35 +0000 (00:37 +0000)]
Merge "media/omx: fix VP9 level enums" into oc-mr1-dev

6 years agoMerge "BufferHubQueueProducer reset buffers on disconnect" into oc-mr1-dev
TreeHugger Robot [Mon, 14 Aug 2017 21:01:31 +0000 (21:01 +0000)]
Merge "BufferHubQueueProducer reset buffers on disconnect" into oc-mr1-dev

6 years agoMerge "Add useful helper functions for tests" into oc-mr1-dev
TreeHugger Robot [Mon, 14 Aug 2017 06:44:15 +0000 (06:44 +0000)]
Merge "Add useful helper functions for tests" into oc-mr1-dev

6 years agoomx: add constrained AVC profile constants
Lajos Molnar [Sat, 12 Aug 2017 00:40:50 +0000 (17:40 -0700)]
omx: add constrained AVC profile constants

Bug: 63864332
Change-Id: I7bcf85a723f86088540ce9f429b315655eee86c6

6 years agomedia/omx: fix VP9 level enums
Lajos Molnar [Mon, 3 Jul 2017 14:41:18 +0000 (07:41 -0700)]
media/omx: fix VP9 level enums

Bug: 62361245
Change-Id: If8bacbecd7698ef38e3428ad4a9daa1c4c6bbe82

6 years agoFix casting bug, add control for hard quotas.
Jeff Sharkey [Fri, 11 Aug 2017 21:13:31 +0000 (15:13 -0600)]
Fix casting bug, add control for hard quotas.

Bug: 6416039563255278
Test: /data/nativetest/installd_service_test/installd_cache_test
Change-Id: I8e2e24afd88da4dc13afdf05927e59c268e69825

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Fri, 11 Aug 2017 02:39:32 +0000 (02:39 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69 am: a31fb53edd am: b63caaf102 skipped: c2116af15c am: dfe44a12ab
am: 34ec404b4b

Change-Id: I0c3beccebe7e7accd9a4f08ea90f52a99da145ee

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Fri, 11 Aug 2017 02:30:36 +0000 (02:30 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69 am: a31fb53edd am: b63caaf102 skipped: c2116af15c
am: dfe44a12ab

Change-Id: I90f59bd979e33e39a9f9cfa8ca8f58d93a00994f

6 years agoMark libEGL, GLESv1_CM, GLESv2, and GLESv3 as LLNDK
Jiyong Park [Thu, 10 Aug 2017 11:30:56 +0000 (20:30 +0900)]
Mark libEGL, GLESv1_CM, GLESv2, and GLESv3 as LLNDK

They are used by libRSDriver and libRS_internal which are VNDK-SP
libraries. Therefore, the EGL/GLES libs must be LLNDK or VNDK-SP. We
choose to make them as LLNDK since they already have stable ABIs (as
they are NDK).

In addition, two more functions of libEGL are exposed to vendors

eglQueryStringImplementationANDROID and eglDupNativeFenceFDANDROID are
non-NDK symbols but are being used by libgui, which is a library marked
with vendor_available:true. In order to provide the symbols to the
library, they are added to the map.txt file and tagged as "# vndk" so
that they are exposed only when built for vendor libs (and hidden when
built for NDK).

Furthermore, eglQueryStringImplementationANDROID is changed to C-symbol
in order to be mentioned in the map.txt file, where C++ mangled symbol
name can't be used.

Bug: 64425518
Test: BOARD_VNDK_VERSION=current m -j libRSDriver.vendor
Test: BOARD_VNDK_VERSION=current m -j libRS_internal.vendor
Change-Id: I4d5bcd5f72fb05a7908887f5192de70fd1d8c8f1

6 years agoAdd useful helper functions for tests
Courtney Goeltzenleuchter [Thu, 27 Jul 2017 14:11:24 +0000 (08:11 -0600)]
Add useful helper functions for tests

Trying to reduce code duplication by putting common
EGL functions used by opengl and surfaceflinger tests
here.
Test: adb shell /data/nativetest/test-opengl-gl2_basic/test-opengl-gl2_basic

Merged-In: Id7a32aedc565f3fbe56fa62ceb79cbb1e8c80727
Change-Id: Id7a32aedc565f3fbe56fa62ceb79cbb1e8c80727
(cherry picked from commit fe98f50b02746f4a1980d0fd31fd8126c5d4e445)

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Android Build Merger (Role) [Fri, 11 Aug 2017 00:24:46 +0000 (00:24 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69 am: a31fb53edd am: b63caaf102 skipped: c2116af15c

Change-Id: Ieec59681e3dc14340da368355ead622a7f0dcc1c

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Android Build Merger (Role) [Fri, 11 Aug 2017 00:24:37 +0000 (00:24 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69 am: a31fb53edd am: b63caaf102

Change-Id: I6a904953ea2d7f3943dd0daaf3f28efed121f15d

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Fri, 11 Aug 2017 00:19:48 +0000 (00:19 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69
am: a31fb53edd

Change-Id: I28d7687ca2590be1e14a0113fdd5734c76310f9d

6 years agosurfaceflinger: fix a nullptr dereference
Chia-I Wu [Tue, 18 Jul 2017 18:30:05 +0000 (11:30 -0700)]
surfaceflinger: fix a nullptr dereference

When the child layer latched a buffer but the fixed-size parent
layer never did (for reasons such as no buffer queued or buffer got
rejected), we could end up with p->mActiveBuffer being nullptr.

Bug: 62996512
Test: manual (I could never repro anyway)
Change-Id: Id7e4c7037633b8a37039baa6e8a306e55170b894
(cherry picked from commit 0a68b461d382304ae438fa8b52920fa75d178a1c)

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Thu, 10 Aug 2017 22:18:45 +0000 (22:18 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69

Change-Id: Ieedde100761fe504f080fbc4d538353c3dbd59e8

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Thu, 10 Aug 2017 22:18:41 +0000 (22:18 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b

Change-Id: Iabd279c9b858e4117d3f37a2c9dc6b08d18e9b3f

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Thu, 10 Aug 2017 22:18:37 +0000 (22:18 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5

Change-Id: I9340b61f66403d4a76aef61e8d5c523d46604f34

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Thu, 10 Aug 2017 22:18:33 +0000 (22:18 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28

Change-Id: I75bc0db5679a6ae55c647b31f206755128fa47f7

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am...
Siarhei Vishniakou [Thu, 10 Aug 2017 22:18:29 +0000 (22:18 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8

Change-Id: I313f92051e52e6b1b0f3d2f564781c66e6ad4918

6 years ago[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737
Siarhei Vishniakou [Thu, 10 Aug 2017 22:18:25 +0000 (22:18 +0000)]
[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737

Change-Id: I61e9a4e826ef2cafd73ad3591f3a3560a7002253

6 years agoDO NOT MERGE Remove window obscurement information. am: 5508ca2c19 am: 3847972ad2...
Siarhei Vishniakou [Thu, 10 Aug 2017 20:53:51 +0000 (20:53 +0000)]
DO NOT MERGE Remove window obscurement information. am: 5508ca2c19 am: 3847972ad2 am: cd71708eca am: 88855f8de7 am: 41f75ecb79  -s ours am: d0cd82abe9
am: 3a0e3d6a81

Change-Id: I496f7040816a3457effb97bc89e467023d270c44