From b3405649fa35cb3b23569c895a14d0684e25733d Mon Sep 17 00:00:00 2001
From: Daniel Nishi <dhnishi@google.com>
Date: Mon, 26 Sep 2016 11:37:52 -0700
Subject: [PATCH] Fix a deprecated config string name for the storage manager
 settings.

The old string was used for configuration purposes, but the change was
removed. A previous patch accidentally used the old string for
choosing if the activity was exported or not.

Bug: 31621740

Change-Id: I9471e3a4c6d64d3fb8be7cbfcf058d35364892a5
---
 AndroidManifest.xml  | 2 +-
 res/values/bools.xml | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f18962722cb..e09a9d44617 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3004,7 +3004,7 @@
         </activity>
 
         <activity android:name="Settings$AutomaticStorageManagerSettingsActivity"
-                  android:exported="@bool/config_has_storage_manager"
+                  android:exported="@bool/config_storage_manager_settings_enabled"
                   android:label="@string/automatic_storage_manager_settings"
                   android:taskAffinity="">
             <intent-filter android:priority="1">
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 71923ea5f39..13609dc89f9 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -43,9 +43,6 @@
     <!-- Whether none security option is hide or not  (country specific). -->
     <bool name="config_hide_none_security_option">false</bool>
 
-    <!--Whether the storage manager exists. -->
-    <bool name="config_has_storage_manager">false</bool>
-
     <!--Whether help links are defined. -->
     <bool name="config_has_help">false</bool>
 </resources>