Merge "InsetSourceConsumer: Ensure we release Leash when finished." into rvc-dev

core/java/android/view/InsetsSourceConsumer.java

@@ -87,6 +87,7 @@ public class InsetsSourceConsumer {
         if (mSourceControl == control) {
             return;
         }
+        final InsetsSourceControl lastControl = mSourceControl;
         mSourceControl = control;
 
         // We are loosing control
@@ -97,26 +98,28 @@ public class InsetsSourceConsumer {
             mState.getSource(getType()).setVisible(
                     mController.getLastDispatchedState().getSource(getType()).isVisible());
             applyLocalVisibilityOverride();
-            return;
+        } else {
-        }
+            // We are gaining control, and need to run an animation since previous state
-
+            // didn't match
-        // We are gaining control, and need to run an animation since previous state didn't match
             if (mRequestedVisible != mState.getSource(mType).isVisible()) {
                 if (mRequestedVisible) {
                     showTypes[0] |= toPublicType(getType());
                 } else {
                     hideTypes[0] |= toPublicType(getType());
                 }
-            return;
+            } else {
-        }
+              // We are gaining control, but don't need to run an animation.
-
+              // However make sure that the leash visibility is still up to date.
-        // We are gaining control, but don't need to run an animation. However make sure that the
-        // leash visibility is still up to date.
               if (applyLocalVisibilityOverride()) {
                   mController.notifyVisibilityChanged();
               }
               applyHiddenToControl();
             }
+        }
+        if (lastControl != null) {
+            lastControl.release();
+        }
+    }
 
     @VisibleForTesting
     public InsetsSourceControl getControl() {

core/java/android/view/InsetsSourceControl.java

@@ -94,6 +94,12 @@ public class InsetsSourceControl implements Parcelable {
         dest.writeParcelable(mSurfacePosition, 0 /* flags*/);
     }
 
+    public void release() {
+        if (mLeash != null) {
+            mLeash.release();
+        }
+    }
+
     public static final @android.annotation.NonNull Creator<InsetsSourceControl> CREATOR
             = new Creator<InsetsSourceControl>() {
         public InsetsSourceControl createFromParcel(Parcel in) {