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

Commit 8373d856 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7256110 from 9b9bf70e to sc-release 

Change-Id: I5657c3b63e0b748e93a663947295b28cbd64046f
parents db873dae 9b9bf70e

apct-tests/perftests/core/src/android/os/PackageParsingPerfTest.kt

+9 −1
Original line number Diff line number Diff line
@@ -159,7 +159,15 @@ class PackageParsingPerfTest { 
            PARALLEL_MAX_THREADS, "package-parsing-test",

            Process.THREAD_PRIORITY_FOREGROUND)



        fun submit(file: File) = service.submit { queue.put(parse(file)) }

        fun submit(file: File) {

                service.submit {

                    try {

                        queue.put(parse(file))

                    } catch (e: Exception) {

                        queue.put(e)

                    }

                }

        }



        fun take() = queue.poll(QUEUE_POLL_TIMEOUT_SECONDS, TimeUnit.SECONDS)

apex/media/framework/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -133,9 +133,6 @@ java_sdk_library { 
        ":updatable-media-srcs",

    ],



    api_lint: {

        enabled: false,

    },

    impl_library_visibility: ["//frameworks/av/apex:__subpackages__"],

}

apex/media/framework/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ package android.media { 
    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest build();

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setClientPid(int);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setClientUid(int);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setDestinationFileDescriptor(android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setSourceFileDescriptor(android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setDestinationFileDescriptor(@NonNull android.os.ParcelFileDescriptor);

    method @NonNull public android.media.MediaTranscodeManager.VideoTranscodingRequest.Builder setSourceFileDescriptor(@NonNull android.os.ParcelFileDescriptor);

  }



}

apex/media/framework/java/android/media/MediaTranscodeManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1207,14 +1207,14 @@ public final class MediaTranscodeManager { 


            @Override

            @NonNull

            public Builder setSourceFileDescriptor(ParcelFileDescriptor fd) {

            public Builder setSourceFileDescriptor(@NonNull ParcelFileDescriptor fd) {

                super.setSourceFileDescriptor(fd);

                return self();

            }



            @Override

            @NonNull

            public Builder setDestinationFileDescriptor(ParcelFileDescriptor fd) {

            public Builder setDestinationFileDescriptor(@NonNull ParcelFileDescriptor fd) {

                super.setDestinationFileDescriptor(fd);

                return self();

            }

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ package android { 
    field public static final String USE_FULL_SCREEN_INTENT = "android.permission.USE_FULL_SCREEN_INTENT";

    field public static final String USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER = "android.permission.USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER";

    field public static final String USE_SIP = "android.permission.USE_SIP";

    field public static final String UWB_RANGING = "android.permission.UWB_RANGING";

    field public static final String VIBRATE = "android.permission.VIBRATE";

    field public static final String WAKE_LOCK = "android.permission.WAKE_LOCK";

    field public static final String WRITE_APN_SETTINGS = "android.permission.WRITE_APN_SETTINGS";
@@ -18660,6 +18661,7 @@ package android.hardware.camera2.params { 
    method @NonNull public java.util.List<android.util.Size> getAvailableSizes();

    method public int getFormat();

    method public boolean isInput();

    method public boolean isMaximumSize();

    method public boolean isUltraHighResolution();

  }