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

Commit b03f3c8b authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge changes Icd51c4c7,I836ecb94 

am: 3590eb09

Change-Id: I70530ca7b04026b4ec436cf235a2b35c63689189
parents 2d7b2427 3590eb09

config/hiddenapi-light-greylist.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -2287,6 +2287,7 @@ Lcom/android/org/conscrypt/OpenSSLKey;->fromPrivateKey(Ljava/security/PrivateKey 
Lcom/android/org/conscrypt/OpenSSLKey;->getNativeRef()Lcom/android/org/conscrypt/NativeRef$EVP_PKEY;

Lcom/android/org/conscrypt/OpenSSLKey;->getNativeRef()Lcom/android/org/conscrypt/NativeRef$EVP_PKEY;

Lcom/android/org/conscrypt/OpenSSLKey;->getPublicKey()Ljava/security/PublicKey;

Lcom/android/org/conscrypt/OpenSSLKey;->getPublicKey()Ljava/security/PublicKey;

Lcom/android/org/conscrypt/OpenSSLProvider;-><init>()V

Lcom/android/org/conscrypt/OpenSSLProvider;-><init>()V

Lcom/android/org/conscrypt/OpenSSLRandom;-><init>()V

Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B

Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B

Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B

Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B

Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostname()Ljava/lang/String;

Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostname()Ljava/lang/String;
@@ -2859,6 +2860,7 @@ Ljavax/net/ssl/SSLServerSocketFactory;->defaultServerSocketFactory:Ljavax/net/ss 
Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;

Ljavax/net/ssl/SSLSocketFactory;->createSocket(Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;

Ljavax/net/ssl/SSLSocketFactory;->defaultSocketFactory:Ljavax/net/ssl/SSLSocketFactory;

Ljavax/net/ssl/SSLSocketFactory;->defaultSocketFactory:Ljavax/net/ssl/SSLSocketFactory;

Llibcore/icu/ICU;->addLikelySubtags(Ljava/util/Locale;)Ljava/util/Locale;

Llibcore/icu/ICU;->addLikelySubtags(Ljava/util/Locale;)Ljava/util/Locale;

Llibcore/io/Libcore;->os:Llibcore/io/Os;

Llibcore/io/Memory;->peekByte(J)B

Llibcore/io/Memory;->peekByte(J)B

Llibcore/io/Memory;->peekByteArray(J[BII)V

Llibcore/io/Memory;->peekByteArray(J[BII)V

Llibcore/io/Memory;->peekInt(JZ)I

Llibcore/io/Memory;->peekInt(JZ)I

core/java/com/android/internal/widget/AlertDialogLayout.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.internal.widget; 




import android.annotation.AttrRes;

import android.annotation.AttrRes;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.annotation.StyleRes;

import android.annotation.StyleRes;

import android.content.Context;

import android.content.Context;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;
@@ -50,6 +51,7 @@ public class AlertDialogLayout extends LinearLayout { 
        super(context);

        super(context);

    }

    }





    @UnsupportedAppUsage

    public AlertDialogLayout(@Nullable Context context, @Nullable AttributeSet attrs) {

    public AlertDialogLayout(@Nullable Context context, @Nullable AttributeSet attrs) {

        super(context, attrs);

        super(context, attrs);

    }

    }

core/java/com/android/internal/widget/ButtonBarLayout.java

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




package com.android.internal.widget;

package com.android.internal.widget;





import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Context;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.util.AttributeSet;

import android.util.AttributeSet;
@@ -40,6 +41,7 @@ public class ButtonBarLayout extends LinearLayout { 




    private int mMinimumHeight = 0;

    private int mMinimumHeight = 0;





    @UnsupportedAppUsage

    public ButtonBarLayout(Context context, AttributeSet attrs) {

    public ButtonBarLayout(Context context, AttributeSet attrs) {

        super(context, attrs);

        super(context, attrs);

core/java/com/android/internal/widget/DialogTitle.java

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




package com.android.internal.widget;

package com.android.internal.widget;





import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.Context;

import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.text.Layout;

import android.text.Layout;
@@ -37,6 +38,7 @@ public class DialogTitle extends TextView { 
        super(context, attrs, defStyleAttr);

        super(context, attrs, defStyleAttr);

    }

    }





    @UnsupportedAppUsage

    public DialogTitle(Context context, AttributeSet attrs) {

    public DialogTitle(Context context, AttributeSet attrs) {

        super(context, attrs);

        super(context, attrs);

    }

    }