From f9a89c184457e27cef89a372f139171b60586f6a Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Mon, 11 Dec 2017 11:53:52 -0800
Subject: [PATCH] Add permission necessary to use RecoverableKeyStoreLoader
 API.

Test: none
Bug: 66499222
Change-Id: Iec1c8770705be56ea169f9a4ab58a8139b23dc6f
---
 api/system-current.txt       | 1 +
 core/res/AndroidManifest.xml | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 33fa246a9f51e..7bb028448379b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -136,6 +136,7 @@ package android {
     field public static final java.lang.String RECEIVE_EMERGENCY_BROADCAST = "android.permission.RECEIVE_EMERGENCY_BROADCAST";
     field public static final java.lang.String RECEIVE_WIFI_CREDENTIAL_CHANGE = "android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE";
     field public static final java.lang.String RECOVERY = "android.permission.RECOVERY";
+    field public static final java.lang.String RECOVER_KEYSTORE = "android.permission.RECOVER_KEYSTORE";
     field public static final java.lang.String REGISTER_CALL_PROVIDER = "android.permission.REGISTER_CALL_PROVIDER";
     field public static final java.lang.String REGISTER_CONNECTION_MANAGER = "android.permission.REGISTER_CONNECTION_MANAGER";
     field public static final java.lang.String REGISTER_SIM_SUBSCRIPTION = "android.permission.REGISTER_SIM_SUBSCRIPTION";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 09204261811d3..b797a84f0872c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3114,6 +3114,12 @@
     <permission android:name="android.permission.BACKUP"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @SystemApi Allows application to manage RecoverableKeyStoreLoader.
+    <p>Not for use by third-party applications.
+         @hide -->
+    <permission android:name="android.permission.RECOVER_KEYSTORE"
+        android:protectionLevel="signature|privileged" />
+
     <!-- Allows a package to launch the secure full-backup confirmation UI.
          ONLY the system process may hold this permission.
          @hide -->