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

Commit 1e91aa6b authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Migrate CTS_SYSTEM_API_CHANGEID to @EnabledSince" am: 9aed0ced 

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

Change-Id: I17a549fbef3c8402671db0e5bc374e20bd26c0b0
parents e3fc8eed 9aed0ced

services/core/java/com/android/server/compat/CompatChange.java

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.server.compat; 


import android.annotation.Nullable;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledAfter;

import android.compat.annotation.EnabledSince;

import android.content.pm.ApplicationInfo;



import com.android.internal.compat.CompatibilityChangeInfo;
@@ -43,8 +43,8 @@ public final class CompatChange extends CompatibilityChangeInfo { 
     * A change ID to be used only in the CTS test for this SystemApi

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = 1234) // Needs to be > test APK targetSdkVersion.

    private static final long CTS_SYSTEM_API_CHANGEID = 149391281; // This is a bug id.

    @EnabledSince(targetSdkVersion = 1235) // Needs to be > test APK targetSdkVersion.

    static final long CTS_SYSTEM_API_CHANGEID = 149391281; // This is a bug id.



    /**

     * Callback listener for when compat changes are updated for a package.

services/core/java/com/android/server/compat/PlatformCompat.java

+3 −0
Original line number Diff line number Diff line
@@ -375,6 +375,9 @@ public class PlatformCompat extends IPlatformCompat.Stub { 
        if (change.getLoggingOnly()) {

            return false;

        }

        if (change.getId() == CompatChange.CTS_SYSTEM_API_CHANGEID) {

            return false;

        }

        if (change.getEnableSinceTargetSdk() > 0) {

            if (change.getEnableSinceTargetSdk() < sMinTargetSdk

                    || change.getEnableSinceTargetSdk() > sMaxTargetSdk) {