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

Merge "Don't crash if the backup transport supplies bogus intents" into nyc-dev

Browse Source
This commit is contained in:
Chris Tate
2016-03-16 21:14:39 +00:00
committed by Android (Google) Code Review
parent 24ec9e872c 4a6c259179
commit 8b90b39c5e
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/PrivacySettings.java
View File

@@ -21,6 +21,8 @@ import android.app.backup.IBackupManager;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
@@ -155,9 +157,11 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
try { try {
backupEnabled = mBackupManager.isBackupEnabled(); backupEnabled = mBackupManager.isBackupEnabled();
String transport = mBackupManager.getCurrentTransport(); String transport = mBackupManager.getCurrentTransport();
configIntent = mBackupManager.getConfigurationIntent(transport); configIntent = validatedActivityIntent(
mBackupManager.getConfigurationIntent(transport), "config");
configSummary = mBackupManager.getDestinationString(transport); configSummary = mBackupManager.getDestinationString(transport);
manageIntent = mBackupManager.getDataManagementIntent(transport); manageIntent = validatedActivityIntent(
mBackupManager.getDataManagementIntent(transport), "management");
manageLabel = mBackupManager.getDataManagementLabel(transport); manageLabel = mBackupManager.getDataManagementLabel(transport);
mBackup.setSummary(backupEnabled mBackup.setSummary(backupEnabled
@@ -189,6 +193,19 @@ public class PrivacySettings extends SettingsPreferenceFragment implements Index
} }
} }
private Intent validatedActivityIntent(Intent intent, String logLabel) {
if (intent != null) {
PackageManager pm = getPackageManager();
List<ResolveInfo> resolved = pm.queryIntentActivities(intent, 0);
if (resolved == null || resolved.isEmpty()) {
intent = null;
Log.e(TAG, "Backup " + logLabel + " intent " + intent
+ " fails to resolve; ignoring");
}
}
return intent;
}
private void setConfigureSummary(String summary) { private void setConfigureSummary(String summary) {
if (summary != null) { if (summary != null) {
mConfigure.setSummary(summary); mConfigure.setSummary(summary);