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

Commit 52d326c2 authored by Ray Essick's avatar Ray Essick
Browse files

cleanup for strict_updatability_linting 

add extra annotations, reset lint-baseline.xml files.
The lint-baseline.xml includes code fixes from 2021/11 that had no xml
regeneration. XML files updated with output from the test make commands.

Bug: 188851874
Test: build
Test: m out/soong/.intermediates/frameworks/base/apex/media/framework/updatable-media/android_common_apex29/lint/lint-baseline.xml
Test: m out/soong/.intermediates/frameworks/base/apex/media/service/service-media-s/android_common_apex29/lint/lint-baseline.xml
Change-Id: Iad4d811d4d04dd9901d7290d1342e3aae2c22499
parent 644c3676

apex/media/framework/lint-baseline.xml

+41 −283
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="5" by="lint 4.1.0" client="cli" variant="all" version="4.1.0">

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



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `new android.media.ApplicationMediaCapabilities.Builder`"

        errorLine1="                            new ApplicationMediaCapabilities.Builder();"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java"

            line="208"

            column="29"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 29): `new android.media.ApplicationMediaCapabilities.Builder`"

        errorLine1="        ApplicationMediaCapabilities.Builder builder = new ApplicationMediaCapabilities.Builder();"

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

        id="DefaultLocale"

        message="Implicitly using the default locale is a common source of bugs: Use `toLowerCase(Locale)` instead. For strings meant to be internal use `Locale.ROOT`, otherwise `Locale.getDefault()`."

        errorLine1="        if (mSupportedVideoMimeTypes.contains(videoMime.toLowerCase())) {"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/ApplicationMediaCapabilities.java"

            line="314"

            column="56"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.os.RemoteException#rethrowFromSystemServer`"

        errorLine1="            e.rethrowFromSystemServer();"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaCommunicationManager.java"

            line="110"

            column="15"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.os.Parcel#writeParcelableCreator`"

        errorLine1="        dest.writeParcelableCreator((Parcelable) parcelable);"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParceledListSlice.java"

            line="77"

            column="14"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level R (current min is 29): `android.os.Parcel#readParcelableCreator`"

        errorLine1="        return from.readParcelableCreator(loader);"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParceledListSlice.java"

            line="82"

            column="21"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.TrackData#mediaFormat`"

        errorLine1="            this.mediaFormat = mediaFormat;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="273"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.TrackData#drmInitData`"

        errorLine1="            this.drmInitData = drmInitData;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="274"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#timeMicros`"

        errorLine1="            this.timeMicros = timeMicros;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="295"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#position`"

        errorLine1="            this.position = position;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="296"

            column="13"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#position`"

        errorLine1="            return &quot;[timeMicros=&quot; + timeMicros + &quot;, position=&quot; + position + &quot;]&quot;;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="302"

            column="66"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#timeMicros`"

        errorLine1="            return &quot;[timeMicros=&quot; + timeMicros + &quot;, position=&quot; + position + &quot;]&quot;;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="302"

            column="37"/>

    </issue>



    <issue

        id="NewApi"

        message="Class requires API level R (current min is 29): `android.media.MediaParser.SeekPoint`"

        errorLine1="            SeekPoint other = (SeekPoint) obj;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="313"

            column="32"/>

            line="121"

            column="57"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#position`"

        errorLine1="            return timeMicros == other.timeMicros &amp;&amp; position == other.position;"

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

        id="DefaultLocale"

        message="Implicitly using the default locale is a common source of bugs: Use `String.format(Locale, ...)` instead"

        errorLine1="            return String.format(&quot; session: {id: %d, status: %s, result: %s, progress: %d}&quot;,"

        errorLine2="                   ^">

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="314"

            column="54"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#position`"

        errorLine1="            return timeMicros == other.timeMicros &amp;&amp; position == other.position;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="314"

            column="66"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#timeMicros`"

        errorLine1="            return timeMicros == other.timeMicros &amp;&amp; position == other.position;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="314"

            file="frameworks/base/apex/media/framework/java/android/media/MediaTranscodingManager.java"

            line="1651"

            column="20"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#timeMicros`"

        errorLine1="            return timeMicros == other.timeMicros &amp;&amp; position == other.position;"

        id="ParcelClassLoader"

        message="Passing null here (to use the default class loader) will not work if you are restoring your own classes. Consider using for example `getClass().getClassLoader()` instead."

        errorLine1="            Bundle out = parcel.readBundle(null);"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="314"

            column="34"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#timeMicros`"

        errorLine1="            int result = (int) timeMicros;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="319"

            column="32"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#position`"

        errorLine1="            result = 31 * result + (int) position;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="320"

            column="42"/>

    </issue>



    <issue

        id="NewApi"

        message="Class requires API level R (current min is 29): `android.media.MediaParser.InputReader`"

        errorLine1="    public interface SeekableInputReader extends InputReader {"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="352"

            column="50"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level 31 (current min is 29): `android.media.metrics.LogSessionId#LOG_SESSION_ID_NONE`"

        errorLine1="    @NonNull private LogSessionId mLogSessionId = LogSessionId.LOG_SESSION_ID_NONE;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1071"

            column="51"/>

    </issue>



    <issue

        id="NewApi"

        message="Cast from `SeekableInputReader` to `InputReader` requires API level 30 (current min is 29)"

        errorLine1="        mExoDataReader.mInputReader = seekableInputReader;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1201"

            column="39"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#position`"

        errorLine1="            mPendingSeekPosition = seekPoint.position;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1287"

            column="36"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#timeMicros`"

        errorLine1="            mPendingSeekTimeMicros = seekPoint.timeMicros;"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1288"

            column="38"/>

            file="frameworks/base/apex/media/framework/java/android/media/MediaSession2.java"

            line="303"

            column="33"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#position`"

        errorLine1="            mExtractor.seek(seekPoint.position, seekPoint.timeMicros);"

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

        id="ParcelClassLoader"

        message="Using the default class loader will not work if you are restoring your own classes. Consider using for example `readBundle(getClass().getClassLoader())` instead."

        errorLine1="        mCustomExtras = in.readBundle();"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1290"

            column="29"/>

            file="frameworks/base/apex/media/framework/java/android/media/Session2Command.java"

            line="104"

            column="28"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.MediaParser.SeekPoint#timeMicros`"

        errorLine1="            mExtractor.seek(seekPoint.position, seekPoint.timeMicros);"

        id="ParcelClassLoader"

        message="Passing null here (to use the default class loader) will not work if you are restoring your own classes. Consider using for example `getClass().getClassLoader()` instead."

        errorLine1="        mSessionLink = in.readParcelable(null);"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1290"

            column="49"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level R (current min is 29): `android.media.DrmInitData.SchemeInitData#uuid`"

        errorLine1="                if (schemeInitData.uuid.equals(schemeUuid)) {"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1579"

            column="21"/>

            file="frameworks/base/apex/media/framework/java/android/media/Session2Token.java"

            line="141"

            column="27"/>

    </issue>



    <issue

        id="NewApi"

        message="Class requires API level R (current min is 29): `android.media.MediaParser.InputReader`"

        errorLine1="    private static final class DataReaderAdapter implements InputReader {"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1872"

            column="61"/>

    </issue>



    <issue

        id="NewApi"

        message="Class requires API level R (current min is 29): `android.media.MediaParser.InputReader`"

        errorLine1="    private static final class ParsableByteArrayAdapter implements InputReader {"

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

        id="ParcelClassLoader"

        message="Using the default class loader will not work if you are restoring your own classes. Consider using for example `readBundle(getClass().getClassLoader())` instead."

        errorLine1="        Bundle extras = in.readBundle();"

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

        <location

            file="frameworks/base/apex/media/framework/java/android/media/MediaParser.java"

            line="1905"

            column="68"/>

            file="frameworks/base/apex/media/framework/java/android/media/Session2Token.java"

            line="144"

            column="28"/>

    </issue>



</issues>

apex/media/service/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ java_sdk_library { 
        ":service-media-s-sources",

    ],

    libs: [

        "androidx.annotation_annotation",

        "updatable-media",

        "modules-annotation-minsdk",

        "modules-utils-build",

apex/media/service/java/com/android/server/media/MediaCommunicationService.java

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ import android.util.SparseArray; 
import android.util.SparseIntArray;

import android.view.KeyEvent;



import androidx.annotation.RequiresApi;



import com.android.internal.annotations.GuardedBy;

import com.android.modules.annotation.MinSdk;

import com.android.server.SystemService;
@@ -63,6 +65,7 @@ import java.util.concurrent.Executors; 
 * @hide

 */

@MinSdk(Build.VERSION_CODES.S)

@RequiresApi(Build.VERSION_CODES.S)

public class MediaCommunicationService extends SystemService {

    private static final String TAG = "MediaCommunicationSrv";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

apex/media/service/java/com/android/server/media/SessionPriorityList.java

+6 −0
Original line number Diff line number Diff line
@@ -18,9 +18,13 @@ package com.android.server.media; 


import android.annotation.Nullable;

import android.media.Session2Token;

import android.os.Build;

import android.util.Log;



import androidx.annotation.RequiresApi;



import com.android.internal.annotations.GuardedBy;

import com.android.modules.annotation.MinSdk;

import com.android.server.media.MediaCommunicationService.Session2Record;



import java.util.ArrayList;
@@ -33,6 +37,8 @@ import java.util.List; 
 * Higher priority session has more chance to be selected as media button session,

 * which receives the media button events.

 */

@MinSdk(Build.VERSION_CODES.S)

@RequiresApi(Build.VERSION_CODES.S)

class SessionPriorityList {

    private static final String TAG = "SessionPriorityList";

    private final Object mLock = new Object();

apex/media/service/lint-baseline.xml

+1 −34
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 format="6" by="lint 7.2.0-dev" type="baseline" client="" dependencies="true" name="" variant="all" version="7.2.0-dev">



</issues>