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

Commit 51385797 authored by Yashdev Singh's avatar Yashdev Singh Committed by Linux Build Service Account
Browse files

Modify access specifiers to enable OMH 

Change access specifiers of member variables to facilitate
inheritance for OMH feature implementation.

Change-Id: I32e3f3b0ea3dbeba1e06bff6aacc0cd2b813d0bf
parent 622330cc

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import com.android.internal.telephony.CommandsInterface; 


import android.telephony.TelephonyManager;



import com.android.internal.telephony.TelephonyPluginDelegate;

import com.android.internal.telephony.dataconnection.DcTracker;

import com.android.internal.telephony.MccTable;

import com.android.internal.telephony.OperatorInfo;
@@ -90,7 +91,7 @@ public class CDMALTEPhone extends CDMAPhone { 


        Rlog.d(LOG_TAG, "CDMALTEPhone: constructor: sub = " + mPhoneId);



        mDcTracker = new DcTracker(this);

        mDcTracker = TelephonyPluginDelegate.getInstance().makeDcTracker(this);



    }

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+2 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import com.android.internal.telephony.SubscriptionController; 
import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyProperties;

import com.android.internal.telephony.UUSInfo;

import com.android.internal.telephony.TelephonyPluginDelegate;

import com.android.internal.telephony.dataconnection.DcTracker;

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.uicc.IccException;
@@ -160,7 +161,7 @@ public class CDMAPhone extends PhoneBase { 
        mCT = new CdmaCallTracker(this);

        mCdmaSSM = CdmaSubscriptionSourceManager.getInstance(context, mCi, this,

                EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED, null);

        mDcTracker = new DcTracker(this);

        mDcTracker = TelephonyPluginDelegate.getInstance().makeDcTracker(this);

        mRuimPhoneBookInterfaceManager = new RuimPhoneBookInterfaceManager(this);

        mSubInfo = new PhoneSubInfo(this);

        mEriManager = new EriManager(this, context, EriManager.ERI_FROM_XML);

src/java/com/android/internal/telephony/dataconnection/ApnSetting.java

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ public class ApnSetting { 
    public final String user;

    public final String password;

    public final int authType;

    public final String[] types;

    public String[] types;

    public final int id;

    public final String numeric;

    public final String protocol;

src/java/com/android/internal/telephony/dataconnection/DcRetryAlarmController.java

+2 −1
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ public class DcRetryAlarmController { 
        Intent intent = new Intent(mActionRetry);

        intent.putExtra(INTENT_RETRY_ALARM_WHAT, what);

        intent.putExtra(INTENT_RETRY_ALARM_TAG, tag);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);



        if (DBG) {

            log("startRetryAlarm: next attempt in " + (delay / 1000) + "s" +
@@ -148,7 +149,7 @@ public class DcRetryAlarmController { 


        PendingIntent retryIntent = PendingIntent.getBroadcast (mPhone.getContext(), 0,

                                        intent, PendingIntent.FLAG_UPDATE_CURRENT);

        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,

        mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                SystemClock.elapsedRealtime() + delay, retryIntent);

    }

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+18 −16
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ import com.android.internal.telephony.ServiceStateTracker; 
/**

 * {@hide}

 */

public final class DcTracker extends DcTrackerBase {

    protected final String LOG_TAG = "DCT";

public class DcTracker extends DcTrackerBase {

    protected String LOG_TAG = "DCT";



    /**

     * List of messages that are waiting to be posted, when data call disconnect
@@ -825,7 +825,7 @@ public final class DcTracker extends DcTrackerBase { 
        ONLY_ON_CHANGE

    };



    private void setupDataOnConnectableApns(String reason) {

    protected void setupDataOnConnectableApns(String reason) {

        setupDataOnConnectableApns(reason, RetryFailures.ALWAYS);

    }
@@ -1237,7 +1237,7 @@ public final class DcTracker extends DcTrackerBase { 
        return apn;

    }



    private ArrayList<ApnSetting> createApnList(Cursor cursor) {

    protected ArrayList<ApnSetting> createApnList(Cursor cursor) {

        ArrayList<ApnSetting> mnoApns = new ArrayList<ApnSetting>();

        ArrayList<ApnSetting> mvnoApns = new ArrayList<ApnSetting>();

        IccRecords r = mIccRecords.get();
@@ -1388,7 +1388,7 @@ public final class DcTracker extends DcTrackerBase { 
        tryRestartDataConnections(Phone.REASON_APN_CHANGED);

    }



    private void tryRestartDataConnections(String reason) {

    protected void tryRestartDataConnections(String reason) {

        DctConstants.State overallState = getOverallState();

        boolean isDisconnected = (overallState == DctConstants.State.IDLE ||

                overallState == DctConstants.State.FAILED);
@@ -1510,6 +1510,7 @@ public final class DcTracker extends DcTrackerBase { 
        String apnType = apnContext.getApnType();



        Intent intent = new Intent(INTENT_RECONNECT_ALARM + "." + apnType);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.putExtra(INTENT_RECONNECT_ALARM_EXTRA_REASON, apnContext.getReason());

        intent.putExtra(INTENT_RECONNECT_ALARM_EXTRA_TYPE, apnType);
@@ -1525,13 +1526,14 @@ public final class DcTracker extends DcTrackerBase { 
        PendingIntent alarmIntent = PendingIntent.getBroadcast (mPhone.getContext(), 0,

                                        intent, PendingIntent.FLAG_UPDATE_CURRENT);

        apnContext.setReconnectIntent(alarmIntent);

        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,

        mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                SystemClock.elapsedRealtime() + delay, alarmIntent);

    }



    private void startAlarmForRestartTrySetup(int delay, ApnContext apnContext) {

        String apnType = apnContext.getApnType();

        Intent intent = new Intent(INTENT_RESTART_TRYSETUP_ALARM + "." + apnType);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.putExtra(INTENT_RESTART_TRYSETUP_ALARM_EXTRA_TYPE, apnType);



        if (DBG) {
@@ -1541,7 +1543,7 @@ public final class DcTracker extends DcTrackerBase { 
        PendingIntent alarmIntent = PendingIntent.getBroadcast (mPhone.getContext(), 0,

                                        intent, PendingIntent.FLAG_UPDATE_CURRENT);

        apnContext.setReconnectIntent(alarmIntent);

        mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,

        mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                SystemClock.elapsedRealtime() + delay, alarmIntent);

    }
@@ -1554,7 +1556,7 @@ public final class DcTracker extends DcTrackerBase { 
        }

    }



    private void onRecordsLoaded() {

    protected void onRecordsLoaded() {

        if (DBG) log("onRecordsLoaded: createAllApnList");

        mAutoAttachOnCreationConfig = mPhone.getContext().getResources()

                .getBoolean(com.android.internal.R.bool.config_auto_attach_data_on_creation);
@@ -2343,7 +2345,7 @@ public final class DcTracker extends DcTrackerBase { 
     * Returns mccmnc for data call either from cdma_home_operator or from IccRecords

     * @return operator numeric

     */

    private String getOperatorNumeric() {

    protected String getOperatorNumeric() {

        String result;

        if (isNvSubscription()) {

            result = SystemProperties.get(CDMAPhone.PROPERTY_CDMA_HOME_OPERATOR_NUMERIC);
@@ -2360,7 +2362,7 @@ public final class DcTracker extends DcTrackerBase { 
     * Based on the operator numeric, create a list for all possible

     * Data Connections and setup the preferredApn.

     */

    private void createAllApnList() {

    protected void createAllApnList() {

        mAllApnSettings = new ArrayList<ApnSetting>();

        String operator = getOperatorNumeric();

        if (operator != null && !operator.isEmpty()) {
@@ -2408,7 +2410,7 @@ public final class DcTracker extends DcTrackerBase { 
        setDataProfilesAsNeeded();

    }



    private void dedupeApnSettings() {

    protected void dedupeApnSettings() {

        ArrayList<ApnSetting> resultApns = new ArrayList<ApnSetting>();



        // coalesce APNs if they are similar enough to prevent
@@ -2518,7 +2520,7 @@ public final class DcTracker extends DcTrackerBase { 
                dest.maxConnsTime, dest.mtu, dest.mvnoType, dest.mvnoMatchData);

    }



    private boolean isDummyProfileNeeded() {

    protected boolean isDummyProfileNeeded() {

        int radioTech = mPhone.getServiceState().getRilDataRadioTechnology();

        int radioTechFam = UiccController.getFamilyFromRadioTechnology(radioTech);

        IccRecords r = mIccRecords.get();
@@ -2530,7 +2532,7 @@ public final class DcTracker extends DcTrackerBase { 
                (r != null) && (r instanceof RuimRecords)));

    }



    private void addDummyApnSettings(String operator) {

    protected void addDummyApnSettings(String operator) {

        // Create dummy data profiles.

        if (DBG) log("createAllApnList: Creating dummy apn for cdma operator:" + operator);

        String[] defaultApnTypes = {
@@ -2690,7 +2692,7 @@ public final class DcTracker extends DcTrackerBase { 
        return result.toString();

    }



    private void setPreferredApn(int pos) {

    protected void setPreferredApn(int pos) {

        if (!mCanSetPreferApn) {

            log("setPreferredApn: X !canSEtPreferApn");

            return;
@@ -2710,7 +2712,7 @@ public final class DcTracker extends DcTrackerBase { 
        }

    }



    private ApnSetting getPreferredApn() {

    protected ApnSetting getPreferredApn() {

        if (mAllApnSettings == null || mAllApnSettings.isEmpty()) {

            log("getPreferredApn: mAllApnSettings is " + ((mAllApnSettings == null)?"null":"empty"));

            return null;
@@ -3196,7 +3198,7 @@ public final class DcTracker extends DcTrackerBase { 
    /**

     * Add the Emergency APN settings to APN settings list

     */

    private void addEmergencyApnSetting() {

    protected void addEmergencyApnSetting() {

        if(mEmergencyApn != null) {

            if(mAllApnSettings == null) {

                mAllApnSettings = new ArrayList<ApnSetting>();