diff options
| author | 2019-11-26 13:39:28 -0800 | |
|---|---|---|
| committer | 2019-11-26 13:39:28 -0800 | |
| commit | 0331ee35b1f6b45b8e2e6a1e0cfdc15fab710f6c (patch) | |
| tree | ff172874ea8c2056fd56b40b6dba8025268daad9 | |
| parent | a1c9ff6c96ae898781f2c84ae9fae2d031026001 (diff) | |
| parent | 232c2e84da5b101b17e77a9279834454a1a6c53f (diff) | |
Merge "Remove @SystemApi annotation for an overriding method" am: 5c7bd75060
am: 232c2e84da
Change-Id: I9976fc35ee7f21aea3563d84cb2d871d03471517
| -rw-r--r-- | core/java/android/content/ContextWrapper.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java index 497e2fd60447..9b24bee30829 100644 --- a/core/java/android/content/ContextWrapper.java +++ b/core/java/android/content/ContextWrapper.java @@ -665,7 +665,6 @@ public class ContextWrapper extends Context { /** @hide */ @Override @Nullable - @SystemApi public Intent registerReceiverForAllUsers(@Nullable BroadcastReceiver receiver, @NonNull IntentFilter filter, @Nullable String broadcastPermission, @Nullable Handler scheduler) { |