summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Brazdil <dbrazdil@google.com> 2018-04-04 17:23:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-04-04 17:23:30 +0000
commitb622906dc51a437c2891d004f77039c5ad157a77 (patch)
tree323dbc8571a1bfbf8c2f7bff4e2234165784ef2d
parentb4da14cde90711daeceb5f460b5bc4e5dda89cc5 (diff)
parentc1d8d0a2f75708183a2a95d9faa85407af1cbaa1 (diff)
Merge "Move hidden API from vendor to light grey" into pi-dev
-rw-r--r--config/hiddenapi-light-greylist.txt1
-rw-r--r--config/hiddenapi-vendor-list.txt1
2 files changed, 1 insertions, 1 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index 9c7bfb20ae0f..a8632640bd6c 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -2007,6 +2007,7 @@ Landroid/telephony/TelephonyManager;-><init>()V
Landroid/telephony/TelephonyManager;->isMultiSimEnabled()Z
Landroid/telephony/TelephonyManager;->isNetworkRoaming(I)Z
Landroid/telephony/TelephonyManager;->isVolteAvailable()Z
+Landroid/telephony/TelephonyManager;->isWifiCallingAvailable()Z
Landroid/telephony/TelephonyManager;->mSubscriptionManager:Landroid/telephony/SubscriptionManager;
Landroid/text/AndroidBidi;->bidi(I[C[B)I
Landroid/text/DynamicLayout;-><init>(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Landroid/text/TextPaint;ILandroid/text/Layout$Alignment;Landroid/text/TextDirectionHeuristic;FFZIIILandroid/text/TextUtils$TruncateAt;I)V
diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt
index 3a3a708a20cb..f3bc206090c9 100644
--- a/config/hiddenapi-vendor-list.txt
+++ b/config/hiddenapi-vendor-list.txt
@@ -514,7 +514,6 @@ Landroid/telephony/TelephonyManager;->getServiceStateForSubscriber(I)Landroid/te
Landroid/telephony/TelephonyManager;->getVoiceMessageCount()I
Landroid/telephony/TelephonyManager;->getVoiceNetworkType(I)I
Landroid/telephony/TelephonyManager;->isImsRegistered()Z
-Landroid/telephony/TelephonyManager;->isWifiCallingAvailable()Z
Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDA:Landroid/telephony/TelephonyManager$MultiSimVariants;
Landroid/telephony/TelephonyManager$MultiSimVariants;->DSDS:Landroid/telephony/TelephonyManager$MultiSimVariants;
Landroid/telephony/TelephonyManager;->nvResetConfig(I)Z