From 82f37f83a8814e3b12f90baf0fb05d51df261ea7 Mon Sep 17 00:00:00 2001
From: Roshan Pius <rpius@google.com>
Date: Tue, 11 Jun 2019 07:27:16 -0700
Subject: [PATCH] privapps-permission: Make REQUEST_NETWORK_SCORES a privilged
 permission

The wifi stack (signed by Google on non-Pixel devices) need to obtain this permission,
so it can no longer be signature only.

Bug: 113174748
Test: Compiles
Change-Id: Id9557a6d164a40698ee7d1e5926e56fd616868d0
---
 core/res/AndroidManifest.xml      | 2 +-
 data/etc/com.android.settings.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 6accab104f37e..0a26e64076527 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1532,7 +1532,7 @@
          recommendations and scores from the NetworkScoreService.
          <p>Not for use by third-party applications. @hide -->
     <permission android:name="android.permission.REQUEST_NETWORK_SCORES"
-        android:protectionLevel="signature|setup" />
+        android:protectionLevel="signature|setup|privileged" />
 
     <!-- Allows network stack services (Connectivity and Wifi) to coordinate
          <p>Not for use by third-party or privileged applications.
diff --git a/data/etc/com.android.settings.xml b/data/etc/com.android.settings.xml
index 3e53a38385433..72be9f5e7eb54 100644
--- a/data/etc/com.android.settings.xml
+++ b/data/etc/com.android.settings.xml
@@ -41,6 +41,7 @@
         <permission name="android.permission.PACKAGE_USAGE_STATS"/>
         <permission name="android.permission.READ_SEARCH_INDEXABLES"/>
         <permission name="android.permission.REBOOT"/>
+        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>
         <permission name="android.permission.SET_TIME"/>
         <permission name="android.permission.STATUS_BAR"/>
         <permission name="android.permission.TETHER_PRIVILEGED"/>