Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the use of FileInputStream.available()

Browse Source 
Bug: 2976294
Change-Id: I34b13cedbf1d2338163ef74454817c318a3a24f5
This commit is contained in:
Rich Cannings
2010-09-09 15:12:40 -07:00
parent 76e4fa1926
commit 8d578836dc
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
keystore/java/android/security/SystemKeyStore.java
View File

@@ -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) {