commit ff3db157c2efa9dfe8f4b1ad22ee43b6371c71e6
author Fan Zhang <zhfan@google.com> Thu Jan 26 01:05:31 2017 +0000
committer Fan Zhang <zhfan@google.com> Thu Jan 26 01:12:57 2017 +0000
tree f00840cf4496e0706cec87e6c514299da7a82356
parent 970a66c97298ec1ec7abd874eaa82787b65a8fa6

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

Bug: 34700410

This reverts commit 970a66c97298ec1ec7abd874eaa82787b65a8fa6.

Change-Id: I254d704eb4f456c07c6d6d270de830aef95d1f4a

src/com/android/settings/SettingsActivity.java

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 7fe1167..13bc048 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -33,8 +33,6 @@
 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 @@
             }
         }
 
-        // 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()),