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

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

Snap for 11717025 from 4b4854d2 to 24Q3-release 

Change-Id: Id8006dc49d14a38f5c888a96ded5fd7bf5f644fc
parents ebd172dd 4b4854d2

core/java/android/webkit/WebViewFactory.java

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.text.TextUtils; 
import android.util.AndroidRuntimeException;

import android.util.ArraySet;

import android.util.Log;

import android.util.Slog;



import java.io.File;

import java.lang.reflect.Method;
@@ -609,7 +610,7 @@ public final class WebViewFactory { 
            startedRelroProcesses = WebViewLibraryLoader.prepareNativeLibraries(packageInfo);

        } catch (Throwable t) {

            // Log and discard errors at this stage as we must not crash the system server.

            Log.e(LOGTAG, "error preparing webview native library", t);

            Slog.wtf(LOGTAG, "error preparing webview native library", t);

        }



        WebViewZygote.onWebViewProviderChanged(packageInfo);

core/java/android/webkit/WebViewLibraryLoader.java

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.pm.PackageInfo; 
import android.os.Build;

import android.os.Process;

import android.util.Log;

import android.util.Slog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.server.LocalServices;
@@ -137,7 +138,7 @@ public class WebViewLibraryLoader { 
            if (!success) throw new Exception("Failed to start the relro file creator process");

        } catch (Throwable t) {

            // Log and discard errors as we must not crash the system server.

            Log.e(LOGTAG, "error starting relro file creator for abi " + abi, t);

            Slog.wtf(LOGTAG, "error starting relro file creator for abi " + abi, t);

            crashHandler.run();

        }

    }

core/java/android/window/IRemoteTransition.aidl

+14 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.window; 
import android.view.SurfaceControl;

import android.window.IRemoteTransitionFinishedCallback;

import android.window.TransitionInfo;

import android.window.WindowAnimationState;



/**

 * Interface allowing remote processes to play transition animations.
@@ -60,6 +61,19 @@ oneway interface IRemoteTransition { 
            in SurfaceControl.Transaction t, in IBinder mergeTarget,

            in IRemoteTransitionFinishedCallback finishCallback);



    /**

     * Takes over the animation of the windows from an existing transition. Once complete, the

     * implementation should call `finishCallback`.

     *

     * @param transition An identifier for the transition to be taken over.

     * @param states The animation states of the windows involved in the transition. These must be

     *               sorted in the same way as the Changes inside `info`, and each state may be

     *               null.

     */

    void takeOverAnimation(in IBinder transition, in TransitionInfo info,

            in SurfaceControl.Transaction t, in IRemoteTransitionFinishedCallback finishCallback,

            in WindowAnimationState[] states);



    /**

     * Called when a different handler has consumed the transition

     *

core/java/android/window/RemoteTransitionStub.java

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ public abstract class RemoteTransitionStub extends IRemoteTransition.Stub { 
            SurfaceControl.Transaction t, IBinder mergeTarget,

            IRemoteTransitionFinishedCallback finishCallback) throws RemoteException {}





    @Override

    public void takeOverAnimation(IBinder transition, TransitionInfo info,

            SurfaceControl.Transaction startTransaction,

            IRemoteTransitionFinishedCallback finishCallback,

            WindowAnimationState[] states) throws RemoteException {

        throw new RemoteException("Takeovers are not supported by this IRemoteTransition");

    }





    @Override

    public void onTransitionConsumed(IBinder transition, boolean aborted)

            throws RemoteException {}

packages/SystemUI/tests/utils/src/com/android/systemui/scene/shared/flag/FakeSceneContainerFlags.kt→core/java/android/window/WindowAnimationState.aidl

+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -14,31 +14,23 @@ 
 * limitations under the License.

 */



package com.android.systemui.scene.shared.flag

package android.window;



import dagger.Binds

import dagger.Module

import dagger.Provides

import android.graphics.PointF;

import android.graphics.RectF;



class FakeSceneContainerFlags(

    var enabled: Boolean = SceneContainerFlag.isEnabled,

) : SceneContainerFlags {



    override fun isEnabled(): Boolean {

        return enabled

    }



    override fun requirementDescription(): String {

        return ""

    }

}



@Module(includes = [FakeSceneContainerFlagsModule.Bindings::class])

class FakeSceneContainerFlagsModule(

    @get:Provides val sceneContainerFlags: FakeSceneContainerFlags = FakeSceneContainerFlags(),

) {

    @Module

    interface Bindings {

        @Binds fun bindFake(fake: FakeSceneContainerFlags): SceneContainerFlags

    }

/**

 * Properties of a window animation at a given point in time.

 *

 * {@hide}

 */

parcelable WindowAnimationState {

    long timestamp;

    RectF bounds;

    float scale;

    float topLeftRadius;

    float topRightRadius;

    float bottomRightRadius;

    float bottomLeftRadius;

    PointF velocityPxPerMs;

}