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

Commit 2c53388f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6353135 from 79b40a2f to mainline-release 

Change-Id: Idb07acb34245ee84804340740357b081538e2e72
parents 61344e7b 79b40a2f

aidl_api/libincremental_aidl/current/android/os/incremental/IncrementalFileSystemControlParcel.aidl

0 → 100644
+24 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.os.incremental;

/* @hide */

parcelable IncrementalFileSystemControlParcel {

  ParcelFileDescriptor cmd;

  ParcelFileDescriptor pendingReads;

  ParcelFileDescriptor log;

}

aidl_api/libincremental_manager_aidl/current/android/os/incremental/IIncrementalService.aidl

0 → 100644
+44 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.os.incremental;

/* @hide */

interface IIncrementalService {

  int openStorage(in @utf8InCpp String path);

  int createStorage(in @utf8InCpp String path, in android.content.pm.DataLoaderParamsParcel params, in android.content.pm.IDataLoaderStatusListener listener, int createMode);

  int createLinkedStorage(in @utf8InCpp String path, int otherStorageId, int createMode);

  int makeBindMount(int storageId, in @utf8InCpp String sourcePath, in @utf8InCpp String targetFullPath, int bindType);

  int deleteBindMount(int storageId, in @utf8InCpp String targetFullPath);

  int makeDirectory(int storageId, in @utf8InCpp String path);

  int makeDirectories(int storageId, in @utf8InCpp String path);

  int makeFile(int storageId, in @utf8InCpp String path, in android.os.incremental.IncrementalNewFileParams params);

  int makeFileFromRange(int storageId, in @utf8InCpp String targetPath, in @utf8InCpp String sourcePath, long start, long end);

  int makeLink(int sourceStorageId, in @utf8InCpp String sourcePath, int destStorageId, in @utf8InCpp String destPath);

  int unlink(int storageId, in @utf8InCpp String path);

  boolean isFileRangeLoaded(int storageId, in @utf8InCpp String path, long start, long end);

  byte[] getMetadataByPath(int storageId, in @utf8InCpp String path);

  byte[] getMetadataById(int storageId, in byte[] fileId);

  boolean startLoading(int storageId);

  void deleteStorage(int storageId);

  boolean configureNativeBinaries(int storageId, in @utf8InCpp String apkFullPath, in @utf8InCpp String libDirRelativePath, in @utf8InCpp String abi);

  const int CREATE_MODE_TEMPORARY_BIND = 1;

  const int CREATE_MODE_PERMANENT_BIND = 2;

  const int CREATE_MODE_CREATE = 4;

  const int CREATE_MODE_OPEN_EXISTING = 8;

  const int BIND_TEMPORARY = 0;

  const int BIND_PERMANENT = 1;

}

aidl_api/libincremental_manager_aidl/current/android/os/incremental/IncrementalNewFileParams.aidl

0 → 100644
+25 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.os.incremental;

/* @hide */

parcelable IncrementalNewFileParams {

  long size;

  byte[] fileId;

  byte[] metadata;

  @nullable byte[] signature;

}

apex/media/framework/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ package android.media { 
    field public static final String PARSER_NAME_TS = "android.media.mediaparser.TsParser";

    field public static final String PARSER_NAME_UNKNOWN = "android.media.mediaparser.UNKNOWN";

    field public static final String PARSER_NAME_WAV = "android.media.mediaparser.WavParser";

    field public static final int SAMPLE_FLAG_DECODE_ONLY = -2147483648; // 0x80000000

    field public static final int SAMPLE_FLAG_ENCRYPTED = 1073741824; // 0x40000000

    field public static final int SAMPLE_FLAG_HAS_SUPPLEMENTAL_DATA = 268435456; // 0x10000000

    field public static final int SAMPLE_FLAG_KEY_FRAME = 1; // 0x1

    field public static final int SAMPLE_FLAG_LAST_SAMPLE = 536870912; // 0x20000000

  }



  public static interface MediaParser.InputReader {

apex/media/framework/java/android/media/MediaParser.java

+28 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
package android.media;



import android.annotation.CheckResult;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.StringDef;
@@ -391,8 +392,7 @@ public final class MediaParser { 
         *

         * @param trackIndex The index of the track to which the sample corresponds.

         * @param timeMicros The media timestamp associated with the sample, in microseconds.

         * @param flags Flags associated with the sample. See {@link MediaCodec

         *     MediaCodec.BUFFER_FLAG_*}.

         * @param flags Flags associated with the sample. See the {@code SAMPLE_FLAG_*} constants.

         * @param size The size of the sample data, in bytes.

         * @param offset The number of bytes that have been consumed by {@code

         *     onSampleDataFound(int, MediaParser.InputReader)} for the specified track, since the
@@ -405,7 +405,7 @@ public final class MediaParser { 
        void onSampleCompleted(

                int trackIndex,

                long timeMicros,

                int flags,

                @SampleFlags int flags,

                int size,

                int offset,

                @Nullable CryptoInfo cryptoInfo);
@@ -449,6 +449,31 @@ public final class MediaParser { 
        }

    }



    // Sample flags.



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(

            flag = true,

            value = {

                SAMPLE_FLAG_KEY_FRAME,

                SAMPLE_FLAG_HAS_SUPPLEMENTAL_DATA,

                SAMPLE_FLAG_LAST_SAMPLE,

                SAMPLE_FLAG_ENCRYPTED,

                SAMPLE_FLAG_DECODE_ONLY

            })

    public @interface SampleFlags {}

    /** Indicates that the sample holds a synchronization sample. */

    public static final int SAMPLE_FLAG_KEY_FRAME = MediaCodec.BUFFER_FLAG_KEY_FRAME;

    /** Indicates that the sample has supplemental data. */

    public static final int SAMPLE_FLAG_HAS_SUPPLEMENTAL_DATA = 1 << 28;

    /** Indicates that the sample is known to contain the last media sample of the stream. */

    public static final int SAMPLE_FLAG_LAST_SAMPLE = 1 << 29;

    /** Indicates that the sample is (at least partially) encrypted. */

    public static final int SAMPLE_FLAG_ENCRYPTED = 1 << 30;

    /** Indicates that the sample should be decoded but not rendered. */

    public static final int SAMPLE_FLAG_DECODE_ONLY = 1 << 31;



    // Parser implementation names.



    /** @hide */