Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "API changes as requested by API council."" am: 6b4ecd94c1 am: 5e3ed6416a

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

Change-Id: If9f9aae036070f0f49ff0f016fc164ad07a4ee00
This commit is contained in:
Florian Mayer
2021-04-22 14:41:34 +00:00
committed by Automerger Merge Worker
parent a1d8ab1ac9 5e3ed6416a
commit c60be93eef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/AppCompatCallbacks.java
View File

@@ -28,7 +28,7 @@ import java.util.Arrays;
* *
* @hide * @hide
*/ */
public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDelegate { public final class AppCompatCallbacks extends Compatibility.Callbacks {
private final long[] mDisabledChanges; private final long[] mDisabledChanges;
private final ChangeReporter mChangeReporter; 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. * @param disabledChanges Set of compatibility changes that are disabled for this process.
*/ */
public static void install(long[] disabledChanges) { public static void install(long[] disabledChanges) {
Compatibility.setBehaviorChangeDelegate(new AppCompatCallbacks(disabledChanges)); Compatibility.setCallbacks(new AppCompatCallbacks(disabledChanges));
} }
private AppCompatCallbacks(long[] disabledChanges) { private AppCompatCallbacks(long[] disabledChanges) {
@@ -48,11 +48,11 @@ public final class AppCompatCallbacks implements Compatibility.BehaviorChangeDel
ChangeReporter.SOURCE_APP_PROCESS); ChangeReporter.SOURCE_APP_PROCESS);
} }
public void onChangeReported(long changeId) { protected void reportChange(long changeId) {
reportChange(changeId, ChangeReporter.STATE_LOGGED); reportChange(changeId, ChangeReporter.STATE_LOGGED);
} }
public boolean isChangeEnabled(long changeId) { protected boolean isChangeEnabled(long changeId) {
if (Arrays.binarySearch(mDisabledChanges, changeId) < 0) { if (Arrays.binarySearch(mDisabledChanges, changeId) < 0) {
// Not present in the disabled array // Not present in the disabled array
reportChange(changeId, ChangeReporter.STATE_ENABLED); reportChange(changeId, ChangeReporter.STATE_ENABLED);