Otadexopt: Expose progress percentage

To be able to report progress of an A/B OTA dexopt, expose a
progress function that the script can query.

Bug: 25612095
Bug: 29223204
Change-Id: Ie8162946d18f6fa78649a40ad5d3949d31a181cd
(cherry picked from commit bf06232f4d)
This commit is contained in:
Andreas Gampe
2016-06-10 15:21:39 -07:00
parent 2b6fc4c92d
commit ff8ab4c9fa
3 changed files with 25 additions and 0 deletions

View File

@@ -41,6 +41,12 @@ interface IOtaDexopt {
*/
boolean isDone();
/**
* Return the progress (0..1) made in this session. When {@link #isDone() isDone} returns
* true, the progress value will be 1.
*/
float getProgress();
/**
* Optimize the next package. Note: this command is synchronous, that is, only returns after
* the package has been dexopted (or dexopting failed).

View File

@@ -54,6 +54,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
// TODO: Evaluate the need for WeakReferences here.
private List<PackageParser.Package> mDexoptPackages;
private int completeSize;
public OtaDexoptService(Context context, PackageManagerService packageManagerService) {
this.mContext = context;
@@ -91,6 +92,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
mDexoptPackages = PackageManagerServiceUtils.getPackagesForDexopt(
mPackageManagerService.mPackages.values(), mPackageManagerService);
}
completeSize = mDexoptPackages.size();
}
@Override
@@ -110,6 +112,14 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
return mDexoptPackages.isEmpty();
}
@Override
public synchronized float getProgress() throws RemoteException {
if (completeSize == 0) {
return 1f;
}
return (completeSize - mDexoptPackages.size()) / ((float)completeSize);
}
@Override
public synchronized void dexoptNextPackage() throws RemoteException {
if (mDexoptPackages == null) {

View File

@@ -46,6 +46,8 @@ class OtaDexoptShellCommand extends ShellCommand {
return runOtaDone();
case "step":
return runOtaStep();
case "progress":
return runOtaProgress();
default:
return handleDefaultCommands(cmd);
}
@@ -81,6 +83,13 @@ class OtaDexoptShellCommand extends ShellCommand {
return 0;
}
private int runOtaProgress() throws RemoteException {
final float progress = mInterface.getProgress();
final PrintWriter pw = getOutPrintWriter();
pw.format("%.2f", progress);
return 0;
}
@Override
public void onHelp() {
final PrintWriter pw = getOutPrintWriter();