Merge "Remove network subtype check when building template."

jsharkey · Android (Google) Code Review · commit 561d7a43c15e · 2012-03-16T11:58:39.000-07:00
diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java
@@ -78,7 +78,6 @@ public static NetworkTemplate buildTemplateMobileAll(String subscriberId) {
      * uses statistics for requested IMSI.
      */
     public static NetworkTemplate buildTemplateMobile3gLower(String subscriberId) {
-        ensureSubtypeAvailable();
         return new NetworkTemplate(MATCH_MOBILE_3G_LOWER, subscriberId);
     }
 
@@ -88,7 +87,6 @@ public static NetworkTemplate buildTemplateMobile3gLower(String subscriberId) {
      * requested IMSI.
      */
     public static NetworkTemplate buildTemplateMobile4g(String subscriberId) {
-        ensureSubtypeAvailable();
         return new NetworkTemplate(MATCH_MOBILE_4G, subscriberId);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ public static NetworkTemplate buildTemplateMobileAll(String subscriberId) {`
`78`	`78`	`* uses statistics for requested IMSI.`
`79`	`79`	`*/`
`80`	`80`	`public static NetworkTemplate buildTemplateMobile3gLower(String subscriberId) {`
`81`		`- ensureSubtypeAvailable();`
`82`	`81`	`return new NetworkTemplate(MATCH_MOBILE_3G_LOWER, subscriberId);`
`83`	`82`	`}`
`84`	`83`
`@@ -88,7 +87,6 @@ public static NetworkTemplate buildTemplateMobile3gLower(String subscriberId) {`
`88`	`87`	`* requested IMSI.`
`89`	`88`	`*/`
`90`	`89`	`public static NetworkTemplate buildTemplateMobile4g(String subscriberId) {`
`91`		`- ensureSubtypeAvailable();`
`92`	`90`	`return new NetworkTemplate(MATCH_MOBILE_4G, subscriberId);`
`93`	`91`	`}`
`94`	`92`