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

Commit 822a4048 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13340456 from 133cf140 to 25Q3-release 

Change-Id: I0c26e319862e39b4c0ac60ef2d15b5528d373244
parents abc66359 133cf140

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11949,7 +11949,7 @@ package android.os.storage { 
    method @WorkerThread public void allocateBytes(java.io.FileDescriptor, long, @RequiresPermission int) throws java.io.IOException;

    method @WorkerThread public long getAllocatableBytes(@NonNull java.util.UUID, @RequiresPermission int) throws java.io.IOException;

    method @RequiresPermission(android.Manifest.permission.WRITE_MEDIA_STORAGE) public int getExternalStorageMountMode(int, @NonNull String);

    method @FlaggedApi("android.os.storage_lifetime_api") @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getInternalStorageRemainingLifetime();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getInternalStorageRemainingLifetime();

    method public static boolean hasIsolatedStorage();

    method public void updateExternalStorageFileQuotaType(@NonNull java.io.File, int) throws java.io.IOException;

    field @RequiresPermission(android.Manifest.permission.ALLOCATE_AGGRESSIVE) public static final int FLAG_ALLOCATE_AGGRESSIVE = 1; // 0x1

core/java/android/app/ActivityThread.java

+11 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.app.IVoiceInteractor;

import com.android.internal.content.ReferrerIntent;

import com.android.internal.os.ApplicationSharedMemory;

import com.android.internal.os.BackgroundThread;

import com.android.internal.os.BinderCallsStats;

import com.android.internal.os.BinderInternal;

import com.android.internal.os.DebugStore;
@@ -7794,6 +7795,16 @@ public final class ActivityThread extends ClientTransactionHandler 


            // Propagate Content Capture options

            app.setContentCaptureOptions(data.contentCaptureOptions);

            if (android.view.contentcapture.flags.Flags.warmUpBackgroundThreadForContentCapture()

                    && data.contentCaptureOptions != null) {

                if (data.contentCaptureOptions.enableReceiver

                        && !data.contentCaptureOptions.lite) {

                    // Warm up the background thread when:

                    // 1) app is launched with content capture enabled, and

                    // 2) the app is NOT launched with content capture lite enabled.

                    BackgroundThread.startIfNeeded();

                }

            }

            sendMessage(H.SET_CONTENT_CAPTURE_OPTIONS_CALLBACK, data.appInfo.packageName);



            mInitialApplication = app;

core/java/android/app/PropertyInvalidatedCache.java

+1 −2
Original line number Diff line number Diff line
@@ -1197,8 +1197,7 @@ public class PropertyInvalidatedCache<Query, Result> { 


    @android.ravenwood.annotation.RavenwoodReplace

    private static boolean isSharedMemoryAvailable() {

        return com.android.internal.os.Flags.applicationSharedMemoryEnabled()

                && android.app.Flags.picUsesSharedMemory();

        return true;

    }



    private static boolean isSharedMemoryAvailable$ravenwood() {

core/java/android/app/contextualsearch/ContextualSearchManager.java

+2 −1
Original line number Diff line number Diff line
@@ -261,7 +261,8 @@ public final class ContextualSearchManager { 
     *         <li>Resolves the activity using the package name and intent filter. The package name

     *             is fetched from the config specified in ContextualSearchManagerService.

     *             The activity must have ACTION_LAUNCH_CONTEXTUAL_SEARCH specified in its manifest.

     *         <li>Puts the required extras in the launch intent.

     *         <li>Puts the required extras in the launch intent, which may include a

     *         {@link android.media.projection.MediaProjection} session.

     *         <li>Launches the activity.

     *     </ul>

     * </p>

core/java/android/app/contextualsearch/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -45,6 +45,16 @@ flag { 
    }

}



flag {

    name: "contextual_search_media_projection"

    namespace: "sysui_integrations"

    description: "Attach MediaProjection session to contextual search invocation intent."

    bug: "395054309"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "include_audio_playing_status"

    namespace: "sysui_integrations"