Merge "Remove @SystemApi annotation for an overriding method" am: 5c7bd75060

am: 232c2e84da Change-Id: I9976fc35ee7f21aea3563d84cb2d871d03471517
2019-11-26 13:39:28 -08:00
parent a1c9ff6c96 232c2e84da
commit 0331ee35b1
1 changed files with 0 additions and 1 deletions
--- 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) {