Merge "Remove @SystemApi annotation for an overriding method"

am: 5c7bd75060 Change-Id: Icc63a9ee9e0a8752dde244f1f885141a1475c834
2019-11-26 13:33:58 -08:00
parent a39cdac59d 5c7bd75060
commit 232c2e84da
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) {