From 1f71b142e526c6745bed33d83510537ade496805 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Thu, 22 Apr 2021 14:47:34 +0000 Subject: [PATCH] Revert^2 "API changes as requested by API council." 0b13609925908e38d62c05abd79528b2548ee551 Change-Id: I88039e798e26e2f3f33d5e3b85865b2958a963a1 --- core/java/android/app/AppCompatCallbacks.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/app/AppCompatCallbacks.java b/core/java/android/app/AppCompatCallbacks.java index 28a21f7672830..134cef5b6bfae 100644 --- a/core/java/android/app/AppCompatCallbacks.java +++ b/core/java/android/app/AppCompatCallbacks.java @@ -28,7 +28,7 @@ import java.util.Arrays; * * @hide */ -public final class AppCompatCallbacks extends Compatibility.Callbacks { +public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDelegate { private final long[] mDisabledChanges; private final ChangeReporter mChangeReporter; @@ -38,7 +38,7 @@ public final class AppCompatCallbacks extends Compatibility.Callbacks { * @param disabledChanges Set of compatibility changes that are disabled for this process. */ public static void install(long[] disabledChanges) { - Compatibility.setCallbacks(new AppCompatCallbacks(disabledChanges)); + Compatibility.setBehaviorChangeDelegate(new AppCompatCallbacks(disabledChanges)); } private AppCompatCallbacks(long[] disabledChanges) { @@ -48,11 +48,11 @@ public final class AppCompatCallbacks extends Compatibility.Callbacks { ChangeReporter.SOURCE_APP_PROCESS); } - protected void reportChange(long changeId) { + public void onChangeReported(long changeId) { reportChange(changeId, ChangeReporter.STATE_LOGGED); } - protected boolean isChangeEnabled(long changeId) { + public boolean isChangeEnabled(long changeId) { if (Arrays.binarySearch(mDisabledChanges, changeId) < 0) { // Not present in the disabled array reportChange(changeId, ChangeReporter.STATE_ENABLED);