Merge "Merge Android 12"

1 files changed, 8 insertions, 3 deletions

diff --git a/core/java/android/widget/GridLayout.java b/core/java/android/widget/GridLayout.java
index aa51d2c5de2d..5ca9d13b1180 100644
--- a/core/java/android/widget/GridLayout.java
+++ b/core/java/android/widget/GridLayout.java
@@ -31,6 +31,7 @@ import static java.lang.Math.max;
 import static java.lang.Math.min;
 
 import android.annotation.IntDef;
+import android.annotation.Nullable;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -45,6 +46,7 @@ import android.util.LogPrinter;
 import android.util.Pair;
 import android.util.Printer;
 import android.view.Gravity;
+import android.view.RemotableViewMethod;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inspector.InspectableProperty;
@@ -411,6 +413,7 @@ public class GridLayout extends ViewGroup {
      *
      * @attr ref android.R.styleable#GridLayout_rowCount
      */
+    @RemotableViewMethod
     public void setRowCount(int rowCount) {
         mVerticalAxis.setCount(rowCount);
         invalidateStructure();
@@ -445,6 +448,7 @@ public class GridLayout extends ViewGroup {
      *
      * @attr ref android.R.styleable#GridLayout_columnCount
      */
+    @RemotableViewMethod
     public void setColumnCount(int columnCount) {
         mHorizontalAxis.setCount(columnCount);
         invalidateStructure();
@@ -533,6 +537,7 @@ public class GridLayout extends ViewGroup {
      *
      * @attr ref android.R.styleable#GridLayout_alignmentMode
      */
+    @RemotableViewMethod
     public void setAlignmentMode(@AlignmentMode int alignmentMode) {
         this.mAlignmentMode = alignmentMode;
         requestLayout();
@@ -2222,7 +2227,7 @@ public class GridLayout extends ViewGroup {
         }
 
         @Override
-        public boolean equals(Object o) {
+        public boolean equals(@Nullable Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
 
@@ -2497,7 +2502,7 @@ public class GridLayout extends ViewGroup {
          *         {@code Interval}, {@code false} otherwise.
          */
         @Override
-        public boolean equals(Object that) {
+        public boolean equals(@Nullable Object that) {
             if (this == that) {
                 return true;
             }
@@ -2610,7 +2615,7 @@ public class GridLayout extends ViewGroup {
          *         {@code Spec}; {@code false} otherwise
          */
         @Override
-        public boolean equals(Object that) {
+        public boolean equals(@Nullable Object that) {
             if (this == that) {
                 return true;
             }