Merge "Merge "Address missed comments from previous CL" into rvc-dev am: dab5588e84 am: d00340e1a5 am: 439359869f" into rvc-qpr-dev-plus-aosp

3 files changed, 3 insertions, 4 deletions

diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index 73d218057707..7150afe68d40 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -229,7 +229,7 @@ public final class SurfaceControl implements Parcelable {
             int transformHint);
 
     @Nullable
-    @GuardedBy("sLock")
+    @GuardedBy("mLock")
     private ArrayList<OnReparentListener> mReparentListeners;
 
     /**
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index 5b6e5c1acea2..0d21eb5cf920 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -1231,7 +1231,7 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
             float postScaleX, float postScaleY) {
         transaction.setPosition(surface, positionLeft, positionTop);
         transaction.setMatrix(surface, postScaleX /*dsdx*/, 0f /*dtdx*/,
-                0f /*dsdy*/, postScaleY /*dtdy*/);
+                0f /*dtdy*/, postScaleY /*dsdy*/);
     }
 
     /** @hide */
diff --git a/core/java/android/widget/inline/InlineContentView.java b/core/java/android/widget/inline/InlineContentView.java
index be7c6966ce38..1b666aa67e90 100644
--- a/core/java/android/widget/inline/InlineContentView.java
+++ b/core/java/android/widget/inline/InlineContentView.java
@@ -156,8 +156,7 @@ public class InlineContentView extends ViewGroup {
         @Override
         public void onDraw() {
             computeParentPositionAndScale();
-            final int visibility = InlineContentView.this.isShown() ? VISIBLE : GONE;
-            mSurfaceView.setVisibility(visibility);
+            mSurfaceView.setVisibility(VISIBLE);
         }
     };