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

Show second warning screen before converting to FBE

Browse Source 
Bug: 27126952
Change-Id: If045a0676600f4f9611ab27cfb686b8078b3cd5a
This commit is contained in:
Paul Lawrence
2016-02-23 07:35:27 -08:00
parent 8d41c2049a
commit 31467520ed
4 changed files with 104 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/applications/ConvertToFbe.java
View File

@@ -17,8 +17,8 @@ package com.android.settings.applications;
import android.app.Activity;
import android.app.Fragment;
import android.content.Intent;
import android.content.res.Resources;
import android.content.Intent;
import android.os.Bundle;
import android.os.RecoverySystem;
import android.util.Log;
@@ -27,6 +27,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.android.settings.applications.ConfirmConvertToFbe;
import com.android.settings.ChooseLockSettingsHelper;
import com.android.settings.SettingsActivity;
import com.android.settings.R;
@@ -80,9 +81,8 @@ public class ConvertToFbe extends Fragment {
}
private void convert() {
Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
intent.putExtra(Intent.EXTRA_REASON, "convert_fbe");
getActivity().sendBroadcast(intent);
SettingsActivity sa = (SettingsActivity) getActivity();
sa.startPreferencePanel(ConfirmConvertToFbe.class.getName(), null,
R.string.convert_to_file_encryption, null, null, 0);
}
}