Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Icd51c4c7,I836ecb94

Browse Source 
am: 3590eb09ef

Change-Id: I70530ca7b04026b4ec436cf235a2b35c63689189
This commit is contained in:
David Brazdil
2018-10-11 09:14:20 -07:00
committed by android-build-merger
parent 2d7b242700 3590eb09ef
commit b03f3c8ba2
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/hiddenapi-light-greylist.txt
View File

@@ -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

2
core/java/com/android/internal/widget/AlertDialogLayout.java
View File

@@ -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);
} }

2
core/java/com/android/internal/widget/ButtonBarLayout.java
View File

@@ -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);

2
core/java/com/android/internal/widget/DialogTitle.java
View File

@@ -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);
} }