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

Merge "Enable the backup settings activity before launching"

Browse Source
This commit is contained in:
Anton Philippov
2017-02-03 21:01:23 +00:00
committed by Android (Google) Code Review
parent 85904ac4e8 18dd11f54c
commit 845d1503d0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/backup/BackupSettingsActivity.java
View File

@@ -17,6 +17,8 @@
package com.android.settings.backup; package com.android.settings.backup;
import android.app.Activity; import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
@@ -41,8 +43,13 @@ public class BackupSettingsActivity extends Activity {
Log.d(TAG, Log.d(TAG,
"No manufacturer settings found, launching the backup settings directly"); "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 // use startActivityForResult to let the activity check the caller signature
startActivityForResult(backupHelper.getIntentForBackupSettings(), 1); startActivityForResult(intent, 1);
finish(); finish();
} else { } else {
if (Log.isLoggable(TAG, Log.DEBUG)) { if (Log.isLoggable(TAG, Log.DEBUG)) {