Merge "Fix issue that read-only apns can be edited" am: e871464053 am: 6b0237ebfb

am: 502ad46dc1

Change-Id: I6bd527b0fb0b63393d5ddf8414257f543a532805

diff --cc src/com/android/settings/network/ApnPreference.java
index 412259b,27d275f..a7fbb6e
--- 1/src/com/android/settings/network/ApnPreference.java
--- 2/src/com/android/settings/network/ApnPreference.java
+++ b/src/com/android/settings/network/ApnPreference.java
@@@ -25,18 -27,12 +25,15 @@@ import android.telephony.SubscriptionMa
  import android.util.AttributeSet;
  import android.util.Log;
  import android.view.View;
- import android.view.View.OnClickListener;
  import android.widget.CompoundButton;
  import android.widget.RadioButton;
- import android.widget.RelativeLayout;
  
 +import androidx.preference.Preference;
 +import androidx.preference.PreferenceViewHolder;
 +
  import com.android.settings.R;
  
- public class ApnPreference extends Preference implements
-         CompoundButton.OnCheckedChangeListener, OnClickListener {
+ public class ApnPreference extends Preference implements CompoundButton.OnCheckedChangeListener {
      final static String TAG = "ApnPreference";
  
      private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

diff --cc src/com/android/settings/network/ApnSettings.java
Simple merge