From 0b13609925908e38d62c05abd79528b2548ee551 Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Thu, 22 Apr 2021 13:58:55 +0000 Subject: [PATCH] Revert "API changes as requested by API council." Revert "API changes as requested by API council." Revert submission 1662226-compatibility-rename Reason for revert: Broke aosp-stage-master. Reverted Changes: Ie465c49ff:API changes as requested by API council. I3c5a5734b:API changes as requested by API council. I16bf86a9c:API changes as requested by API council. Change-Id: I3af51d240cec9dac013d81dc448b44ef2ca60f9c --- 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 134cef5b6bfae..28a21f7672830 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 implements Compatibility.BehaviorChangeDelegate { +public final class AppCompatCallbacks extends Compatibility.Callbacks { private final long[] mDisabledChanges; private final ChangeReporter mChangeReporter; @@ -38,7 +38,7 @@ public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDel * @param disabledChanges Set of compatibility changes that are disabled for this process. */ public static void install(long[] disabledChanges) { - Compatibility.setBehaviorChangeDelegate(new AppCompatCallbacks(disabledChanges)); + Compatibility.setCallbacks(new AppCompatCallbacks(disabledChanges)); } private AppCompatCallbacks(long[] disabledChanges) { @@ -48,11 +48,11 @@ public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDel ChangeReporter.SOURCE_APP_PROCESS); } - public void onChangeReported(long changeId) { + protected void reportChange(long changeId) { reportChange(changeId, ChangeReporter.STATE_LOGGED); } - public boolean isChangeEnabled(long changeId) { + protected boolean isChangeEnabled(long changeId) { if (Arrays.binarySearch(mDisabledChanges, changeId) < 0) { // Not present in the disabled array reportChange(changeId, ChangeReporter.STATE_ENABLED);