Merge "World Phone Support in testTelephonyFeatures" into froyo
diff --git a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
index 31aab6d..dcc45c3 100644
--- a/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
+++ b/tests/tests/media/src/android/media/cts/RingtoneManagerTest.java
@@ -63,9 +63,7 @@
mOriginalVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_RING);
mDefaultUri = RingtoneManager.getActualDefaultRingtoneUri(mContext,
RingtoneManager.TYPE_RINGTONE);
- // set ringer to a reasonable volume
- int maxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_RING);
- mAudioManager.setStreamVolume(AudioManager.STREAM_RING, maxVolume / 2,
+ mAudioManager.adjustStreamVolume(AudioManager.STREAM_RING, AudioManager.ADJUST_RAISE,
AudioManager.FLAG_ALLOW_RINGER_MODES);
}
diff --git a/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java b/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java
index 5e45e67..dad3dd6 100644
--- a/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/PhoneNumberUtilsTest.java
@@ -282,12 +282,6 @@
intent = new Intent(Intent.ACTION_DIAL, Uri.parse("tel:+18005555555"));
assertEquals("+18005555555", PhoneNumberUtils.getNumberFromIntent(intent, getContext()));
- intent = new Intent(Intent.ACTION_DIAL, Uri.parse("voicemail:"));
- TelephonyManager tm =
- (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
- assertEquals(tm.getVoiceMailNumber(),
- PhoneNumberUtils.getNumberFromIntent(intent, getContext()));
-
ContentResolver cr = getContext().getContentResolver();
Uri personRecord = null;
Uri phoneRecord = null;