Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2df1cc43: Merge change I42a80783 into eclair

Browse Source 
Merge commit '2df1cc437793d50609c575881c04cc2c63d0bd97' into eclair-plus-aosp

* commit '2df1cc437793d50609c575881c04cc2c63d0bd97':
  Remove deprecated VpnType.getDescription().
This commit is contained in:
Hung-ying Tyan
2009-09-30 03:50:30 -07:00
committed by Android Git Automerger
parent 2f208646eb 2df1cc4377
commit 4c0d406d56
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/AndroidTests/src/com/android/unit_tests/VpnTest.java
View File

@@ -130,7 +130,6 @@ public class VpnTest extends AndroidTestCase {
private void testVpnType(VpnType type) { private void testVpnType(VpnType type) {
assertFalse(TextUtils.isEmpty(type.getDisplayName())); assertFalse(TextUtils.isEmpty(type.getDisplayName()));
assertNotNull(type.getDescription());
assertNotNull(type.getProfileClass()); assertNotNull(type.getProfileClass());
} }

4
vpn/java/android/net/vpn/VpnType.java
View File

@@ -49,10 +49,6 @@ public enum VpnType {
return mDescriptionId; return mDescriptionId;
} }
public String getDescription() {
return "";
}
public Class<? extends VpnProfile> getProfileClass() { public Class<? extends VpnProfile> getProfileClass() {
return mClass; return mClass;
} }