am 791b4ad3: am 64e68657: am a1ca4ed1: Merge "API Review PhoneManager -> TelecommManager. Rename methods (3/6)" into lmp-dev
* commit '791b4ad3869a9de4350bb4f61bdc590b946da988':
API Review PhoneManager -> TelecommManager. Rename methods (3/6)
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index bff75fb..9a09647 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -37,9 +37,8 @@
import android.os.UserHandle;
import android.os.storage.IMountService;
import android.os.storage.StorageManager;
-
-import android.phone.PhoneManager;
import android.provider.Settings;
+import android.telecomm.TelecommManager;
import android.telephony.TelephonyManager;
import android.text.Editable;
import android.text.TextUtils;
@@ -888,7 +887,7 @@
}
int textId;
- if (getPhoneManager().isInAPhoneCall()) {
+ if (getTelecommManager().isInCall()) {
// Show "return to call"
textId = R.string.cryptkeeper_return_to_call;
} else {
@@ -902,9 +901,9 @@
}
private void takeEmergencyCallAction() {
- PhoneManager phoneManager = getPhoneManager();
- if (phoneManager.isInAPhoneCall()) {
- phoneManager.showCallScreen(false /* showDialpad */);
+ TelecommManager telecommManager = getTelecommManager();
+ if (telecommManager.isInCall()) {
+ telecommManager.showInCallScreen(false /* showDialpad */);
} else {
launchEmergencyDialer();
}
@@ -923,8 +922,8 @@
return (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
}
- private PhoneManager getPhoneManager() {
- return (PhoneManager) getSystemService(Context.PHONE_SERVICE);
+ private TelecommManager getTelecommManager() {
+ return (TelecommManager) getSystemService(Context.TELECOMM_SERVICE);
}
/**