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

Remove null-checks (5/n)

Browse Source 
1. Remove the check in handleMessage() since all callers of
   obtainMessage() pass non-null sessions.
2. Remove the check in startPreRebootVerification() since
   the passed-in session is non-null.

Bug: 167996901
Test: atest StagedInstallTest StagedInstallInternalTest
Change-Id: I6c5b5a1357130d3c9f4889b7e6297faf7f2c20a4
This commit is contained in:
JW Wang
2020-09-08 15:18:48 +08:00
parent 921340c284
commit f8dd1956b4
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/pm/StagingManager.java
View File

@@ -1186,7 +1186,7 @@ public class StagingManager {
// TODO(b/136257624): Temporary API to let PMS communicate with StagingManager. When all
// verification logic is extracted out of StagingManager into PMS, we can remove
// this.
void notifyPreRebootVerification_Apk_Complete(PackageInstallerSession session) {
void notifyPreRebootVerification_Apk_Complete(@NonNull PackageInstallerSession session) {
mPreRebootVerificationHandler.notifyPreRebootVerification_Apk_Complete(session);
}
@@ -1223,11 +1223,6 @@ public class StagingManager {
final int sessionId = msg.arg1;
final int rollbackId = msg.arg2;
final PackageInstallerSession session = (PackageInstallerSession) msg.obj;
if (session == null) {
Slog.wtf(TAG, "Session disappeared in the middle of pre-reboot verification: "
+ sessionId);
return;
}
if (session.isDestroyed() || session.isStagedSessionFailed()) {
// No point in running verification on a destroyed/failed session
onPreRebootVerificationComplete(session);
@@ -1262,7 +1257,8 @@ public class StagingManager {
}
// Method for starting the pre-reboot verification
private synchronized void startPreRebootVerification(PackageInstallerSession session) {
private synchronized void startPreRebootVerification(
@NonNull PackageInstallerSession session) {
if (!mIsReady) {
if (mPendingSessions == null) {
mPendingSessions = new ArrayList<>();
@@ -1271,7 +1267,7 @@ public class StagingManager {
return;
}
if (session != null && session.notifyStagedStartPreRebootVerification()) {
if (session.notifyStagedStartPreRebootVerification()) {
int sessionId = session.sessionId;
Slog.d(TAG, "Starting preRebootVerification for session " + sessionId);
obtainMessage(MSG_PRE_REBOOT_VERIFICATION_START, sessionId, -1, session)
@@ -1298,17 +1294,19 @@ public class StagingManager {
}
private void notifyPreRebootVerification_Start_Complete(
PackageInstallerSession session, int rollbackId) {
@NonNull PackageInstallerSession session, int rollbackId) {
obtainMessage(MSG_PRE_REBOOT_VERIFICATION_APEX, session.sessionId, rollbackId, session)
.sendToTarget();
}
private void notifyPreRebootVerification_Apex_Complete(PackageInstallerSession session) {
private void notifyPreRebootVerification_Apex_Complete(
@NonNull PackageInstallerSession session) {
obtainMessage(MSG_PRE_REBOOT_VERIFICATION_APK, session.sessionId, -1, session)
.sendToTarget();
}
private void notifyPreRebootVerification_Apk_Complete(PackageInstallerSession session) {
private void notifyPreRebootVerification_Apk_Complete(
@NonNull PackageInstallerSession session) {
obtainMessage(MSG_PRE_REBOOT_VERIFICATION_END, session.sessionId, -1, session)
.sendToTarget();
}