summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-11-18 09:28:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-11-18 09:28:59 +0000
commitf669aaa6ce4d3c39dbfa2c3d7415a7da5b790427 (patch)
tree8ac5d0d350ac5d0da3834ae8284112733e9747a6
parent39a0624f7f053671aafd28d320c7b84f7cb45b05 (diff)
parent62d7bd9555f5edd26fd6d41fe77a19eb0c8b2f07 (diff)
Merge "Migrate CALLBACK_ON_CLEAR_CHANGE" am: 6f7c5e0914 am: 62d7bd9555
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492844 Change-Id: I40fc10b8f269530f671d8511435c5c62d0c1f655
-rw-r--r--core/java/android/app/SharedPreferencesImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/SharedPreferencesImpl.java b/core/java/android/app/SharedPreferencesImpl.java
index bc1bcbc4f80e..1ebf56550e03 100644
--- a/core/java/android/app/SharedPreferencesImpl.java
+++ b/core/java/android/app/SharedPreferencesImpl.java
@@ -19,7 +19,7 @@ package android.app;
import android.annotation.Nullable;
import android.compat.Compatibility;
import android.compat.annotation.ChangeId;
-import android.compat.annotation.EnabledAfter;
+import android.compat.annotation.EnabledSince;
import android.compat.annotation.UnsupportedAppUsage;
import android.content.SharedPreferences;
import android.os.Build;
@@ -71,7 +71,7 @@ final class SharedPreferencesImpl implements SharedPreferences {
* {@link android.content.SharedPreferences.Editor#clear Editor.clear}.
*/
@ChangeId
- @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q)
+ @EnabledSince(targetSdkVersion = Build.VERSION_CODES.R)
private static final long CALLBACK_ON_CLEAR_CHANGE = 119147584L;
// Lock ordering rules: