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

Commit da172775 authored by Ray Essick's avatar Ray Essick
Browse files

more Newapi compliance 

Annotate more code for S+ so that the mainline newapi linter knows the
code doesn't run on Q/R (and thus won't invoke apis from the later releases).
Generated a lint-baseline.xml for the service directory.

Bug: 188851874
Test: build; m lint-check
Change-Id: I1dc88b8c98cfdff135c3912e1f95dfe9ea0c9384
parent fe023a7d

apex/media/framework/java/android/media/MediaParceledListSlice.java

+4 −0
Original line number Diff line number Diff line
@@ -18,9 +18,12 @@ package android.media; 


import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;



import androidx.annotation.RequiresApi;



import java.util.Collections;

import java.util.List;
@@ -41,6 +44,7 @@ import java.util.List; 
 * @hide

 */

@Deprecated

@RequiresApi(Build.VERSION_CODES.S)

@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

public final class MediaParceledListSlice<T extends Parcelable>

        extends BaseMediaParceledListSlice<T> {

apex/media/service/lint-baseline.xml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="6" by="lint 7.1.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.1.0-dev">



    <issue

        id="NewApi"

        message="Call requires API level S (current min is 29): `MediaParceledListSlice`"

        errorLine1="                    new MediaParceledListSlice&lt;>(getSession2TokensLocked(ALL.getIdentifier()));"

        errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/apex/media/service/java/com/android/server/media/MediaCommunicationService.java"

            line="242"

            column="21"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level S (current min is 29): `MediaParceledListSlice`"

        errorLine1="            userSession2Tokens = new MediaParceledListSlice&lt;>(getSession2TokensLocked(userId));"

        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/apex/media/service/java/com/android/server/media/MediaCommunicationService.java"

            line="243"

            column="34"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level S (current min is 29): `MediaParceledListSlice`"

        errorLine1="                MediaParceledListSlice parceledListSlice = new MediaParceledListSlice&lt;>(result);"

        errorLine2="                                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="frameworks/base/apex/media/service/java/com/android/server/media/MediaCommunicationService.java"

            line="386"

            column="60"/>

    </issue>



</issues>