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

Revert "Get intent for backup settings from backup transport."

Browse Source 
Bug: 34700410

This reverts commit 970a66c972.

Change-Id: I254d704eb4f456c07c6d6d270de830aef95d1f4a
This commit is contained in:
Fan Zhang
2017-01-26 01:05:31 +00:00
parent 970a66c972
commit ff3db157c2
4 changed files with 46 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,8 +33,6 @@ import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Configuration;
import android.nfc.NfcAdapter;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Build.VERSION;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
@@ -971,27 +969,29 @@ public class SettingsActivity extends SettingsDrawerActivity
}
}
// Check if the backup transport has provided an intent to launch the backup settings.
BackupSettingsHelper backupHelper = new BackupSettingsHelper();
boolean useDefaultBackup = !backupHelper.isIntentProvidedByTransport(getPackageManager());
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "Enabling default backup settings page: " + useDefaultBackup);
}
String backupIntent = getResources().getString(R.string.config_backup_settings_intent);
boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
setTileEnabled(new ComponentName(packageName,
Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin);
setTileEnabled(new ComponentName(packageName,
"com.android.settings.PrivacyDashboardAlias"),
useDefaultBackup, isAdmin);
// Enable/disable BackupSettingsActivity and its alias.
if (Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
Log.v(LOG_TAG, "Enabling transport provided backup settings: " + !useDefaultBackup);
boolean hasBackupActivity = false;
if (!useDefaultBackup) {
try {
Intent intent = Intent.parseUri(backupIntent, 0);
hasBackupActivity = !getPackageManager().queryIntentActivities(intent, 0).isEmpty();
} catch (URISyntaxException e) {
Log.e(LOG_TAG, "Invalid backup intent URI!", e);
}
}
// Enable/disable BackupSettingsActivity and its alias.
setTileEnabled(new ComponentName(packageName,
BackupSettingsActivity.class.getName()), !useDefaultBackup, isAdmin);
BackupSettingsActivity.class.getName()), hasBackupActivity, isAdmin);
setTileEnabled(new ComponentName(packageName,
"com.android.settings.BackupResetDashboardAlias"), !useDefaultBackup, isAdmin);
"com.android.settings.BackupResetDashboardAlias"), hasBackupActivity, isAdmin);
setTileEnabled(new ComponentName(packageName,
Settings.EnterprisePrivacySettingsActivity.class.getName()),