Merge "Remove @TestApi from @SystemApi symbols"

This commit is contained in:
Anton Hansson 2020-10-20 13:45:13 +00:00 • committed by Gerrit Code Review
commit 64b87b5aa5

View file

@ -269,7 +269,6 @@ public class ConnectivityManager {
* {@hide}
*/
@SystemApi
@TestApi
public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC =
"android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";
@ -278,7 +277,6 @@ public class ConnectivityManager {
* {@hide}
*/
@SystemApi
@TestApi
public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT =
"android.net.extra.CAPTIVE_PORTAL_USER_AGENT";
@ -4413,7 +4411,6 @@ public class ConnectivityManager {
* @hide
*/
@SystemApi
@TestApi
@RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)
public void startCaptivePortalApp(@NonNull Network network, @NonNull Bundle appExtras) {
try {