diff options
| -rw-r--r-- | docs/html/google/play/licensing/adding-licensing.jd | 8 | ||||
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/docs/html/google/play/licensing/adding-licensing.jd b/docs/html/google/play/licensing/adding-licensing.jd index f991e147ed8d..3f2460fbd15b 100644 --- a/docs/html/google/play/licensing/adding-licensing.jd +++ b/docs/html/google/play/licensing/adding-licensing.jd @@ -598,15 +598,15 @@ href="#impl-Obfuscator">Obfuscator</a> implementation. </p> <p>First, open the class file of the application's main Activity and import {@code LicenseChecker} and {@code LicenseCheckerCallback} from the LVL package.</p> -<pre> import com.android.vending.licensing.LicenseChecker; - import com.android.vending.licensing.LicenseCheckerCallback;</pre> +<pre> import com.google.android.vending.licensing.LicenseChecker; + import com.google.android.vending.licensing.LicenseCheckerCallback;</pre> <p>If you are using the default {@code Policy} implementation provided with the LVL, ServerManagedPolicy, import it also, together with the AESObfuscator. If you are using a custom {@code Policy} or {@code Obfuscator}, import those instead. </p> -<pre> import com.android.vending.licensing.ServerManagedPolicy; - import com.android.vending.licensing.AESObfuscator;</pre> +<pre> import com.google.android.vending.licensing.ServerManagedPolicy; + import com.google.android.vending.licensing.AESObfuscator;</pre> <h3 id="lc-impl">Implement LicenseCheckerCallback as a private inner class</h3> diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 027f0f39a817..c83a919efa60 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1413,11 +1413,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { } private boolean addRoute(LinkProperties p, RouteInfo r, boolean toDefaultTable) { - return modifyRoute(p.getInterfaceName(), p, r, 0, ADD, toDefaultTable); + return modifyRoute(p, r, 0, ADD, toDefaultTable); } private boolean removeRoute(LinkProperties p, RouteInfo r, boolean toDefaultTable) { - return modifyRoute(p.getInterfaceName(), p, r, 0, REMOVE, toDefaultTable); + return modifyRoute(p, r, 0, REMOVE, toDefaultTable); } private boolean addRouteToAddress(LinkProperties lp, InetAddress addr) { @@ -1444,11 +1444,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { bestRoute = RouteInfo.makeHostRoute(addr, bestRoute.getGateway(), iface); } } - return modifyRoute(lp.getInterfaceName(), lp, bestRoute, 0, doAdd, toDefaultTable); + return modifyRoute(lp, bestRoute, 0, doAdd, toDefaultTable); } - private boolean modifyRoute(String ifaceName, LinkProperties lp, RouteInfo r, int cycleCount, - boolean doAdd, boolean toDefaultTable) { + private boolean modifyRoute(LinkProperties lp, RouteInfo r, int cycleCount, boolean doAdd, + boolean toDefaultTable) { + String ifaceName = lp.getInterfaceName(); if ((ifaceName == null) || (lp == null) || (r == null)) { if (DBG) log("modifyRoute got unexpected null: " + ifaceName + ", " + lp + ", " + r); return false; @@ -1472,7 +1473,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { bestRoute.getGateway(), ifaceName); } - modifyRoute(ifaceName, lp, bestRoute, cycleCount+1, doAdd, toDefaultTable); + modifyRoute(lp, bestRoute, cycleCount+1, doAdd, toDefaultTable); } } if (doAdd) { |