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

Commit f14d0656 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up flag new_apn_page_enabled" into main

parents d284eac5 e21750cf

aconfig/settings_experience_flag_declarations.aconfig

+0 −7
Original line number Diff line number Diff line 
package: "com.android.settings.flags"

container: "system_ext"



flag {

    name: "new_apn_page_enabled"

    namespace: "settings_experience"

    description: "Change to the new APN page."

    bug: "298906796"

}



flag {

    name: "refactor_print_settings"

    namespace: "settings_experience"

src/com/android/settings/network/apn/ApnPreference.java

+2 −11
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static com.android.settings.network.apn.ApnEditPageProviderKt.EDIT_URL; 


import android.content.ContentUris;

import android.content.Context;

import android.content.Intent;

import android.net.Uri;

import android.provider.Telephony;

import android.telephony.SubscriptionManager;
@@ -35,7 +34,6 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;

import com.android.settings.flags.Flags;

import com.android.settings.spa.SpaActivity;

import com.android.settingslib.widget.TwoTargetPreference;
@@ -127,15 +125,8 @@ public class ApnPreference extends TwoTargetPreference 


        final Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);



        if (Flags.newApnPageEnabled()) {

        String route = ApnEditPageProvider.INSTANCE.getRoute(EDIT_URL, url, mSubId);

        SpaActivity.startSpaActivity(context, route);

        } else {

            final Intent editIntent = new Intent(Intent.ACTION_EDIT, url);

            editIntent.putExtra(ApnSettings.SUB_ID, mSubId);

            editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

            context.startActivity(editIntent);

        }

        return true;

    }