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

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

Merge "Revert^2 "Settings: add ACTION_NETWORK_PROVIDER_SETTINGS"" into main

parents 18bc6e82 4c4017a2

core/java/android/provider/Settings.java

+18 −0
Original line number Original line Diff line number Diff line
@@ -1735,6 +1735,24 @@ public final class Settings { 
    public static final String ACTION_NETWORK_OPERATOR_SETTINGS =

    public static final String ACTION_NETWORK_OPERATOR_SETTINGS =

            "android.settings.NETWORK_OPERATOR_SETTINGS";

            "android.settings.NETWORK_OPERATOR_SETTINGS";




















    /**














     * Activity Action: Show settings for selecting the network provider.














     * <p>














     * In some cases, a matching Activity may not be provided, so ensure you














     * safeguard against this.














     * <p>














     * Access to this preference can be customized via Settings' app.














     * <p>














     * Input: Nothing.














     * <p>














     * Output: Nothing.














     *














     * @hide














     */














    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)














    public static final String ACTION_NETWORK_PROVIDER_SETTINGS =














            "android.settings.NETWORK_PROVIDER_SETTINGS";
























    /**







    /**











     * Activity Action: Show settings for selection of 2G/3G.







     * Activity Action: Show settings for selection of 2G/3G.











     * <p>







     * <p>

































packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java



+2
−3




























Original line number
Original line
Diff line number
Diff line








@@ -118,8 +118,6 @@ import javax.inject.Inject;









public class InternetDialogController implements AccessPointController.AccessPointCallback {







public class InternetDialogController implements AccessPointController.AccessPointCallback {































    private static final String TAG = "InternetDialogController";







    private static final String TAG = "InternetDialogController";











    private static final String ACTION_NETWORK_PROVIDER_SETTINGS =














            "android.settings.NETWORK_PROVIDER_SETTINGS";














    private static final String ACTION_WIFI_SCANNING_SETTINGS =







    private static final String ACTION_WIFI_SCANNING_SETTINGS =











            "android.settings.WIFI_SCANNING_SETTINGS";







            "android.settings.WIFI_SCANNING_SETTINGS";











    /**







    /**










@@ -363,7 +361,8 @@ public class InternetDialogController implements AccessPointController.AccessPoi





























    @VisibleForTesting







    @VisibleForTesting











    protected Intent getSettingsIntent() {







    protected Intent getSettingsIntent() {











        return new Intent(ACTION_NETWORK_PROVIDER_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);







        return new Intent(Settings.ACTION_NETWORK_PROVIDER_SETTINGS).addFlags(














                Intent.FLAG_ACTIVITY_NEW_TASK);











    }







    }































    @Nullable







    @Nullable