Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6970dcdb authored by Nikita Iashchenko's avatar Nikita Iashchenko Committed by Automerger Merge Worker
Browse files

Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig"... 

Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig" am: 0a632252 am: 20cc15ed am: 5f84d097 am: 32df2b14

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

Change-Id: I12deb5558167a60c89e49e28d9b511afe0910037
parents 3dfd0644 32df2b14

core/java/com/android/internal/compat/CompatibilityChangeConfig.java

+4 −4
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ public final class CompatibilityChangeConfig implements Parcelable { 
     * Changes forced to be enabled.

     */

    public Set<Long> enabledChanges() {

        return mChangeConfig.forceEnabledSet();

        return mChangeConfig.getEnabledSet();

    }



    /**

     * Changes forced to be disabled.

     */

    public Set<Long> disabledChanges() {

        return mChangeConfig.forceDisabledSet();

        return mChangeConfig.getDisabledSet();

    }



    /**
@@ -84,8 +84,8 @@ public final class CompatibilityChangeConfig implements Parcelable { 


    @Override

    public void writeToParcel(Parcel dest, int flags) {

        long[] enabled = mChangeConfig.forceEnabledChangesArray();

        long[] disabled = mChangeConfig.forceDisabledChangesArray();

        long[] enabled = mChangeConfig.getEnabledChangesArray();

        long[] disabled = mChangeConfig.getDisabledChangesArray();



        dest.writeLongArray(enabled);

        dest.writeLongArray(disabled);