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

Commit 6422abef authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

resolved conflicts for merge of 3bbef521 to master

Change-Id: I0bbb7c80f6c4f003779da784475d7acbfb898c94
parents 4f0128fb 3bbef521
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -3601,8 +3601,11 @@ public class PackageParser {
        // file an app came from.
        public String mScanPath;

        // For use by package manager to keep track of where it has done dexopt.
        public boolean mDidDexOpt;
        // For use by package manager to keep track of where it needs to do dexopt.
        public boolean mDexOptNeeded = true;

        // For use by package manager to keep track of when a package was last used.
        public long mLastPackageUsageTimeInMills;

        // // User set enabled state.
        // public int mSetEnabled = PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
+1 −1
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ public final class ActivityManagerService extends ActivityManagerNative
    /**
     * This is set if we had to do a delayed dexopt of an app before launching
     * it, to increasing the ANR timeouts in that case.
     * it, to increase the ANR timeouts in that case.
     */
    boolean mDidDexOpt;
+274 −77

File changed.

Preview size limit exceeded, changes collapsed.

+9 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.os.storage.IMountService;
import android.os.storage.IMountShutdownObserver;

import com.android.internal.telephony.ITelephony;
import com.android.server.pm.PackageManagerService;

import android.util.Log;
import android.view.WindowManager;
@@ -329,6 +330,14 @@ public final class ShutdownThread extends Thread {
            }
        }

        Log.i(TAG, "Shutting down package manager...");

        final PackageManagerService pm = (PackageManagerService)
            ServiceManager.getService("package");
        if (pm != null) {
            pm.shutdown();
        }

        // Shutdown radios.
        shutdownRadios(MAX_RADIO_WAIT_TIME);