diff options
| author | Dan Stoza <stoza@google.com> | 2015-06-23 18:07:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-23 18:07:31 +0000 |
| commit | c8c0992ace7733c983e87e8e7154d844a54e5741 (patch) | |
| tree | fe509d1c58c62fee565ed8596e36303db6d3ebd9 /include | |
| parent | 7d3ad695304a1f24026227e630add6edd76fd0d6 (diff) | |
| parent | 0638a4fac7250e260c0102c770090cb7eefca936 (diff) | |
| download | frameworks_native-c8c0992ace7733c983e87e8e7154d844a54e5741.zip frameworks_native-c8c0992ace7733c983e87e8e7154d844a54e5741.tar.gz frameworks_native-c8c0992ace7733c983e87e8e7154d844a54e5741.tar.bz2 | |
am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
* commit '0638a4fac7250e260c0102c770090cb7eefca936':
libgui/SF: Propagate SECURE Layer flag changes
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/gui/LayerState.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/private/gui/LayerState.h b/include/private/gui/LayerState.h index 2fa6ff9..cbe8733 100644 --- a/include/private/gui/LayerState.h +++ b/include/private/gui/LayerState.h @@ -39,6 +39,7 @@ struct layer_state_t { enum { eLayerHidden = 0x01, // SURFACE_HIDDEN in SurfaceControl.java eLayerOpaque = 0x02, // SURFACE_OPAQUE + eLayerSecure = 0x80, // SECURE }; enum { @@ -48,10 +49,9 @@ struct layer_state_t { eAlphaChanged = 0x00000008, eMatrixChanged = 0x00000010, eTransparentRegionChanged = 0x00000020, - eVisibilityChanged = 0x00000040, + eFlagsChanged = 0x00000040, eLayerStackChanged = 0x00000080, eCropChanged = 0x00000100, - eOpacityChanged = 0x00000200, }; layer_state_t() |