commit 10dd465969836a314dc680f0d77e1239656725a3
author Fan Zhang <zhfan@google.com> Wed Nov 16 10:24:26 2016 -0800
committer Fan Zhang <zhfan@google.com> Wed Nov 16 14:59:59 2016 -0800
tree 3e025a45f5c821a6f450785d4fd437bb2aa6b1a4
parent 08aee17586f31a3ab25c225177caccffad37ec07

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

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index f67f73f..fc8fbe5 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -94,13 +94,11 @@
 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 @@
                 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;