Merge "Revert behavior of isVoiceCapable" into main (f5762ff6) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -7080,7 +7080,8 @@ public class TelephonyManager {
		*/
		@Deprecated
		public boolean isVoiceCapable() {
		return hasCapability(PackageManager.FEATURE_TELEPHONY_CALLING,
		if (mContext == null) return true;
		return mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_voice_capable);
		}

		@@ -7104,7 +7105,8 @@ public class TelephonyManager {
		* @see SubscriptionInfo#getServiceCapabilities()
		*/
		public boolean isDeviceVoiceCapable() {
		return isVoiceCapable();
		return hasCapability(PackageManager.FEATURE_TELEPHONY_CALLING,
		com.android.internal.R.bool.config_voice_capable);
		}

		/**