diff options
4 files changed, 0 insertions, 112 deletions
diff --git a/core/java/com/android/internal/compat/CompatibilityChangeInfo.java b/core/java/com/android/internal/compat/CompatibilityChangeInfo.java index 9ba025988126..ab890d277f43 100644 --- a/core/java/com/android/internal/compat/CompatibilityChangeInfo.java +++ b/core/java/com/android/internal/compat/CompatibilityChangeInfo.java @@ -93,43 +93,6 @@ public class CompatibilityChangeInfo implements Parcelable { dest.writeString(mDescription); } - @Override - public String toString() { - StringBuilder sb = new StringBuilder("CompatibilityChangeInfo(") - .append(getId()); - if (getName() != null) { - sb.append("; name=").append(getName()); - } - if (getEnableAfterTargetSdk() != -1) { - sb.append("; enableAfterTargetSdk=").append(getEnableAfterTargetSdk()); - } - if (getDisabled()) { - sb.append("; disabled"); - } - if (getLoggingOnly()) { - sb.append("; loggingOnly"); - } - return sb.append(")").toString(); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || !(o instanceof CompatibilityChangeInfo)) { - return false; - } - CompatibilityChangeInfo that = (CompatibilityChangeInfo) o; - return this.mChangeId == that.mChangeId - && this.mName.equals(that.mName) - && this.mEnableAfterTargetSdk == that.mEnableAfterTargetSdk - && this.mDisabled == that.mDisabled - && this.mLoggingOnly == that.mLoggingOnly - && this.mDescription.equals(that.mDescription); - - } - public static final Parcelable.Creator<CompatibilityChangeInfo> CREATOR = new Parcelable.Creator<CompatibilityChangeInfo>() { diff --git a/core/java/com/android/internal/compat/IPlatformCompat.aidl b/core/java/com/android/internal/compat/IPlatformCompat.aidl index 6408def7eeac..523ed6fa9a4f 100644 --- a/core/java/com/android/internal/compat/IPlatformCompat.aidl +++ b/core/java/com/android/internal/compat/IPlatformCompat.aidl @@ -222,14 +222,6 @@ interface IPlatformCompat CompatibilityChangeInfo[] listAllChanges(); /** - * List the compatibility changes that should be present in the UI. - * Filters out certain changes like e.g. logging only. - * - * @return An array of {@link CompatChangeInfo}. - */ - CompatibilityChangeInfo[] listUIChanges(); - - /** * Get an instance that can determine whether a changeid can be overridden for a package name. */ IOverrideValidator getOverrideValidator(); diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index 44f571a8c7a7..8519b00237aa 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -28,7 +28,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManagerInternal; import android.os.Binder; -import android.os.Build; import android.os.RemoteException; import android.os.UserHandle; import android.util.Slog; @@ -45,7 +44,6 @@ import com.android.server.LocalServices; import java.io.FileDescriptor; import java.io.PrintWriter; -import java.util.Arrays; /** * System server internal API for gating and reporting compatibility changes. @@ -58,9 +56,6 @@ public class PlatformCompat extends IPlatformCompat.Stub { private final ChangeReporter mChangeReporter; private final CompatConfig mCompatConfig; - private static int sMinTargetSdk = Build.VERSION_CODES.P; - private static int sMaxTargetSdk = Build.VERSION_CODES.Q; - public PlatformCompat(Context context) { mContext = context; mChangeReporter = new ChangeReporter( @@ -225,12 +220,6 @@ public class PlatformCompat extends IPlatformCompat.Stub { return mCompatConfig.dumpChanges(); } - @Override - public CompatibilityChangeInfo[] listUIChanges() { - return Arrays.stream(listAllChanges()).filter( - x -> isShownInUI(x)).toArray(CompatibilityChangeInfo[]::new); - } - /** * Check whether the change is known to the compat config. * @@ -350,17 +339,4 @@ public class PlatformCompat extends IPlatformCompat.Stub { checkCompatChangeReadPermission(); checkCompatChangeLogPermission(); } - - private boolean isShownInUI(CompatibilityChangeInfo change) { - if (change.getLoggingOnly()) { - return false; - } - if (change.getEnableAfterTargetSdk() != 0) { - if (change.getEnableAfterTargetSdk() < sMinTargetSdk - || change.getEnableAfterTargetSdk() > sMaxTargetSdk) { - return false; - } - } - return true; - } } diff --git a/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java b/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java index 72d8525671fc..53b90f2b01db 100644 --- a/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java +++ b/services/tests/servicestests/src/com/android/server/compat/PlatformCompatTest.java @@ -30,12 +30,10 @@ import static org.testng.Assert.assertThrows; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; -import android.os.Build; import androidx.test.runner.AndroidJUnit4; import com.android.internal.compat.AndroidBuildClassifier; -import com.android.internal.compat.CompatibilityChangeInfo; import com.android.server.LocalServices; import org.junit.Before; @@ -80,47 +78,6 @@ public class PlatformCompatTest { } @Test - public void testListAllChanges() { - mCompatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext) - .addEnabledChangeWithId(1L) - .addDisabledChangeWithIdAndName(2L, "change2") - .addTargetSdkChangeWithIdAndDescription(Build.VERSION_CODES.O, 3L, "description") - .addTargetSdkChangeWithId(Build.VERSION_CODES.P, 4L) - .addTargetSdkChangeWithId(Build.VERSION_CODES.Q, 5L) - .addTargetSdkChangeWithId(Build.VERSION_CODES.R, 6L) - .addLoggingOnlyChangeWithId(7L) - .build(); - mPlatformCompat = new PlatformCompat(mContext, mCompatConfig); - assertThat(mPlatformCompat.listAllChanges()).asList().containsExactly( - new CompatibilityChangeInfo(1L, "", -1, false, false, ""), - new CompatibilityChangeInfo(2L, "change2", -1, true, false, ""), - new CompatibilityChangeInfo(3L, "", Build.VERSION_CODES.O, false, false, - "description"), - new CompatibilityChangeInfo(4L, "", Build.VERSION_CODES.P, false, false, ""), - new CompatibilityChangeInfo(5L, "", Build.VERSION_CODES.Q, false, false, ""), - new CompatibilityChangeInfo(6L, "", Build.VERSION_CODES.R, false, false, ""), - new CompatibilityChangeInfo(7L, "", -1, false, true, "")); - } - - public void testListUIChanges() { - mCompatConfig = CompatConfigBuilder.create(mBuildClassifier, mContext) - .addEnabledChangeWithId(1L) - .addDisabledChangeWithIdAndName(2L, "change2") - .addTargetSdkChangeWithIdAndDescription(Build.VERSION_CODES.O, 3L, "description") - .addTargetSdkChangeWithId(Build.VERSION_CODES.P, 4L) - .addTargetSdkChangeWithId(Build.VERSION_CODES.Q, 5L) - .addTargetSdkChangeWithId(Build.VERSION_CODES.R, 6L) - .addLoggingOnlyChangeWithId(7L) - .build(); - mPlatformCompat = new PlatformCompat(mContext, mCompatConfig); - assertThat(mPlatformCompat.listUIChanges()).asList().containsExactly( - new CompatibilityChangeInfo(1L, "", -1, false, false, ""), - new CompatibilityChangeInfo(2L, "change2", -1, true, false, ""), - new CompatibilityChangeInfo(4L, "", Build.VERSION_CODES.P, false, false, ""), - new CompatibilityChangeInfo(5L, "", Build.VERSION_CODES.Q, false, false, "")); - } - - @Test public void testRegisterListenerToSameIdThrows() throws Exception { // Registering a listener to change 1 is successful. mPlatformCompat.registerListener(1, mListener1); |