diff options
author | Rich Cannings <richc@google.com> | 2010-09-09 16:51:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 16:51:53 -0700 |
commit | d14f0dfd58af653a2d41424d472fe97de6af0a78 (patch) | |
tree | 5f582a90d816e7faae3bdbe36a6518006359b2f0 | |
parent | 2004ebfde368e5ae0cfc19b26e9e95f591909977 (diff) | |
parent | 736984573a1975d69d1c6efd87e4af9ca16e505f (diff) | |
download | frameworks_base-d14f0dfd58af653a2d41424d472fe97de6af0a78.zip frameworks_base-d14f0dfd58af653a2d41424d472fe97de6af0a78.tar.gz frameworks_base-d14f0dfd58af653a2d41424d472fe97de6af0a78.tar.bz2 |
am 73698457: am 6bff8c79: Merge "Remove the use of FileInputStream.available()" into gingerbread
Merge commit '736984573a1975d69d1c6efd87e4af9ca16e505f'
* commit '736984573a1975d69d1c6efd87e4af9ca16e505f':
Remove the use of FileInputStream.available()
-rw-r--r-- | keystore/java/android/security/SystemKeyStore.java | 19 | ||||
-rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 5 |
2 files changed, 12 insertions, 12 deletions
diff --git a/keystore/java/android/security/SystemKeyStore.java b/keystore/java/android/security/SystemKeyStore.java index abdb0ae..1093219 100644 --- a/keystore/java/android/security/SystemKeyStore.java +++ b/keystore/java/android/security/SystemKeyStore.java @@ -20,6 +20,8 @@ import android.os.Environment; import android.os.FileUtils; import android.os.Process; +import org.apache.harmony.luni.util.InputStreamHelper; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -108,26 +110,19 @@ public class SystemKeyStore { return keyFile; } - public String retrieveKeyHexString(String keyName) { + public String retrieveKeyHexString(String keyName) throws IOException { return toHexString(retrieveKey(keyName)); } - public byte[] retrieveKey(String keyName) { - + public byte[] retrieveKey(String keyName) throws IOException { File keyFile = getKeyFile(keyName); + if (!keyFile.exists()) { return null; } - try { - FileInputStream fis = new FileInputStream(keyFile); - int keyLen = fis.available(); - byte[] retKey = new byte[keyLen]; - fis.read(retKey); - fis.close(); - return retKey; - } catch (IOException ioe) { } - throw new IllegalArgumentException(); + FileInputStream fis = new FileInputStream(keyFile); + return InputStreamHelper.readFullyAndClose(fis); } public void deleteKey(String keyName) { diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 5ae87cf..f6d92b5 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -9408,7 +9408,12 @@ class PackageManagerService extends IPackageManager.Stub { } catch (NoSuchAlgorithmException nsae) { Slog.e(TAG, "Failed to create encryption keys with exception: " + nsae); return null; + } catch (IOException ioe) { + Slog.e(TAG, "Failed to retrieve encryption keys with exception: " + + ioe); + return null; } + } /* package */ static String getTempContainerId() { |