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

Merge "RecoverySystem: do not check if socket is closed"

Browse Source 
am: 6cc2ca0b82

Change-Id: I308fc54d2d59ede5f98f2576457bba47854344b0
This commit is contained in:
Kenny Root
2019-11-25 12:07:45 -08:00
committed by android-build-merger
parent 5eda192492 6cc2ca0b82
commit f533214352
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
View File

@@ -400,13 +400,9 @@ public class RecoverySystemService extends IRecoverySystem.Stub {
* Sends a command to the uncrypt service. * Sends a command to the uncrypt service.
* *
* @param command command to send to the uncrypt service * @param command command to send to the uncrypt service
* @throws IOException if the socket is closed or there was an error writing to the socket * @throws IOException if there was an error writing to the socket
*/ */
public void sendCommand(String command) throws IOException { public void sendCommand(String command) throws IOException {
if (mLocalSocket.isClosed()) {
throw new IOException("socket is closed");
}
byte[] cmdUtf8 = command.getBytes(StandardCharsets.UTF_8); byte[] cmdUtf8 = command.getBytes(StandardCharsets.UTF_8);
mOutputStream.writeInt(cmdUtf8.length); mOutputStream.writeInt(cmdUtf8.length);
mOutputStream.write(cmdUtf8, 0, cmdUtf8.length); mOutputStream.write(cmdUtf8, 0, cmdUtf8.length);
@@ -415,25 +411,17 @@ public class RecoverySystemService extends IRecoverySystem.Stub {
/** /**
* Reads the status from the uncrypt service which is usually represented as a percentage. * Reads the status from the uncrypt service which is usually represented as a percentage.
* @return an integer representing the percentage completed * @return an integer representing the percentage completed
* @throws IOException if the socket was closed or there was an error reading the socket * @throws IOException if there was an error reading the socket
*/ */
public int getPercentageUncrypted() throws IOException { public int getPercentageUncrypted() throws IOException {
if (mLocalSocket.isClosed()) {
throw new IOException("socket is closed");
}
return mInputStream.readInt(); return mInputStream.readInt();
} }
/** /**
* Sends a confirmation to the uncrypt service. * Sends a confirmation to the uncrypt service.
* @throws IOException if the socket was closed or there was an error writing to the socket * @throws IOException if there was an error writing to the socket
*/ */
public void sendAck() throws IOException { public void sendAck() throws IOException {
if (mLocalSocket.isClosed()) {
throw new IOException("socket is closed");
}
mOutputStream.writeInt(0); mOutputStream.writeInt(0);
} }