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

Commit ec73e751 authored by Mathew Inwood's avatar Mathew Inwood
Browse files

resolve merge conflicts of 597229d6 to stage-aosp-master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0807ae67e0ed3e84f17af962dc8b7a3152f8103f
Merged-In: I4147b038ed7adf0311ee9918b44766f82a057eaf
parents 1c287376 597229d6

config/hiddenapi-light-greylist.txt

+0 −700

File changed.

Preview size limit exceeded, changes collapsed.

config/hiddenapi-vendor-list.txt

+0 −33
Original line number Diff line number Diff line
@@ -233,12 +233,7 @@ Landroid/telephony/TelephonyManager;->isImsRegistered()Z 
Landroid/telephony/TelephonyManager;->nvResetConfig(I)Z

Landroid/telephony/TelephonyManager;->putIntAtIndex(Landroid/content/ContentResolver;Ljava/lang/String;II)Z

Landroid/telephony/TelephonyManager;->setPreferredNetworkType(II)Z

Landroid/view/AppTransitionAnimationSpec;-><init>(ILandroid/graphics/GraphicBuffer;Landroid/graphics/Rect;)V

Landroid/view/BatchedInputEventReceiver;-><init>(Landroid/view/InputChannel;Landroid/os/Looper;Landroid/view/Choreographer;)V

Landroid/view/Choreographer;->getSfInstance()Landroid/view/Choreographer;

Landroid/view/DisplayListCanvas;->drawRenderNode(Landroid/view/RenderNode;)V

Landroid/view/IAppTransitionAnimationSpecsFuture$Stub;-><init>()V

Landroid/view/InputEventReceiver;->onInputEvent(Landroid/view/InputEvent;I)V

Landroid/view/IRecentsAnimationController;->finish(Z)V

Landroid/view/IRecentsAnimationController;->screenshotTask(I)Landroid/app/ActivityManager$TaskSnapshot;

Landroid/view/IRecentsAnimationController;->setInputConsumerEnabled(Z)V
@@ -256,34 +251,6 @@ Landroid/view/IWindowManager;->getStableInsets(ILandroid/graphics/Rect;)V 
Landroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;Z)V

Landroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;)V

Landroid/view/IWindowManager;->setNavBarVirtualKeyHapticFeedbackEnabled(Z)V

Landroid/view/RemoteAnimationAdapter;-><init>(Landroid/view/IRemoteAnimationRunner;JJ)V

Landroid/view/RemoteAnimationDefinition;-><init>()V

Landroid/view/RemoteAnimationDefinition;->addRemoteAnimation(ILandroid/view/RemoteAnimationAdapter;)V

Landroid/view/RenderNode;->create(Ljava/lang/String;Landroid/view/View;)Landroid/view/RenderNode;

Landroid/view/RenderNode;->end(Landroid/view/DisplayListCanvas;)V

Landroid/view/RenderNode;->isValid()Z

Landroid/view/RenderNode;->setClipToBounds(Z)Z

Landroid/view/RenderNode;->setLeftTopRightBottom(IIII)Z

Landroid/view/RenderNode;->start(II)Landroid/view/DisplayListCanvas;

Landroid/view/Surface;->getNextFrameNumber()J

Landroid/view/SurfaceControl$Transaction;-><init>()V

Landroid/view/SurfaceControl$Transaction;->apply()V

Landroid/view/SurfaceControl$Transaction;->deferTransactionUntil(Landroid/view/SurfaceControl;Landroid/os/IBinder;J)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->deferTransactionUntilSurface(Landroid/view/SurfaceControl;Landroid/view/Surface;J)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->hide(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setAlpha(Landroid/view/SurfaceControl;F)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setColor(Landroid/view/SurfaceControl;[F)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setFinalCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setLayer(Landroid/view/SurfaceControl;I)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;FFFF)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setMatrix(Landroid/view/SurfaceControl;Landroid/graphics/Matrix;[F)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setPosition(Landroid/view/SurfaceControl;FF)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setSize(Landroid/view/SurfaceControl;II)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->setWindowCrop(Landroid/view/SurfaceControl;Landroid/graphics/Rect;)Landroid/view/SurfaceControl$Transaction;

Landroid/view/SurfaceControl$Transaction;->show(Landroid/view/SurfaceControl;)Landroid/view/SurfaceControl$Transaction;

Landroid/view/ThreadedRenderer;->createHardwareBitmap(Landroid/view/RenderNode;II)Landroid/graphics/Bitmap;

Landroid/view/View;->hideTooltip()V

Landroid/view/View;->setTooltip(Ljava/lang/CharSequence;)V

Landroid/widget/ListView;->lookForSelectablePosition(IZ)I

Lcom/android/ims/ImsConfigListener;->onSetFeatureResponse(IIII)V

Lcom/android/ims/internal/IImsCallSessionListener;->callSessionConferenceStateUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsConferenceState;)V

core/java/android/view/AccessibilityIterators.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.view;



import android.annotation.UnsupportedAppUsage;

import android.content.res.Configuration;



import java.text.BreakIterator;
@@ -45,6 +46,7 @@ public final class AccessibilityIterators { 
     */

    public static abstract class AbstractTextSegmentIterator implements TextSegmentIterator {



        @UnsupportedAppUsage

        protected String mText;



        private final int[] mSegment = new int[2];

core/java/android/view/ActionProvider.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.view;



import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.util.Log;
@@ -218,6 +219,7 @@ public abstract class ActionProvider { 
    /**

     * @hide Internal use only

     */

    @UnsupportedAppUsage

    public void setSubUiVisibilityListener(SubUiVisibilityListener listener) {

        mSubUiVisibilityListener = listener;

    }
@@ -240,6 +242,7 @@ public abstract class ActionProvider { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public void reset() {

        mVisibilityListener = null;

        mSubUiVisibilityListener = null;

core/java/android/view/AppTransitionAnimationSpec.java

+2 −0
Original line number Diff line number Diff line 
package android.view;



import android.annotation.UnsupportedAppUsage;

import android.graphics.GraphicBuffer;

import android.graphics.Rect;

import android.os.Parcel;
@@ -18,6 +19,7 @@ public class AppTransitionAnimationSpec implements Parcelable { 
    public final GraphicBuffer buffer;

    public final Rect rect;



    @UnsupportedAppUsage

    public AppTransitionAnimationSpec(int taskId, GraphicBuffer buffer, Rect rect) {

        this.taskId = taskId;

        this.rect = rect;