Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6ae9185 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when calling getResolvedBaseApkPath()" into udc-qpr-dev am:... 

Merge "Fix NPE when calling getResolvedBaseApkPath()" into udc-qpr-dev am: 31740877 am: 20453864

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24962969



Change-Id: I41ad3e9d4ecd9384e0f98995969fc74adcaf4629
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35e2adcf 20453864

packages/PackageInstaller/src/com/android/packageinstaller/PackageInstallerActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ public class PackageInstallerActivity extends AlertActivity { 
            final int sessionId = intent.getIntExtra(PackageInstaller.EXTRA_SESSION_ID,

                    -1 /* defaultValue */);

            final SessionInfo info = mInstaller.getSessionInfo(sessionId);

            String resolvedPath = info.getResolvedBaseApkPath();

            String resolvedPath = info != null ? info.getResolvedBaseApkPath() : null;

            if (info == null || !info.isSealed() || resolvedPath == null) {

                Log.w(TAG, "Session " + mSessionId + " in funky state; ignoring");

                finish();