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

Commit f889d7da authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Delete PhoneBase and PhoneProxy." into nyc-dev

parents 0884e25c 0f7d1220

src/java/com/android/internal/telephony/PhoneBase.java

deleted100644 → 0
+0 −33
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.telephony;



import android.content.Context;



/**

 * TEMPORARY DUMMY CLASS. GET RID OF IT ONCE VENDOR SPECIFIC CODE STOPS USING IT.

 *

 *  {@hide}

 *

 */



public class PhoneBase extends GsmCdmaPhone {

    public PhoneBase(Context context, CommandsInterface ci, PhoneNotifier notifier, int phoneId,

                     int precisePhoneType, TelephonyComponentFactory telephonyComponentFactory) {

        super(context, ci, notifier, phoneId, precisePhoneType, telephonyComponentFactory);

    }

}
 
 No newline at end of file

src/java/com/android/internal/telephony/PhoneFactory.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -161,12 +161,12 @@ public class PhoneFactory { 
                    Phone phone = null;

                    Phone phone = null;

                    int phoneType = TelephonyManager.getPhoneType(networkModes[i]);

                    int phoneType = TelephonyManager.getPhoneType(networkModes[i]);

                    if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {

                    if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {

                        phone = new PhoneProxy(context,

                        phone = new GsmCdmaPhone(context,

                                sCommandsInterfaces[i], sPhoneNotifier, i,

                                sCommandsInterfaces[i], sPhoneNotifier, i,

                                PhoneConstants.PHONE_TYPE_GSM,

                                PhoneConstants.PHONE_TYPE_GSM,

                                TelephonyComponentFactory.getInstance());

                                TelephonyComponentFactory.getInstance());

                    } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {

                    } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {

                        phone = new PhoneProxy(context,

                        phone = new GsmCdmaPhone(context,

                                sCommandsInterfaces[i], sPhoneNotifier, i,

                                sCommandsInterfaces[i], sPhoneNotifier, i,

                                PhoneConstants.PHONE_TYPE_CDMA_LTE,

                                PhoneConstants.PHONE_TYPE_CDMA_LTE,

                                TelephonyComponentFactory.getInstance());

                                TelephonyComponentFactory.getInstance());

src/java/com/android/internal/telephony/PhoneProxy.java

deleted100644 → 0
+0 −37
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.telephony;



import android.content.Context;



/**

 * TEMPORARY DUMMY CLASS. GET RID OF IT ONCE VENDOR SPECIFIC CODE STOPS USING IT.

 *

 *  {@hide}

 *

 */



public class PhoneProxy extends PhoneBase {

    public PhoneProxy(Context context, CommandsInterface ci, PhoneNotifier notifier, int phoneId,

                      int precisePhoneType, TelephonyComponentFactory telephonyComponentFactory) {

        super(context, ci, notifier, phoneId, precisePhoneType, telephonyComponentFactory);

    }



    public Phone getActivePhone() {

        return this;

    }

}
 
 No newline at end of file

tests/telephonytests/src/com/android/internal/telephony/mocks/SubscriptionControllerMock.java

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

import com.android.internal.telephony.ISub;

import com.android.internal.telephony.ITelephonyRegistry;

import com.android.internal.telephony.ITelephonyRegistry;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneBase;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.SubscriptionController;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyIntents;