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

Commit db87c407 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Send PACKAGE/CANCEL_ENABLE_ROLLBACK as foreground broadcast."

parents 80ba8c26 dd08e5d5

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

+2 −2
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ final class PackageHandler extends Handler { 
                    rollbackTimeoutIntent.putExtra(

                            PackageManagerInternal.EXTRA_ENABLE_ROLLBACK_SESSION_ID,

                            sessionId);

                    rollbackTimeoutIntent.addFlags(

                            Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

                    rollbackTimeoutIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT

                            | Intent.FLAG_RECEIVER_FOREGROUND);

                    mPm.mContext.sendBroadcastAsUser(rollbackTimeoutIntent, UserHandle.SYSTEM,

                            android.Manifest.permission.PACKAGE_ROLLBACK_AGENT);

                }

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

+2 −1
Original line number Diff line number Diff line
@@ -233,7 +233,8 @@ final class VerifyingSession { 
                PackageManagerInternal.EXTRA_ENABLE_ROLLBACK_SESSION_ID,

                mSessionId);

        enableRollbackIntent.setType(PACKAGE_MIME_TYPE);

        enableRollbackIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

        enableRollbackIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION

                | Intent.FLAG_RECEIVER_FOREGROUND);



        // Allow the broadcast to be sent before boot complete.

        // This is needed when committing the apk part of a staged

tests/RollbackTest/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ java_test_host { 
    ],

    test_suites: ["general-tests"],

    test_config: "MultiUserRollbackTest.xml",

    data : [":RollbackTest"],

}



java_library_host {