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

Settings Fragment Migration (Build pass app)

Browse Source 
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/CredentialStorage.java
View File

@@ -49,6 +49,7 @@ import com.android.settings.vpn2.VpnUtils;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import androidx.fragment.app.FragmentActivity;
import sun.security.util.ObjectIdentifier;
import sun.security.x509.AlgorithmId;
@@ -88,7 +89,7 @@ import sun.security.x509.AlgorithmId;
* Action: normal unlock/install
* Notes: this is the common case
*/
public final class CredentialStorage extends Activity {
public final class CredentialStorage extends FragmentActivity {
private static final String TAG = "CredentialStorage";
@@ -160,7 +161,7 @@ public final class CredentialStorage extends Activity {
case UNLOCKED: {
if (isActivePasswordQualityInsufficient()) {
final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);
return;
}
installIfAvailable();
@@ -180,7 +181,7 @@ public final class CredentialStorage extends Activity {
if (isActivePasswordQualityInsufficient()) {
// key guard not setup, doing so will initialize keystore
final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);
// will return to onResume after Activity
return;
}