From 31952450ba6804f3917eb4cc6eee28b2a3ebf641 Mon Sep 17 00:00:00 2001
From: Daniel Bright <dbright@google.com>
Date: Tue, 25 Feb 2020 13:19:15 -0800
Subject: [PATCH] Hide setPolicyDataEnabled

This method was made into a SystemApi for R since
Telephony was going mainline.  The Telephony team
has a more robust solution as other similar APIs were
needed.  Since we are not going mainline, it makes
the most sense to wait for full solution.

Bug: 148165897
Bug: 146654731
Test: make \ flash
Change-Id: I5b38694acf3887e4f3ea2ab725b57fe4be9d5626
---
 api/system-current.txt                                 | 1 -
 telephony/java/android/telephony/TelephonyManager.java | 1 -
 2 files changed, 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 3b95f32263411..4b7aa93db514e 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11810,7 +11810,6 @@ package android.telephony {
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(@NonNull String, int, boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);
-    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setPolicyDataEnabled(boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setRadioEnabled(boolean);
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index a36df49064d2f..e1b6bf9dc5c69 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -11071,7 +11071,6 @@ public class TelephonyManager {
      * @param enabled True if enabling the data, otherwise disabling.
      * @hide
      */
-    @SystemApi
     @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)
     public void setPolicyDataEnabled(boolean enabled) {
         try {