Merge "API review PhoneManager -> TelecommManager. Rename methods (6/6)" into lmp-dev (e4b1d57d) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −12

Original line number	Diff line number	Diff line
		@@ -7353,7 +7353,6 @@ package android.content {
		field public static final java.lang.String NFC_SERVICE = "nfc";
		field public static final java.lang.String NOTIFICATION_SERVICE = "notification";
		field public static final java.lang.String NSD_SERVICE = "servicediscovery";
		field public static final java.lang.String PHONE_SERVICE = "phone_service";
		field public static final java.lang.String POWER_SERVICE = "power";
		field public static final java.lang.String PRINT_SERVICE = "print";
		field public static final java.lang.String RESTRICTIONS_SERVICE = "restrictions";
		@@ -22768,17 +22767,6 @@ package android.os.storage {

		}

		package android.phone {

		public final class PhoneManager {
		method public void cancelMissedCallsNotification();
		method public boolean handlePinMmi(java.lang.String);
		method public boolean isInAPhoneCall();
		method public void showCallScreen(boolean);
		}

		}

		package android.preference {

		public class CheckBoxPreference extends android.preference.TwoStatePreference {
		@@ -28758,12 +28746,16 @@ package android.telecomm {

		public class TelecommManager {
		method public void addNewIncomingCall(android.telecomm.PhoneAccountHandle, android.os.Bundle);
		method public void cancelMissedCallsNotification();
		method public void clearAccounts(java.lang.String);
		method public android.telecomm.PhoneAccountHandle getDefaultOutgoingPhoneAccount();
		method public java.util.List<android.telecomm.PhoneAccountHandle> getEnabledPhoneAccounts();
		method public android.telecomm.PhoneAccount getPhoneAccount(android.telecomm.PhoneAccountHandle);
		method public boolean handleMmi(java.lang.String);
		method public boolean hasMultipleEnabledAccounts();
		method public boolean isInCall();
		method public void registerPhoneAccount(android.telecomm.PhoneAccount);
		method public void showInCallScreen(boolean);
		method public void unregisterPhoneAccount(android.telecomm.PhoneAccountHandle);
		field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.intent.action.CONNECTION_SERVICE_CONFIGURE";
		field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecomm.intent.action.SHOW_CALL_SETTINGS";

core/java/android/app/ContextImpl.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -122,7 +122,6 @@ import android.os.SystemVibrator;
		import android.os.UserManager;
		import android.os.storage.IMountService;
		import android.os.storage.StorageManager;
		import android.phone.PhoneManager;
		import android.print.IPrintManager;
		import android.print.PrintManager;
		import android.service.fingerprint.IFingerprintService;
		@@ -570,11 +569,6 @@ class ContextImpl extends Context {
		return new TelecommManager(ctx.getOuterContext());
		}});

		registerService(PHONE_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return new PhoneManager(ctx.getOuterContext());
		}});

		registerService(UI_MODE_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		return new UiModeManager();

core/java/android/content/Context.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -2203,8 +2203,6 @@ public abstract class Context {
		* @see android.media.MediaRouter
		* @see #TELEPHONY_SERVICE
		* @see android.telephony.TelephonyManager
		* @see #PHONE_SERVICE
		* @see android.phone.PhoneManager
		* @see #INPUT_METHOD_SERVICE
		* @see android.view.inputmethod.InputMethodManager
		* @see #UI_MODE_SERVICE
		@@ -2556,16 +2554,6 @@ public abstract class Context {
		*/
		public static final String TELECOMM_SERVICE = "telecomm";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.phone.PhoneManager} to manage phone-related features
		* of the device.
		*
		* @see #getSystemService
		* @see android.phone.PhoneManager
		*/
		public static final String PHONE_SERVICE = "phone_service"; // "phone" used by telephony.

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.text.ClipboardManager} for accessing and modifying

core/java/com/android/internal/widget/LockPatternUtils.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ import android.os.SystemClock;
		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.text.TextUtils;
		import android.util.Log;
		import android.view.IWindowManager;
		@@ -1440,7 +1440,7 @@ public class LockPatternUtils {
		}

		int textId;
		if (getPhoneManager().isInAPhoneCall()) {
		if (getTelecommManager().isInCall()) {
		// show "return to call" text and show phone icon
		textId = R.string.lockscreen_return_to_call;
		int phoneCallIcon = showIcon ? R.drawable.stat_sys_phone_call : 0;
		@@ -1458,11 +1458,11 @@ public class LockPatternUtils {
		* on various lockscreens.
		*/
		public void resumeCall() {
		getPhoneManager().showCallScreen(false);
		getTelecommManager().showInCallScreen(false);
		}

		private PhoneManager getPhoneManager() {
		return (PhoneManager) mContext.getSystemService(Context.PHONE_SERVICE);
		private TelecommManager getTelecommManager() {
		return (TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE);
		}

		private void finishBiometricWeak() {

media/java/android/media/AudioService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -2912,13 +2912,13 @@ public class AudioService extends IAudioService.Stub {
		}

		private boolean isInCommunication() {
		boolean isInAPhoneCall = false;
		boolean IsInCall = false;

		TelecommManager telecommManager =
		(TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE);
		isInAPhoneCall = telecommManager.isInAPhoneCall();
		IsInCall = telecommManager.isInCall();

		return (isInAPhoneCall \|\| getMode() == AudioManager.MODE_IN_COMMUNICATION);
		return (IsInCall \|\| getMode() == AudioManager.MODE_IN_COMMUNICATION);
		}

		/**