gralloc1: Update SECURE_DISPLAY usage bit value

Update the value of GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY
as it conflicts with BufferUsage::GPU_DATA_BUFFER.

Change-Id: I7c236705528e6fc9d06ba298527e314da030bd34
CRs-Fixed: 2169110
This commit is contained in:
Anjaneya Prasad Musunuri
2018-01-11 13:56:23 +05:30
committed by Gerrit - the friendly Code Review server
parent 37cff3c778
commit b6fe970239
2 changed files with 4 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
* Not a Contribution
*
* Copyright (C) 2010 The Android Open Source Project
@@ -407,7 +407,7 @@ int BufferManager::GetHandleFlags(int format, gralloc1_producer_usage_t prod_usa
flags |= private_handle_t::PRIV_FLAGS_HW_TEXTURE;
}
if (prod_usage & GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY) {
if (cons_usage & GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY) {
flags |= private_handle_t::PRIV_FLAGS_SECURE_DISPLAY;
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
* Not a Contribution
*
* Copyright (C) 2008 The Android Open Source Project
@@ -66,7 +66,7 @@ inline int roundUpToPageSize(int x) {
#define GRALLOC1_CONSUMER_USAGE_PRIVATE_WFD 0x00200000
/* This flag is used for SECURE display usecase */
#define GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY 0x01000000
#define GRALLOC1_CONSUMER_USAGE_PRIVATE_SECURE_DISPLAY 0x02000000
/* This flag is used to indicate P010 format */
#define GRALLOC1_CONSUMER_USAGE_PRIVATE_10BIT GRALLOC1_PRODUCER_USAGE_PRIVATE_10BIT