diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-11-18 10:47:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-18 10:47:54 +0000 |
| commit | be18b92c83554ac52ebd3339abfe8e3412d33236 (patch) | |
| tree | 4f5afe4c38931e3a643f9d509723414506847e6e /core/java | |
| parent | 9a9304ac9d58a7500aaf8eb4c49c1838cba445be (diff) | |
| parent | 4ca688adf8ee8c1b39130137d4fba23b07c0c69b (diff) | |
Merge "Migrate THROW_SECURITY_EXCEPTIONS" am: 3724bc6c47 am: e0b1e5c604 am: 39a0624f7f am: 4ca688adf8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1492845
Change-Id: I09486c074ffdf42c003dff959a865a6379e6d334
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/om/OverlayManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/content/om/OverlayManager.java b/core/java/android/content/om/OverlayManager.java index fd3d48f2fd0e..217f637cf9e3 100644 --- a/core/java/android/content/om/OverlayManager.java +++ b/core/java/android/content/om/OverlayManager.java @@ -23,7 +23,7 @@ import android.annotation.SystemApi; import android.annotation.SystemService; import android.compat.Compatibility; import android.compat.annotation.ChangeId; -import android.compat.annotation.EnabledAfter; +import android.compat.annotation.EnabledSince; import android.content.Context; import android.os.Build; import android.os.Process; @@ -90,7 +90,7 @@ public class OverlayManager { * java.lang.IllegalStateException}, which existed in the source prior to R. */ @ChangeId - @EnabledAfter(targetSdkVersion = Build.VERSION_CODES.Q) + @EnabledSince(targetSdkVersion = Build.VERSION_CODES.R) private static final long THROW_SECURITY_EXCEPTIONS = 147340954; /** |