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
This commit is contained in:
Florian Mayer
2021-04-22 13:58:55 +00:00
parent 080e301930
commit 0b13609925

View File

@@ -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);