summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2020-09-10 10:49:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-10 10:49:11 +0000
commitcf38e32ef4ff1becb6af756f40dd35f2bac817d6 (patch)
tree6f25bdedf2ac6fa2a63c34235e07831fd01ecca5 /core/java
parent6ffdb65f6869c0505c65495add207dd0d351ef46 (diff)
parentf9023743083a22796714bd4f89e606765f478f29 (diff)
Merge "Don't kill for REQUEST_INSTALL_PACKAGES on default/error mode transition." into rvc-qpr-dev am: f902374308
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12419090 Change-Id: If07ef71f7c175c32096631eb9aea1f00636a1713
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/storage/StorageManagerInternal.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/storage/StorageManagerInternal.java b/core/java/android/os/storage/StorageManagerInternal.java
index e05991b33796..a79a1cfcd64f 100644
--- a/core/java/android/os/storage/StorageManagerInternal.java
+++ b/core/java/android/os/storage/StorageManagerInternal.java
@@ -118,7 +118,7 @@ public abstract class StorageManagerInternal {
* affects them.
*/
public abstract void onAppOpsChanged(int code, int uid,
- @Nullable String packageName, int mode);
+ @Nullable String packageName, int mode, int previousMode);
/**
* Asks the StorageManager to reset all state for the provided user; this will result