PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug: BackupResetDashboardAlias is mapped incorrectly.

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

Bug: 32874082
Test: RunSettingsLibRoboTests
Change-Id: I1c9aab7e34cfd07e9b582772cebb39cf8488b093
This commit is contained in:
Fan Zhang
2016-11-16 10:24:26 -08:00
parent 08aee17586
commit 10dd465969
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -3275,14 +3275,12 @@
</activity-alias> </activity-alias>
<activity-alias android:name="BackupResetDashboardAlias" <activity-alias android:name="BackupResetDashboardAlias"
android:targetActivity="Settings$PrivacySettingsActivity"> android:targetActivity=".BackupSettingsActivity">
<intent-filter android:priority="60"> <intent-filter android:priority="60">
<action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.settings.action.SETTINGS" />
</intent-filter> </intent-filter>
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" /> 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" <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" /> android:value="true" />
</activity-alias> </activity-alias>

13
src/com/android/settings/SettingsActivity.java
View File

@@ -94,13 +94,11 @@ import com.android.settings.deviceinfo.Status;
import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.deviceinfo.StorageDashboardFragment;
import com.android.settings.deviceinfo.StorageSettings; import com.android.settings.deviceinfo.StorageSettings;
import com.android.settings.display.NightDisplaySettings; import com.android.settings.display.NightDisplaySettings;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacySettings; import com.android.settings.enterprise.EnterprisePrivacySettings;
import com.android.settings.fuelgauge.BatterySaverSettings; import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageDetail; import com.android.settings.fuelgauge.PowerUsageDetail;
import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapPowerSettings;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTapScreenSettings;
import com.android.settings.gestures.DoubleTwistGestureSettings; import com.android.settings.gestures.DoubleTwistGestureSettings;
import com.android.settings.gestures.GestureSettings; import com.android.settings.gestures.GestureSettings;
@@ -1220,18 +1218,25 @@ public class SettingsActivity extends SettingsDrawerActivity
Log.e(LOG_TAG, "Invalid backup intent URI!", e); Log.e(LOG_TAG, "Invalid backup intent URI!", e);
} }
} }
// Enable/disble BackupSettingsActivity and its alias.
setTileEnabled(new ComponentName(packageName, setTileEnabled(new ComponentName(packageName,
BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin, pm); BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin, pm);
setTileEnabled(new ComponentName(packageName,
"com.android.settings.BackupResetDashboardAlias"), hasBackupActivity, isAdmin, pm);
setTileEnabled(new ComponentName(packageName, setTileEnabled(new ComponentName(packageName,
Settings.EnterprisePrivacySettingsActivity.class.getName()), Settings.EnterprisePrivacySettingsActivity.class.getName()),
FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this) FeatureFactory.getFactory(this).getEnterprisePrivacyFeatureProvider(this)
.hasDeviceOwner(), isAdmin, pm); .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, private void setTileEnabled(ComponentName component, boolean enabled, boolean isAdmin,
PackageManager pm) { PackageManager pm) {
if (UserHandle.MU_ENABLED && !isAdmin && getPackageName().equals(component.getPackageName()) if (UserHandle.MU_ENABLED && !isAdmin && getPackageName().equals(component.getPackageName())
&& !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, component.getClassName())) { && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, component.getClassName())) {
enabled = false; enabled = false;