commit 7db051335553b9c29be304f228818d43de050e6f
author Anton Philippov <philippov@google.com> Fri Feb 03 16:01:52 2017 +0000
committer gitbuildkicker <android-build@google.com> Fri Feb 03 14:29:45 2017 -0800
tree 91da8768c032ed60ee58a37f78f8a9f80eedcf5f
parent f4ad2a070600cd76e511a021110d18ebfba9b078

Enable the backup settings activity before launching

Bug: 34925593
Test: Manual
Change-Id: Ib27efa2138f56af37fe83376496a0d4c7a494e5b
(cherry picked from commit 18dd11f54c5e2f0667d6ce06d721ceaa54a05a06)

src/com/android/settings/backup/BackupSettingsActivity.java

diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index b195384..b376f6b 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -17,6 +17,8 @@
 package com.android.settings.backup;
 
 import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -41,8 +43,13 @@
                 Log.d(TAG,
                         "No manufacturer settings found, launching the backup settings directly");
             }
+            Intent intent = backupHelper.getIntentForBackupSettings();
+            // enable the activity before launching it
+            getPackageManager().setComponentEnabledSetting(intent.getComponent(),
+                    PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
+
             // use startActivityForResult to let the activity check the caller signature
-            startActivityForResult(backupHelper.getIntentForBackupSettings(), 1);
+            startActivityForResult(intent, 1);
             finish();
         } else {
             if (Log.isLoggable(TAG, Log.DEBUG)) {