Merge "Make ChangeReporter.{Status,Source} proper enums" am: a421f8ff53 am: cdd4f0bdaf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511333

Change-Id: Ie7b5bd929dba5bdaee67e5381bcac7099c1e0596
This commit is contained in:
Treehugger Robot
2020-11-26 14:11:15 +00:00
committed by Automerger Merge Worker

View File

@@ -221,7 +221,7 @@ public final class ChangeReporter {
FrameworkStatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__SOURCE__SYSTEM_SERVER; FrameworkStatsLog.APP_COMPATIBILITY_CHANGE_REPORTED__SOURCE__SYSTEM_SERVER;
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(flag = true, prefix = { "STATE_" }, value = { @IntDef(prefix = { "STATE_" }, value = {
STATE_UNKNOWN_STATE, STATE_UNKNOWN_STATE,
STATE_ENABLED, STATE_ENABLED,
STATE_DISABLED, STATE_DISABLED,
@@ -231,7 +231,7 @@ public final class ChangeReporter {
} }
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(flag = true, prefix = { "SOURCE_" }, value = { @IntDef(prefix = { "SOURCE_" }, value = {
SOURCE_UNKNOWN_SOURCE, SOURCE_UNKNOWN_SOURCE,
SOURCE_APP_PROCESS, SOURCE_APP_PROCESS,
SOURCE_SYSTEM_SERVER SOURCE_SYSTEM_SERVER