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

Commit 3ccbd5ac authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add null check on ApplicationInfo." into udc-dev am: a177e5f1 am: 3a9bade9 

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



Change-Id: Ic7bc5b4858b9c75842d90b48175c7e21d1127cc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d5267cd 3a9bade9

services/core/java/com/android/server/am/ProcessRecord.java

+3 −1
Original line number Diff line number Diff line
@@ -579,7 +579,9 @@ class ProcessRecord implements WindowProcessListener { 
        processName = _processName;

        sdkSandboxClientAppPackage = _sdkSandboxClientAppPackage;

        if (isSdkSandbox) {

            sdkSandboxClientAppVolumeUuid = getClientInfoForSdkSandbox().volumeUuid;

            final ApplicationInfo clientInfo = getClientInfoForSdkSandbox();

            sdkSandboxClientAppVolumeUuid = clientInfo != null

                    ? clientInfo.volumeUuid : null;

        } else {

            sdkSandboxClientAppVolumeUuid = null;

        }