From 10dd465969836a314dc680f0d77e1239656725a3 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 16 Nov 2016 10:24:26 -0800
Subject: [PATCH] Fix bug: BackupResetDashboardAlias is mapped incorrectly.

It should map to BackupSettingsActivity and should not contain fragments
in metadata.

Bug: 32874082
Test: RunSettingsLibRoboTests
Change-Id: I1c9aab7e34cfd07e9b582772cebb39cf8488b093
---
 AndroidManifest.xml                            |  4 +---
 src/com/android/settings/SettingsActivity.java | 13 +++++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4fb17f7172e..ded6d7c8b5f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3275,14 +3275,12 @@
         </activity-alias>
 
         <activity-alias android:name="BackupResetDashboardAlias"
-                        android:targetActivity="Settings$PrivacySettingsActivity">
+                        android:targetActivity=".BackupSettingsActivity">
             <intent-filter android:priority="60">
                 <action android:name="com.android.settings.action.SETTINGS" />
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.system" />
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.PrivacySettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                        android:value="true" />
         </activity-alias>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index f67f73f712f..fc8fbe5ce48 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -94,13 +94,11 @@ import com.android.settings.deviceinfo.Status;
 import com.android.settings.deviceinfo.StorageDashboardFragment;
 import com.android.settings.deviceinfo.StorageSettings;
 import com.android.settings.display.NightDisplaySettings;
-import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
 import com.android.settings.fuelgauge.BatterySaverSettings;
 import com.android.settings.fuelgauge.PowerUsageDetail;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.gestures.DoubleTapPowerSettings;
-import com.android.settings.gestures.DoubleTapScreenPreferenceController;
 import com.android.settings.gestures.DoubleTapScreenSettings;
 import com.android.settings.gestures.DoubleTwistGestureSettings;
 import com.android.settings.gestures.GestureSettings;
@@ -1220,18 +1218,25 @@ public class SettingsActivity extends SettingsDrawerActivity
                 Log.e(LOG_TAG, "Invalid backup intent URI!", e);
             }
         }
+
+        // Enable/disble BackupSettingsActivity and its alias.
         setTileEnabled(new ComponentName(packageName,
                 BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin, pm);
+        setTileEnabled(new ComponentName(packageName,
+                "com.android.settings.BackupResetDashboardAlias"), hasBackupActivity, isAdmin, pm);
 
         setTileEnabled(new ComponentName(packageName,
                 Settings.EnterprisePrivacySettingsActivity.class.getName()),
                 FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this)
                         .hasDeviceOwner(), isAdmin, pm);
-
+        setTileEnabled(new ComponentName(packageName,
+                        "com.android.settings.EnterprisePrivacyDashboardAlias"),
+                FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this)
+                        .hasDeviceOwner(), isAdmin, pm);
     }
 
     private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin,
-                                PackageManager pm) {
+            PackageManager pm) {
         if (UserHandle.MU_ENABLED && !isAdmin && getPackageName().equals(component.getPackageName())
                 && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, component.getClassName())) {
             enabled = false;