From d7eb86f1f6c5ac9e44ca9ecba60b64383124b6d1 Mon Sep 17 00:00:00 2001
From: Hall Liu <hallliu@google.com>
Date: Thu, 12 Mar 2020 14:17:32 -0700
Subject: [PATCH] Hide setDisabledForSimNetworkLock

Hide StatusBarManager#setDisabledForSimNetworkLock since it isn't
necessary for mainline this cycle. Revisit in S if necessary.

Fixes: 151184693
Test: compile
Change-Id: Ieb24ebe02433b41699b3ca633e9a1db49711f816
---
 api/system-current.txt                      | 1 -
 core/java/android/app/StatusBarManager.java | 1 -
 2 files changed, 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 9a1aacd04393f..9787243243b47 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -751,7 +751,6 @@ package android.app {
   public class StatusBarManager {
     method @NonNull @RequiresPermission(android.Manifest.permission.STATUS_BAR) public android.app.StatusBarManager.DisableInfo getDisableInfo();
     method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean);
-    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSimNetworkLock(boolean);
   }
 
   public static final class StatusBarManager.DisableInfo {
diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java
index 42563b5a1561e..1329fa45bb507 100644
--- a/core/java/android/app/StatusBarManager.java
+++ b/core/java/android/app/StatusBarManager.java
@@ -399,7 +399,6 @@ public class StatusBarManager {
      *                 {@code false}, re-enables expansion of the status bar.
      * @hide
      */
-    @SystemApi
     @TestApi
     @RequiresPermission(android.Manifest.permission.STATUS_BAR)
     public void setDisabledForSimNetworkLock(boolean disabled) {