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

Merge change 26791 into eclair

Browse Source 
* changes:
  KeyStore: return null when response code indicates an error.
This commit is contained in:
Android (Google) Code Review
2009-09-24 01:38:35 -04:00
parent 3436eb81cd f1ece5d0c1
commit ea09a5b662
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystore/java/android/security/KeyStore.java
View File

@@ -172,8 +172,10 @@ public class KeyStore {
socket.shutdownOutput(); socket.shutdownOutput();
InputStream in = socket.getInputStream(); InputStream in = socket.getInputStream();
code = in.read(); if ((code = in.read()) != NO_ERROR) {
if (code == -1) { if (code != -1) {
mError = code;
}
return null; return null;
} }
@@ -194,7 +196,7 @@ public class KeyStore {
} }
results.add(result); results.add(result);
} }
mError = code; mError = NO_ERROR;
return results.toArray(new byte[results.size()][]); return results.toArray(new byte[results.size()][]);
} catch (IOException e) { } catch (IOException e) {
// ignore // ignore