diff options
author | Peter Qiu <zqiu@google.com> | 2017-01-04 18:22:08 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-04 18:22:08 +0000 |
commit | 06a38b4156cdc734509af667abb1208f6ff57513 (patch) | |
tree | 4b3b0538a0aa41346fb11e729d3d2795cb13e8e7 | |
parent | a8d57c7b7c1c1f817bfad4c6aa08a0fc6c0af112 (diff) | |
parent | 86064dd6c85a97b36fd12e6db110bdc0d5bff756 (diff) | |
download | android_packages_apps_CertInstaller-06a38b4156cdc734509af667abb1208f6ff57513.tar.gz android_packages_apps_CertInstaller-06a38b4156cdc734509af667abb1208f6ff57513.tar.bz2 android_packages_apps_CertInstaller-06a38b4156cdc734509af667abb1208f6ff57513.zip |
WifiInstaller: remove the installation file am: bfd17d2ab2 am: ae8e771b22 am: 923a403a1f am: dfc0757d7b am: fe447cc93a am: fddaa9fe1e am: 1d9a081a61
am: 86064dd6c8
Change-Id: I7070eb663d023795daffc14cabfaee9bd0d1cf51
-rw-r--r-- | src/com/android/certinstaller/WiFiInstaller.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/com/android/certinstaller/WiFiInstaller.java b/src/com/android/certinstaller/WiFiInstaller.java index 889c760..728c8ec 100644 --- a/src/com/android/certinstaller/WiFiInstaller.java +++ b/src/com/android/certinstaller/WiFiInstaller.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; +import android.net.Uri; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiManager; @@ -19,6 +20,7 @@ import android.widget.Button; import android.widget.TextView; import android.widget.Toast; import android.os.AsyncTask; +import android.provider.DocumentsContract; import java.security.PrivateKey; import java.security.interfaces.RSAPrivateKey; @@ -53,6 +55,7 @@ public class WiFiInstaller extends Activity { mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mWifiConfiguration = mWifiManager.buildWifiConfig(uriString, mimeType, data); + dropFile(Uri.parse(uriString), getApplicationContext()); if (mWifiConfiguration != null) { WifiEnterpriseConfig enterpriseConfig = mWifiConfiguration.enterpriseConfig; @@ -195,4 +198,18 @@ public class WiFiInstaller extends Activity { } builder.create().show(); } + + /** + * Delete the file specified by the given URI. + * + * @param uri The URI of the file + * @param context The context of the current application + */ + private static void dropFile(Uri uri, Context context) { + if (DocumentsContract.isDocumentUri(context, uri)) { + DocumentsContract.deleteDocument(context.getContentResolver(), uri); + } else { + context.getContentResolver().delete(uri, null, null); + } + } } |