From 18dd11f54c5e2f0667d6ce06d721ceaa54a05a06 Mon Sep 17 00:00:00 2001
From: Anton Philippov <philippov@google.com>
Date: Fri, 3 Feb 2017 16:01:52 +0000
Subject: [PATCH] Enable the backup settings activity before launching

Bug: 34925593
Test: Manual
Change-Id: Ib27efa2138f56af37fe83376496a0d4c7a494e5b
---
 .../android/settings/backup/BackupSettingsActivity.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index b19538425ef..b376f6b0d99 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 @@ public class BackupSettingsActivity extends Activity {
                 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)) {