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

Commit bff89de6 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "Add test api for CTS to test resource lost event" into rvc-dev am: bc930092 am: 6cb58060 

Change-Id: Ib449b1917d6f07fa4b67e9e2f385e4bf09e2bacc
parents 4bf7f8e1 6cb58060

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -1513,6 +1513,10 @@ package android.media { 
    field public static final String SAMPLE_RATE = "android.media.audiotrack.sampleRate";

  }



  public final class MediaCas implements java.lang.AutoCloseable {

    method public void forceResourceLost();

  }



  public static final class MediaCodecInfo.VideoCapabilities.PerformancePoint {

    ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(int, int, int, int, @NonNull android.util.Size);

    ctor public MediaCodecInfo.VideoCapabilities.PerformancePoint(@NonNull android.media.MediaCodecInfo.VideoCapabilities.PerformancePoint, @NonNull android.util.Size);

media/java/android/media/MediaCas.java

+12 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.media; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.content.Context;

import android.hardware.cas.V1_0.HidlCasPluginDescriptor;

import android.hardware.cas.V1_0.ICas;
@@ -1076,6 +1077,17 @@ public final class MediaCas implements AutoCloseable { 
        }

    }



    /**

     * Release Cas session. This is primarily used as a test API for CTS.

     * @hide

     */

    @TestApi

    public void forceResourceLost() {

        if (mResourceListener != null) {

            mResourceListener.onReclaimResources();

        }

    }



    @Override

    public void close() {

        if (mICas != null) {