From 8a91d3f0447b19d18b0952d9923fc4b768ff576f Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Thu, 11 Oct 2018 12:19:53 +0100 Subject: [PATCH 1/2] Add method to hidden api greylist Bug: 114488777 Test: m appcompat Change-Id: I836ecb947390f7fc6986f6848299375c7599fc97 --- config/hiddenapi-light-greylist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index fbf5b5288928b..cf7f0432fcb7c 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -2288,6 +2288,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;->getPublicKey()Ljava/security/PublicKey; Lcom/android/org/conscrypt/OpenSSLProvider;->()V +Lcom/android/org/conscrypt/OpenSSLRandom;->()V Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getAlpnSelectedProtocol()[B Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getChannelId()[B Lcom/android/org/conscrypt/OpenSSLSocketImpl;->getHostname()Ljava/lang/String; From a8d554380d670ffcc36808c89e37d99eda4254b5 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Thu, 11 Oct 2018 12:24:48 +0100 Subject: [PATCH 2/2] Add entries to hidden api greylist Bug: 115387204 Test: m appcompat Change-Id: Icd51c4c7d446ea72211804fbb050f4fee742db17 --- config/hiddenapi-light-greylist.txt | 1 + core/java/com/android/internal/widget/AlertDialogLayout.java | 2 ++ core/java/com/android/internal/widget/ButtonBarLayout.java | 2 ++ core/java/com/android/internal/widget/DialogTitle.java | 2 ++ 4 files changed, 7 insertions(+) diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index cf7f0432fcb7c..83de279bf8307 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -2861,6 +2861,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;->defaultSocketFactory:Ljavax/net/ssl/SSLSocketFactory; 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;->peekByteArray(J[BII)V Llibcore/io/Memory;->peekInt(JZ)I diff --git a/core/java/com/android/internal/widget/AlertDialogLayout.java b/core/java/com/android/internal/widget/AlertDialogLayout.java index 9bf094891f3bb..7a01749466719 100644 --- a/core/java/com/android/internal/widget/AlertDialogLayout.java +++ b/core/java/com/android/internal/widget/AlertDialogLayout.java @@ -18,6 +18,7 @@ package com.android.internal.widget; import android.annotation.AttrRes; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.annotation.StyleRes; import android.content.Context; import android.graphics.drawable.Drawable; @@ -50,6 +51,7 @@ public class AlertDialogLayout extends LinearLayout { super(context); } + @UnsupportedAppUsage public AlertDialogLayout(@Nullable Context context, @Nullable AttributeSet attrs) { super(context, attrs); } diff --git a/core/java/com/android/internal/widget/ButtonBarLayout.java b/core/java/com/android/internal/widget/ButtonBarLayout.java index ab8be33599fa0..0ca67438c5c3b 100644 --- a/core/java/com/android/internal/widget/ButtonBarLayout.java +++ b/core/java/com/android/internal/widget/ButtonBarLayout.java @@ -16,6 +16,7 @@ package com.android.internal.widget; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; @@ -40,6 +41,7 @@ public class ButtonBarLayout extends LinearLayout { private int mMinimumHeight = 0; + @UnsupportedAppUsage public ButtonBarLayout(Context context, AttributeSet attrs) { super(context, attrs); diff --git a/core/java/com/android/internal/widget/DialogTitle.java b/core/java/com/android/internal/widget/DialogTitle.java index 7ea3d6b5bff05..405436c53ff04 100644 --- a/core/java/com/android/internal/widget/DialogTitle.java +++ b/core/java/com/android/internal/widget/DialogTitle.java @@ -16,6 +16,7 @@ package com.android.internal.widget; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.TypedArray; import android.text.Layout; @@ -37,6 +38,7 @@ public class DialogTitle extends TextView { super(context, attrs, defStyleAttr); } + @UnsupportedAppUsage public DialogTitle(Context context, AttributeSet attrs) { super(context, attrs); }