Merge "Add toString to SyncNotedAppOp, AsyncNotedAppOp" (3811eb4e) · Commits · e / os / android_frameworks_base

core/java/android/app/AsyncNotedAppOp.java

+25 −5

Original line number	Diff line number	Diff line
		@@ -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
		@@ -158,6 +163,21 @@ public final class AsyncNotedAppOp implements Parcelable {
		return mTime;
		}

		@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) {
		@@ -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() {}

core/java/android/app/SyncNotedAppOp.java

+22 −3

Original line number	Diff line number	Diff line
		@@ -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.
		@@ -151,6 +156,20 @@ public final class SyncNotedAppOp implements Parcelable {
		return mPackageName;
		}

		@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) {
		@@ -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() {}