Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36651c0b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove the flag for the SharedConnectivityManager.getBroadcastReceiver() method." into main

parents 8e049518 33dfacc2

core/api/test-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2318,7 +2318,7 @@ package android.net.wifi.sharedconnectivity.app { 




  public class SharedConnectivityManager {

  public class SharedConnectivityManager {

    method @Nullable public static android.net.wifi.sharedconnectivity.app.SharedConnectivityManager create(@NonNull android.content.Context, @NonNull String, @NonNull String);

    method @Nullable public static android.net.wifi.sharedconnectivity.app.SharedConnectivityManager create(@NonNull android.content.Context, @NonNull String, @NonNull String);

    method @FlaggedApi("com.android.wifi.flags.shared_connectivity_broadcast_receiver_test_api") @NonNull public android.content.BroadcastReceiver getBroadcastReceiver();

    method @NonNull public android.content.BroadcastReceiver getBroadcastReceiver();

    method @Nullable public android.content.ServiceConnection getServiceConnection();

    method @Nullable public android.content.ServiceConnection getServiceConnection();

    method public void setService(@Nullable android.os.IInterface);

    method public void setService(@Nullable android.os.IInterface);

  }

  }

wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -309,7 +309,7 @@ public class SharedConnectivityManager { 
     */

     */

    @TestApi

    @TestApi

    @NonNull

    @NonNull

    @FlaggedApi("com.android.wifi.flags.shared_connectivity_broadcast_receiver_test_api")

    @SuppressLint("UnflaggedApi") // Exempt: Test API for already shipped feature

    public BroadcastReceiver getBroadcastReceiver() {

    public BroadcastReceiver getBroadcastReceiver() {

        return mBroadcastReceiver;

        return mBroadcastReceiver;

    }

    }