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

Merge "Include GentleUpdateHelper state in dumpsys" into udc-dev

Browse Source
This commit is contained in:
Joanne Chung
2023-05-10 02:14:28 +00:00
committed by Android (Google) Code Review
parent f099daf0f9 626456cd54
commit f8727462f4
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/pm/GentleUpdateHelper.java
View File

@@ -39,6 +39,7 @@ import android.os.SystemProperties;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.Slog; import android.util.Slog;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import java.util.ArrayDeque; import java.util.ArrayDeque;
@@ -111,6 +112,25 @@ public class GentleUpdateHelper {
long timeout = mFinishTime - SystemClock.elapsedRealtime(); long timeout = mFinishTime - SystemClock.elapsedRealtime();
return Math.max(timeout, 0); return Math.max(timeout, 0);
} }
void dump(IndentingPrintWriter pw) {
pw.printPair("packageNames", packageNames);
pw.println();
pw.printPair("finishTime", mFinishTime);
pw.println();
pw.printPair("constraints notInCallRequired", constraints.isNotInCallRequired());
pw.println();
pw.printPair("constraints deviceIdleRequired", constraints.isDeviceIdleRequired());
pw.println();
pw.printPair("constraints appNotForegroundRequired",
constraints.isAppNotForegroundRequired());
pw.println();
pw.printPair("constraints appNotInteractingRequired",
constraints.isAppNotInteractingRequired());
pw.println();
pw.printPair("constraints appNotTopVisibleRequired",
constraints.isAppNotTopVisibleRequired());
}
} }
private final Context mContext; private final Context mContext;
@@ -288,4 +308,24 @@ public class GentleUpdateHelper {
} catch (RemoteException ignore) { } catch (RemoteException ignore) {
} }
} }
void dump(IndentingPrintWriter pw) {
pw.println("Gentle update with constraints info:");
pw.increaseIndent();
pw.printPair("hasPendingIdleJob", mHasPendingIdleJob);
pw.println();
pw.printPair("Num of PendingIdleFutures", mPendingIdleFutures.size());
pw.println();
ArrayDeque<PendingInstallConstraintsCheck> pendingChecks = mPendingChecks.clone();
int size = pendingChecks.size();
pw.printPair("Num of PendingChecks", size);
pw.println();
pw.increaseIndent();
for (int i = 0; i < size; i++) {
pw.print(i); pw.print(":");
PendingInstallConstraintsCheck pendingInstallConstraintsCheck = pendingChecks.remove();
pendingInstallConstraintsCheck.dump(pw);
pw.println();
}
}
} }

1
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -1825,6 +1825,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
pw.decreaseIndent(); pw.decreaseIndent();
} }
mSilentUpdatePolicy.dump(pw); mSilentUpdatePolicy.dump(pw);
mGentleUpdateHelper.dump(pw);
} }
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE) @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)