Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10dd4659 authored by Fan Zhang's avatar Fan Zhang
Browse files

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
parent 08aee175
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -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>
+9 −4
Original line number Diff line number Diff line
@@ -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,14 +1218,21 @@ 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,