diff options
| author | 2016-12-08 01:49:04 +0000 | |
|---|---|---|
| committer | 2016-12-08 01:49:05 +0000 | |
| commit | e685bb48f7b0650286f6f1c87f466d2a67a132d2 (patch) | |
| tree | 4f8efb9d2f0e716516823db02af26e18369a5445 | |
| parent | 99a164e613924f98ae042b57419df1122556eb5d (diff) | |
| parent | c8251eb7a6ecfdd16b3e4cfbfb442aa4c789c039 (diff) | |
Merge "Delete unused mask eTransactionMask parameter"
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 4 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger_hwc1.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index af6b3d091b..879959e09e 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1117,7 +1117,7 @@ void SurfaceFlinger::onMessageReceived(int32_t what) { } bool SurfaceFlinger::handleMessageTransaction() { - uint32_t transactionFlags = peekTransactionFlags(eTransactionMask); + uint32_t transactionFlags = peekTransactionFlags(); if (transactionFlags) { handleTransaction(transactionFlags); return true; @@ -2305,7 +2305,7 @@ status_t SurfaceFlinger::removeLayer(const wp<Layer>& weakLayer) { return status_t(index); } -uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t /* flags */) { +uint32_t SurfaceFlinger::peekTransactionFlags() { return android_atomic_release_load(&mTransactionFlags); } diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index 451d6612e6..4ec1a7201d 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -283,7 +283,7 @@ private: * Transactions */ uint32_t getTransactionFlags(uint32_t flags); - uint32_t peekTransactionFlags(uint32_t flags); + uint32_t peekTransactionFlags(); uint32_t setTransactionFlags(uint32_t flags); void commitTransaction(); uint32_t setClientStateLocked(const sp<Client>& client, const layer_state_t& s); diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp index ae2ef1cd66..55edc15963 100644 --- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp +++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp @@ -1050,7 +1050,7 @@ void SurfaceFlinger::onMessageReceived(int32_t what) { } bool SurfaceFlinger::handleMessageTransaction() { - uint32_t transactionFlags = peekTransactionFlags(eTransactionMask); + uint32_t transactionFlags = peekTransactionFlags(); if (transactionFlags) { handleTransaction(transactionFlags); return true; @@ -2223,7 +2223,7 @@ status_t SurfaceFlinger::removeLayer(const wp<Layer>& weakLayer) { return status_t(index); } -uint32_t SurfaceFlinger::peekTransactionFlags(uint32_t /* flags */) { +uint32_t SurfaceFlinger::peekTransactionFlags() { return android_atomic_release_load(&mTransactionFlags); } |