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

Commit 3e71b197 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Renaming Telecomm to Telecom. 

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb
parent c64c9808

src/com/android/settings/CryptKeeper.java

+7 −7
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import android.os.UserHandle; 
import android.os.storage.IMountService;

import android.os.storage.StorageManager;

import android.provider.Settings;

import android.telecomm.TelecommManager;

import android.telecom.TelecomManager;

import android.telephony.TelephonyManager;

import android.text.Editable;

import android.text.TextUtils;
@@ -892,7 +892,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
        }



        int textId;

        if (getTelecommManager().isInCall()) {

        if (getTelecomManager().isInCall()) {

            // Show "return to call"

            textId = R.string.cryptkeeper_return_to_call;

        } else {
@@ -906,9 +906,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
    }



    private void takeEmergencyCallAction() {

        TelecommManager telecommManager = getTelecommManager();

        if (telecommManager.isInCall()) {

            telecommManager.showInCallScreen(false /* showDialpad */);

        TelecomManager telecomManager = getTelecomManager();

        if (telecomManager.isInCall()) {

            telecomManager.showInCallScreen(false /* showDialpad */);

        } else {

            launchEmergencyDialer();

        }
@@ -927,8 +927,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList 
        return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);

    }



    private TelecommManager getTelecommManager() {

        return (TelecommManager) getSystemService(Context.TELECOMM_SERVICE);

    private TelecomManager getTelecomManager() {

        return (TelecomManager) getSystemService(Context.TELECOM_SERVICE);

    }



    /**

src/com/android/settings/sim/SimSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ import android.preference.PreferenceScreen; 
import android.telephony.SubInfoRecord;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telecomm.PhoneAccount;

import android.telecom.PhoneAccount;

import android.telephony.CellInfo;

import android.text.TextUtils;

import android.util.Log;