From 39624ff39b4690dec44c9cc2e018ff53b74aa9fc Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Thu, 9 Jan 2020 06:30:56 -0800
Subject: [PATCH] Promote RADIO_SCAN_WITHOUT_LOCATION permission to @SystemApi

This is used by the wifi mainline module & hence needs to be a formal
API constant.

Bug: 147396785
Test: Compiles
Change-Id: I018bf6be1d1c33031d1cb24aa5ff36ee473c4602
---
 api/system-current.txt       | 1 +
 core/res/AndroidManifest.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 384dc13ff567c..f41384c512a68 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -152,6 +152,7 @@ package android {
     field public static final String PROVIDE_RESOLVER_RANKER_SERVICE = "android.permission.PROVIDE_RESOLVER_RANKER_SERVICE";
     field public static final String PROVIDE_TRUST_AGENT = "android.permission.PROVIDE_TRUST_AGENT";
     field public static final String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";
+    field public static final String RADIO_SCAN_WITHOUT_LOCATION = "android.permission.RADIO_SCAN_WITHOUT_LOCATION";
     field public static final String READ_ACTIVE_EMERGENCY_SESSION = "android.permission.READ_ACTIVE_EMERGENCY_SESSION";
     field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
     field public static final String READ_CONTENT_RATING_SYSTEMS = "android.permission.READ_CONTENT_RATING_SYSTEMS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index a808ed8fcc811..eba30bad68119 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1655,6 +1655,7 @@
     <!-- Allows holder to request bluetooth/wifi scan bypassing global "use location" setting and
          location permissions.
          <p>Not for use by third-party or privileged applications.
+         @SystemApi
          @hide
     -->
     <permission android:name="android.permission.RADIO_SCAN_WITHOUT_LOCATION"