From e84d066d576912a63edaa5aac5ef4f967b4ec6fe Mon Sep 17 00:00:00 2001
From: Manish Singh <psych@google.com>
Date: Tue, 21 Feb 2023 11:44:34 +0000
Subject: [PATCH] Change resource name per GMS requirement

Bug: 243145978
Bug: 264793138
Test: m
Change-Id: I72b830bdc2514a648f40cead742a368dc59602f1
---
 core/res/AndroidManifest.xml   | 2 +-
 core/res/res/values/config.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e9771a9dcb7fb..fc604f19cb329 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -7564,7 +7564,7 @@
          HealthConnect can later integrate it. -->
     <permission android:name="android.permission.STAGE_HEALTH_CONNECT_REMOTE_DATA"
                 android:protectionLevel="signature|knownSigner"
-                android:knownCerts="@array/config_healthConnectStagingDataKnownSigners"/>
+                android:knownCerts="@array/config_healthConnectRestoreKnownSigners"/>
 
     <!-- @hide @TestApi Allows an application to clear HealthConnect's staged remote data for
          testing only. For security reasons, this is a platform-only permission. -->
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 31b9f9a848d91..1256183462bf8 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -6286,7 +6286,7 @@
     <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner
          permission for staging HealthConnect's remote data. The digest should be computed over the
          DER encoding of the trusted certificate using the SHA-256 digest algorithm. -->
-    <string-array name="config_healthConnectStagingDataKnownSigners">
+    <string-array name="config_healthConnectRestoreKnownSigners">
     </string-array>
     <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner Health
         Connect Migration permissions. The digest should be computed over the DER encoding of the