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

Commit 723e10c4 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge \\"Don\\'t hold lock calling into PackageMgr\\" into nyc-mr1-dev am: c8967160 

am: b5a2e31e

Change-Id: I53f9fa9aed56ff9307894a8fa07ca337f2e41e0f
parents f9819ce2 b5a2e31e

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

+17 −14
Original line number Diff line number Diff line
@@ -666,9 +666,10 @@ public class PackageInstallerService extends IPackageInstaller.Stub { 
                        "Too many historical sessions for UID " + callingUid);

            }



            final long createdMillis = System.currentTimeMillis();

            sessionId = allocateSessionIdLocked();

        }



        final long createdMillis = System.currentTimeMillis();

        // We're staging to exactly one location

        File stageDir = null;

        String stageCid = null;
@@ -683,6 +684,8 @@ public class PackageInstallerService extends IPackageInstaller.Stub { 
        session = new PackageInstallerSession(mInternalCallback, mContext, mPm,

                mInstallThread.getLooper(), sessionId, userId, installerPackageName, callingUid,

                params, createdMillis, stageDir, stageCid, false, false);



        synchronized (mSessions) {

            mSessions.put(sessionId, session);

        }