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

Commit d4041db1 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

More freezing of apps when doing surgery. 

We're still hearing rare reports of apps running while the system
is trying to do surgery on app code/data.  To fix this once and for
all, start guarding all PackageManager critical sections by freezing
and then killing the app before doing surgery.

This is done by introducing a new PackageFreezer class which can be
used in try-with-resources blocks.  It also handles child packages
uniformly, and it uses CloseGuard to defensively un-freeze packages
if a caller leaks without closing.

The set of frozen packages is now maintained outside of PackageSetting
to support newly installed packages.  Add docs for the various locks
and method syntax conventions, including the new "LIF" syntax which
indicates the caller is responsible for freezing the package being
worked on.

Bug: 27698554
Change-Id: I64c4c48123060ccb4d4c50c2fbf3ef223c01e659
parent 8ed9ece9

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

+339 −190

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −6
Original line number Diff line number Diff line
@@ -113,12 +113,6 @@ abstract class PackageSettingBase extends SettingBase { 


    int installStatus = PKG_INSTALL_COMPLETE;



    /**

     * Non-persisted value indicating this package has been temporarily frozen,

     * usually during a critical section of the package update pipeline. The

     * platform will refuse to launch packages in a frozen state.

     */

    boolean frozen = false;

    /**

     * Non-persisted value. During an "upgrade without restart", we need the set

     * of all previous code paths so we can surgically add the new APKs to the

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

+0 −4
Original line number Diff line number Diff line
@@ -4325,10 +4325,6 @@ final class Settings { 
            pw.print(Integer.toHexString(System.identityHashCode(ps)));

            pw.println("):");



        if (ps.frozen) {

            pw.print(prefix); pw.println("  FROZEN!");

        }



        if (ps.realName != null) {

            pw.print(prefix); pw.print("  compat name=");

            pw.println(ps.name);