diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2009-09-30 03:50:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-30 03:50:30 -0700 |
| commit | 4c0d406d56894037df7669064e1d67b4f51cdb6d (patch) | |
| tree | f23039914a2d3dfa41807a68591c7814d326d196 /tests | |
| parent | 2f208646ebe7579c2b8694c66d55f8c883df0ec3 (diff) | |
| parent | 2df1cc437793d50609c575881c04cc2c63d0bd97 (diff) | |
| download | frameworks_base-4c0d406d56894037df7669064e1d67b4f51cdb6d.zip frameworks_base-4c0d406d56894037df7669064e1d67b4f51cdb6d.tar.gz frameworks_base-4c0d406d56894037df7669064e1d67b4f51cdb6d.tar.bz2 | |
am 2df1cc43: Merge change I42a80783 into eclair
Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp
* commit '2df1cc437793d50609c575881c04cc2c63d0bd97':
Remove deprecated VpnType.getDescription().
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/AndroidTests/src/com/android/unit_tests/VpnTest.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/VpnTest.java b/tests/AndroidTests/src/com/android/unit_tests/VpnTest.java index 67fcd61..cb64293 100755 --- a/tests/AndroidTests/src/com/android/unit_tests/VpnTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/VpnTest.java @@ -130,7 +130,6 @@ public class VpnTest extends AndroidTestCase { private void testVpnType(VpnType type) { assertFalse(TextUtils.isEmpty(type.getDisplayName())); - assertNotNull(type.getDescription()); assertNotNull(type.getProfileClass()); } |