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

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

Change-Id: I69e1d7a9f3d5733248262187298dd22d2242a1ad
This commit is contained in:
Florian Mayer
2021-04-22 14:19:41 +00:00
committed by Automerger Merge Worker
parent 521cb5949f 6b4ecd94c1
commit 5e3ed6416a
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
*/
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);