PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3e71b197: Renaming Telecomm to Telecom.

Browse Source 
* commit '3e71b197f7f85c5045a083ecc532954958807be6':
  Renaming Telecomm to Telecom.
This commit is contained in:
Tyler Gunn
2014-09-13 20:12:59 +00:00
committed by Android Git Automerger
parent 7f4c4fb5b6 3e71b197f7
commit 86e452f957
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/CryptKeeper.java
View File

@@ -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);
}
/**

2
src/com/android/settings/sim/SimSettings.java
View File

@@ -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;