| commit | e51db78711b49e57bf3040f15cef9433e5c951e6 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 13 03:43:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 13 03:43:22 2021 +0000 |
| tree | 6097bea162db72f4ea86151f96ae712b0f13f463 | |
| parent | c950d8af6bbc375409d3817898d6831b5bff7d5e [diff] | |
| parent | 8c655662af2a944ab433dca375d1492d0d82b39a [diff] |
Merge "Fix nit from ag/13715126" into sc-dev am: 8c655662af Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13759888 Change-Id: I8a0c8a79045c6b9cea119705964862552245979c
diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java index 24fb576..a88be03 100644 --- a/src/com/android/settings/vpn2/ConfigDialog.java +++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -153,7 +153,7 @@ mL2tpSecret.setTextAppearance(android.R.style.TextAppearance_DeviceDefault_Medium); mIpsecIdentifier.setText(mProfile.ipsecIdentifier); mIpsecSecret.setText(mProfile.ipsecSecret); - AndroidKeystoreAliasLoader androidKeystoreAliasLoader = + final AndroidKeystoreAliasLoader androidKeystoreAliasLoader = new AndroidKeystoreAliasLoader(null); loadCertificates(mIpsecUserCert, androidKeystoreAliasLoader.getKeyCertAliases(), 0, mProfile.ipsecUserCert);