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

Merge "RecoverySystem: Fix the issue in installPackage()." am: 3b2fe9f7b9

Browse Source 
am: 6bb3a9e6df

Change-Id: I9919e1a37853290dc052a21267cea57ae2a0aacf
This commit is contained in:
Tao Bao
2017-01-16 18:32:22 +00:00
committed by android-build-merger
parent f9c48fad75 6bb3a9e6df
commit 5c610492c8
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/IRecoverySystem.aidl
View File

@@ -25,5 +25,5 @@ interface IRecoverySystem {
boolean uncrypt(in String packageFile, IRecoverySystemProgressListener listener);
boolean setupBcb(in String command);
boolean clearBcb();
void rebootRecoveryWithCommand(in String command);
void rebootRecoveryWithCommand(in String command, in boolean update);
}

15
core/java/android/os/RecoverySystem.java
View File

@@ -491,15 +491,10 @@ public class RecoverySystem {
command += securityArg;
}
// RECOVERY_SERVICE writes to BCB (bootloader control block) and triggers the reboot.
RecoverySystem rs = (RecoverySystem) context.getSystemService(
Context.RECOVERY_SERVICE);
if (!rs.setupBcb(command)) {
throw new IOException("Setup BCB failed");
}
// Having set up the BCB (bootloader control block), go ahead and reboot
PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
pm.reboot(PowerManager.REBOOT_RECOVERY_UPDATE);
rs.rebootRecoveryWithCommand(command, true /* update */);
throw new IOException("Reboot failed (no permissions?)");
}
@@ -713,7 +708,7 @@ public class RecoverySystem {
// Write the command into BCB (bootloader control block) and boot from
// there. Will not return unless failed.
RecoverySystem rs = (RecoverySystem) context.getSystemService(Context.RECOVERY_SERVICE);
rs.rebootRecoveryWithCommand(command.toString());
rs.rebootRecoveryWithCommand(command.toString(), false);
throw new IOException("Reboot failed (no permissions?)");
}
@@ -913,9 +908,9 @@ public class RecoverySystem {
* Talks to RecoverySystemService via Binder to set up the BCB command and
* reboot into recovery accordingly.
*/
private void rebootRecoveryWithCommand(String command) {
private void rebootRecoveryWithCommand(String command, boolean update) {
try {
mService.rebootRecoveryWithCommand(command);
mService.rebootRecoveryWithCommand(command, update);
} catch (RemoteException ignored) {
}
}

7
services/core/java/com/android/server/RecoverySystemService.java
View File

@@ -181,7 +181,7 @@ public final class RecoverySystemService extends SystemService {
}
@Override // Binder call
public void rebootRecoveryWithCommand(String command) {
public void rebootRecoveryWithCommand(String command, boolean update) {
if (DEBUG) Slog.d(TAG, "rebootRecoveryWithCommand: [" + command + "]");
synchronized (sRequestLock) {
if (!setupOrClearBcb(true, command)) {
@@ -190,7 +190,10 @@ public final class RecoverySystemService extends SystemService {
// Having set up the BCB, go ahead and reboot.
PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
pm.reboot(PowerManager.REBOOT_RECOVERY);
// PowerManagerService may additionally request uncrypting the package when it's
// to install an update (REBOOT_RECOVERY_UPDATE).
pm.reboot(update ? PowerManager.REBOOT_RECOVERY_UPDATE :
PowerManager.REBOOT_RECOVERY);
}
}