diff options
| author | 2023-01-17 01:18:17 +0000 | |
|---|---|---|
| committer | 2023-01-17 01:18:17 +0000 | |
| commit | db87c40756c95c78ec25c6d6e4e418c02e328e57 (patch) | |
| tree | 767d77c62e86110b1dd4e2c9147aad9dd428cc82 | |
| parent | 80ba8c26519acb90af0af1af5b6527e4035e2002 (diff) | |
| parent | dd08e5d55a42e3f6cde44d453919059affa62b50 (diff) | |
Merge "Send PACKAGE/CANCEL_ENABLE_ROLLBACK as foreground broadcast."
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageHandler.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/VerifyingSession.java | 3 | ||||
| -rw-r--r-- | tests/RollbackTest/Android.bp | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/pm/PackageHandler.java b/services/core/java/com/android/server/pm/PackageHandler.java index 93a119c36f3d..7f7a23419dda 100644 --- a/services/core/java/com/android/server/pm/PackageHandler.java +++ b/services/core/java/com/android/server/pm/PackageHandler.java @@ -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); } diff --git a/services/core/java/com/android/server/pm/VerifyingSession.java b/services/core/java/com/android/server/pm/VerifyingSession.java index a54f52619f35..8ec6241cce07 100644 --- a/services/core/java/com/android/server/pm/VerifyingSession.java +++ b/services/core/java/com/android/server/pm/VerifyingSession.java @@ -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 diff --git a/tests/RollbackTest/Android.bp b/tests/RollbackTest/Android.bp index f2234fb64108..21007ef1396f 100644 --- a/tests/RollbackTest/Android.bp +++ b/tests/RollbackTest/Android.bp @@ -74,6 +74,7 @@ java_test_host { ], test_suites: ["general-tests"], test_config: "MultiUserRollbackTest.xml", + data : [":RollbackTest"], } java_library_host { |