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

Commit 67c89f3e authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam
Browse files

Handle ParcelableException instead of crashing system server 

Unhandled exception is causing system server to crash.

Bug: 146790672
Test: builds successfully
Change-Id: Ibfe53ee0309dcec6fd3b24f8b67fcb78f5ce7fd5
Merged-In: Ibfe53ee0309dcec6fd3b24f8b67fcb78f5ce7fd5
parent 0342ffa2

services/core/java/com/android/server/pm/StagingManager.java

+8 −8
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.IBinder;

import android.os.ParcelFileDescriptor;

import android.os.ParcelableException;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -403,29 +404,28 @@ public class StagingManager { 
        } else {

            params.installFlags |= PackageManager.INSTALL_DISABLE_VERIFICATION;

        }

        try {

            int apkSessionId = mPi.createSession(

                    params, originalSession.getInstallerPackageName(),

                    0 /* UserHandle.SYSTEM */);

            PackageInstallerSession apkSession = mPi.getSession(apkSessionId);



        try {

            apkSession.open();

            for (String apkFilePath : apkFilePaths) {

                File apkFile = new File(apkFilePath);

                ParcelFileDescriptor pfd = ParcelFileDescriptor.open(apkFile,

                        ParcelFileDescriptor.MODE_READ_ONLY);

                long sizeBytes = pfd.getStatSize();

                long sizeBytes = (pfd == null) ? -1 : pfd.getStatSize();

                if (sizeBytes < 0) {

                    Slog.e(TAG, "Unable to get size of: " + apkFilePath);

                    return null;

                }

                apkSession.write(apkFile.getName(), 0, sizeBytes, pfd);

            }

        } catch (IOException e) {

            return apkSession;

        } catch (IOException | ParcelableException e) {

            Slog.e(TAG, "Failure to install APK staged session " + originalSession.sessionId, e);

            return null;

        }

        return apkSession;

    }



    private boolean commitApkSession(@NonNull PackageInstallerSession apkSession,