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

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

Snap for 7329867 from bdd1f279 to sc-release 

Change-Id: I54b3b28a62c6adcf2684d9b7c16d556946d2a916
parents 4e793319 bdd1f279

core/java/android/app/backup/FullBackup.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.StringDef; 
import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;

import android.compat.annotation.Overridable;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.pm.ApplicationInfo;
@@ -107,6 +108,7 @@ public class FullBackup { 
     * {@code android:fullBackupContent} are ignored during D2D transfers.

     */

    @ChangeId

    @Overridable

    @EnabledSince(targetSdkVersion = Build.VERSION_CODES.S)

    private static final long IGNORE_FULL_BACKUP_CONTENT_IN_D2D = 180523564L;

core/java/android/graphics/fonts/FontManager.java

+17 −0
Original line number Diff line number Diff line
@@ -180,6 +180,23 @@ public class FontManager { 
     */

    public static final int RESULT_ERROR_SIGNATURE_TOO_LARGE = -10005;



    /**

     * Indicates a failure of opening XML file.

     *

     * This error code is only used with the shell command interaction.

     *

     * @hide

     */

    public static final int RESULT_ERROR_FAILED_TO_OPEN_XML_FILE = -10006;



    /**

     * Indicates a failure due to invalid XML file.

     *

     * This error code is only used with the shell command interaction.

     *

     * @hide

     */

    public static final int RESULT_ERROR_INVALID_XML = -10007;



    private FontManager(@NonNull IFontManager iFontManager) {

        mIFontManager = iFontManager;

core/java/android/view/inputmethod/InputMethodManager.java

+1 −4
Original line number Diff line number Diff line
@@ -3106,10 +3106,7 @@ public final class InputMethodManager { 
                matrixValues = new float[9];

                matrix.getValues(matrixValues);

            }

            final Completable.Void value = Completable.createVoid();

            mService.reportActivityView(

                    mClient, childDisplayId, matrixValues, ResultCallbacks.of(value));

            Completable.getResult(value);

            mService.reportActivityViewAsync(mClient, childDisplayId, matrixValues);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

core/java/com/android/internal/view/IInputMethodManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ interface IInputMethodManager { 
    // TODO(Bug 113914148): Consider removing this.

    oneway void getInputMethodWindowVisibleHeight(IIntResultCallback resultCallback);



    oneway void reportActivityView(in IInputMethodClient parentClient, int childDisplayId,

            in float[] matrixValues, in IVoidResultCallback resultCallback);

    oneway void reportActivityViewAsync(in IInputMethodClient parentClient, int childDisplayId,

            in float[] matrixValues);



    oneway void reportPerceptibleAsync(in IBinder windowToken, boolean perceptible);

    /** Remove the IME surface. Requires INTERNAL_SYSTEM_WINDOW permission. */

data/etc/car/com.android.carsystemui.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ 
        <permission name="android.car.permission.CAR_ENROLL_TRUST"/>

        <permission name="android.car.permission.CAR_POWER"/>

        <permission name="android.car.permission.CONTROL_CAR_CLIMATE"/>

        <permission name="android.car.permission.CONTROL_CAR_EVS_ACTIVITY"/>

        <permission name="android.car.permission.MONITOR_CAR_EVS_STATUS"/>

    </privapp-permissions>

</permissions>