Merge "Add toString to SyncNotedAppOp, AsyncNotedAppOp"

2 files changed, 47 insertions, 8 deletions

diff --git a/core/java/android/app/AsyncNotedAppOp.java b/core/java/android/app/AsyncNotedAppOp.java
index db58c215ffe2..7845b6a6588e 100644
--- a/core/java/android/app/AsyncNotedAppOp.java
+++ b/core/java/android/app/AsyncNotedAppOp.java
@@ -37,7 +37,8 @@ import com.android.internal.util.Preconditions;
 @Immutable
 @DataClass(genEqualsHashCode = true,
         genAidl = true,
-        genHiddenConstructor = true)
+        genHiddenConstructor = true,
+        genToString = true)
 // - We don't expose the opCode, but rather the public name of the op, hence use a non-standard
 //   getter
 @DataClass.Suppress({"getOpCode"})
@@ -70,9 +71,13 @@ public final class AsyncNotedAppOp implements Parcelable {
         Preconditions.checkArgumentInRange(mOpCode, 0, AppOpsManager._NUM_OP - 1, "opCode");
     }
 
+    private String opCodeToString() {
+        return getOp();
+    }
+
 
 
-    // Code below generated by codegen v1.0.20.
+    // Code below generated by codegen v1.0.23.
     //
     // DO NOT MODIFY!
     // CHECKSTYLE:OFF Generated code
@@ -160,6 +165,21 @@ public final class AsyncNotedAppOp implements Parcelable {
 
     @Override
     @DataClass.Generated.Member
+    public String toString() {
+        // You can override field toString logic by defining methods like:
+        // String fieldNameToString() { ... }
+
+        return "AsyncNotedAppOp { " +
+                "opCode = " + opCodeToString() + ", " +
+                "notingUid = " + mNotingUid + ", " +
+                "attributionTag = " + mAttributionTag + ", " +
+                "message = " + mMessage + ", " +
+                "time = " + mTime +
+        " }";
+    }
+
+    @Override
+    @DataClass.Generated.Member
     public boolean equals(@Nullable Object o) {
         // You can override field equality logic by defining either of the methods like:
         // boolean fieldNameEquals(AsyncNotedAppOp other) { ... }
@@ -261,10 +281,10 @@ public final class AsyncNotedAppOp implements Parcelable {
     };
 
     @DataClass.Generated(
-            time = 1604456255752L,
-            codegenVersion = "1.0.20",
+            time = 1643320606160L,
+            codegenVersion = "1.0.23",
             sourceFile = "frameworks/base/core/java/android/app/AsyncNotedAppOp.java",
-            inputSignatures = "private final @android.annotation.IntRange int mOpCode\nprivate final @android.annotation.IntRange int mNotingUid\nprivate final @android.annotation.Nullable java.lang.String mAttributionTag\nprivate final @android.annotation.NonNull java.lang.String mMessage\nprivate final @android.annotation.CurrentTimeMillisLong long mTime\npublic @android.annotation.NonNull java.lang.String getOp()\nprivate  void onConstructed()\nclass AsyncNotedAppOp extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genHiddenConstructor=true)")
+            inputSignatures = "private final @android.annotation.IntRange int mOpCode\nprivate final @android.annotation.IntRange int mNotingUid\nprivate final @android.annotation.Nullable java.lang.String mAttributionTag\nprivate final @android.annotation.NonNull java.lang.String mMessage\nprivate final @android.annotation.CurrentTimeMillisLong long mTime\npublic @android.annotation.NonNull java.lang.String getOp()\nprivate  void onConstructed()\nprivate  java.lang.String opCodeToString()\nclass AsyncNotedAppOp extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genHiddenConstructor=true, genToString=true)")
     @Deprecated
     private void __metadata() {}
 
diff --git a/core/java/android/app/SyncNotedAppOp.java b/core/java/android/app/SyncNotedAppOp.java
index 7c0c08a7fc35..f156b30d5050 100644
--- a/core/java/android/app/SyncNotedAppOp.java
+++ b/core/java/android/app/SyncNotedAppOp.java
@@ -40,7 +40,8 @@ import com.android.internal.util.DataClass;
 @DataClass(
         genEqualsHashCode = true,
         genAidl = true,
-        genConstructor = false
+        genConstructor = false,
+        genToString = true
 )
 @DataClass.Suppress({"getOpCode", "getOpMode"})
 public final class SyncNotedAppOp implements Parcelable {
@@ -118,6 +119,10 @@ public final class SyncNotedAppOp implements Parcelable {
         return mOpMode;
     }
 
+    private String opCodeToString() {
+        return getOp();
+    }
+
 
 
     // Code below generated by codegen v1.0.23.
@@ -153,6 +158,20 @@ public final class SyncNotedAppOp implements Parcelable {
 
     @Override
     @DataClass.Generated.Member
+    public String toString() {
+        // You can override field toString logic by defining methods like:
+        // String fieldNameToString() { ... }
+
+        return "SyncNotedAppOp { " +
+                "opMode = " + mOpMode + ", " +
+                "opCode = " + opCodeToString() + ", " +
+                "attributionTag = " + mAttributionTag + ", " +
+                "packageName = " + mPackageName +
+        " }";
+    }
+
+    @Override
+    @DataClass.Generated.Member
     public boolean equals(@Nullable Object o) {
         // You can override field equality logic by defining either of the methods like:
         // boolean fieldNameEquals(SyncNotedAppOp other) { ... }
@@ -245,10 +264,10 @@ public final class SyncNotedAppOp implements Parcelable {
     };
 
     @DataClass.Generated(
-            time = 1619711733947L,
+            time = 1643320427700L,
             codegenVersion = "1.0.23",
             sourceFile = "frameworks/base/core/java/android/app/SyncNotedAppOp.java",
-            inputSignatures = "private final  int mOpMode\nprivate final @android.annotation.IntRange int mOpCode\nprivate final @android.annotation.Nullable java.lang.String mAttributionTag\nprivate final @android.annotation.NonNull java.lang.String mPackageName\npublic @android.annotation.NonNull java.lang.String getOp()\npublic  int getOpMode()\nclass SyncNotedAppOp extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genConstructor=false)")
+            inputSignatures = "private final  int mOpMode\nprivate final @android.annotation.IntRange int mOpCode\nprivate final @android.annotation.Nullable java.lang.String mAttributionTag\nprivate final @android.annotation.NonNull java.lang.String mPackageName\npublic @android.annotation.NonNull java.lang.String getOp()\npublic  int getOpMode()\nprivate  java.lang.String opCodeToString()\nclass SyncNotedAppOp extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genConstructor=false, genToString=true)")
     @Deprecated
     private void __metadata() {}