diff options
| author | Rob Carr <racarr@google.com> | 2021-06-23 01:26:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-23 01:26:21 +0000 |
| commit | ab3c8d659cf4319f2c0b9bf8f9e37cc4eaf8c729 (patch) | |
| tree | d06ae64defa48d15b8ffaeccefae305395803797 | |
| parent | 19f79f618ff448b4280b6c76cebdab141c6eb57c (diff) | |
| parent | 63787777ebe39213059b420b6dacbf1d9b9746b8 (diff) | |
| download | native-ab3c8d659cf4319f2c0b9bf8f9e37cc4eaf8c729.tar.gz | |
Merge "SurfaceFlinger: Revert accidental change" into sc-dev am: 63787777eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15066709
Change-Id: Ib8ac8908eeffdc2e11e78320da642b8e205ba61d
| -rw-r--r-- | services/surfaceflinger/Layer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index b4d25053c6..ec9bb7c27f 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -996,7 +996,7 @@ protected: // This layer can be a cursor on some displays. bool mPotentialCursor{false}; - LayerVector mCurrentChildren{LayerVector::StateSet::Drawing}; + LayerVector mCurrentChildren{LayerVector::StateSet::Current}; LayerVector mDrawingChildren{LayerVector::StateSet::Drawing}; wp<Layer> mCurrentParent; |