summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/CryptKeeper.java
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-09-10 15:21:33 -0700
committerTyler Gunn <tgunn@google.com>2014-09-12 20:22:25 -0700
commit3e71b197f7f85c5045a083ecc532954958807be6 (patch)
treeff7a90fc2988313037a3d8e1ef6befd9fd553696 /src/com/android/settings/CryptKeeper.java
parentc64c9808b9ba74063f0a59e3b7b11e4c3d15680a (diff)
downloadpackages_apps_Settings-3e71b197f7f85c5045a083ecc532954958807be6.zip
packages_apps_Settings-3e71b197f7f85c5045a083ecc532954958807be6.tar.gz
packages_apps_Settings-3e71b197f7f85c5045a083ecc532954958807be6.tar.bz2
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
Diffstat (limited to 'src/com/android/settings/CryptKeeper.java')
-rw-r--r--src/com/android/settings/CryptKeeper.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 7e92cc6..90f9f54 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -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);
}
/**