am 9193d8bc: Merge "code cleanup : unused import statement, local vars and static finals."

* commit '9193d8bcca6a02f92250ed4796908c6561c32945':
  code cleanup : unused import statement, local vars and static finals.

4 files changed, 1 insertions, 9 deletions

diff --git a/src/com/android/certinstaller/CertFile.java b/src/com/android/certinstaller/CertFile.java
index 8e63794..fb7e13e 100644
--- a/src/com/android/certinstaller/CertFile.java
+++ b/src/com/android/certinstaller/CertFile.java
@@ -16,7 +16,6 @@
 
 package com.android.certinstaller;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
@@ -27,7 +26,6 @@ import android.widget.Toast;
 
 import java.io.File;
 import java.io.FileFilter;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/android/certinstaller/CertFileList.java b/src/com/android/certinstaller/CertFileList.java
index bd7767f..601bee4 100644
--- a/src/com/android/certinstaller/CertFileList.java
+++ b/src/com/android/certinstaller/CertFileList.java
@@ -37,8 +37,6 @@ public class CertFileList extends CertFile
     private static final String TAG = "CertFileList";
 
     private static final String DOWNLOAD_DIR = "download";
-    private static final int MAX_FILE_SIZE = 1000000;
-    private static final int REQUEST_INSTALL_CODE = 1;
 
     private SdCardMonitor mSdCardMonitor;
 
diff --git a/src/com/android/certinstaller/CredentialHelper.java b/src/com/android/certinstaller/CredentialHelper.java
index 5ad7f87..42af94b 100644
--- a/src/com/android/certinstaller/CredentialHelper.java
+++ b/src/com/android/certinstaller/CredentialHelper.java
@@ -38,7 +38,6 @@ import java.security.KeyStore.PasswordProtection;
 import java.security.KeyStore.PrivateKeyEntry;
 import java.security.KeyFactory;
 import java.security.PrivateKey;
-import java.security.PublicKey;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
@@ -48,7 +47,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * A helper class for accessing the raw data in the intent extra and handling
diff --git a/src/com/android/certinstaller/Util.java b/src/com/android/certinstaller/Util.java
index 61b4a19..00c14c4 100644
--- a/src/com/android/certinstaller/Util.java
+++ b/src/com/android/certinstaller/Util.java
@@ -22,7 +22,6 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.security.MessageDigest;
@@ -39,9 +38,8 @@ class Util {
             os.close();
         } catch (Exception e) {
             Log.w(TAG, "toBytes(): " + e + ": " + object);
-        } finally {
-            return baos.toByteArray();
         }
+        return baos.toByteArray();
     }
 
     static <T> T fromBytes(byte[] bytes) {