summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-12-05 23:33:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-12-05 23:33:04 +0000
commit9bd71189b78ee142de12cad9515515f59b385d5a (patch)
tree38c34b3bb057052dcddb05e8d204cf5ab7ce0574 /core/java/android
parentca07451b9e137429eb5ef526a462ed5c3aa9752e (diff)
parent5f4c4ddf14d550f256bec45d95357f91a28846a8 (diff)
Merge "Check if the surface control is released before setting metadata on it"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/SurfaceControl.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index f642a732d854..9e5e20ab046b 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -2657,6 +2657,7 @@ public final class SurfaceControl implements Parcelable {
* @hide
*/
public Transaction setMetadata(SurfaceControl sc, int key, Parcel data) {
+ sc.checkNotReleased();
nativeSetMetadata(mNativeObject, sc.mNativeObject, key, data);
return this;
}