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" am: 6cc2ca0b82 am: f533214352

Browse Source 
am: 9f134c576b

Change-Id: Ifc7c2b7d49a58f572f78e1869717f1c6fcfee5c2
This commit is contained in:
Kenny Root
2019-11-25 12:18:25 -08:00
committed by android-build-merger
parent fa1d8bc360 9f134c576b
commit e197dad5e9
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.
*
* @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 {
if (mLocalSocket.isClosed()) {
throw new IOException("socket is closed");
}
byte[] cmdUtf8 = command.getBytes(StandardCharsets.UTF_8);
mOutputStream.writeInt(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.
* @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 {
if (mLocalSocket.isClosed()) {
throw new IOException("socket is closed");
}
return mInputStream.readInt();
}
/**
* 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 {
if (mLocalSocket.isClosed()) {
throw new IOException("socket is closed");
}
mOutputStream.writeInt(0);
}