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

am: 232c2e84da

Change-Id: I9976fc35ee7f21aea3563d84cb2d871d03471517
This commit is contained in:
Jiyong Park
2019-11-26 13:39:28 -08:00
committed by android-build-merger

View File

@@ -665,7 +665,6 @@ public class ContextWrapper extends Context {
/** @hide */ /** @hide */
@Override @Override
@Nullable @Nullable
@SystemApi
public Intent registerReceiverForAllUsers(@Nullable BroadcastReceiver receiver, public Intent registerReceiverForAllUsers(@Nullable BroadcastReceiver receiver,
@NonNull IntentFilter filter, @Nullable String broadcastPermission, @NonNull IntentFilter filter, @Nullable String broadcastPermission,
@Nullable Handler scheduler) { @Nullable Handler scheduler) {