diff options
| author | 2017-06-22 19:48:06 +0000 | |
|---|---|---|
| committer | 2017-06-22 19:48:19 +0000 | |
| commit | 83ae6653ca2b92f549a550bf4b6be0ccee74f00d (patch) | |
| tree | 2dbc08ddf1ec6575c37ec1b67659e1b66147101d | |
| parent | 2693dd810d4c3d96582a6458ddabe8a28924db9f (diff) | |
| parent | 2a3992248a292bb80d87cb89421113964c023056 (diff) | |
Merge "Merge "ConnectivityManager: fix style issue" am: e74f3adba5 am: ec54a40339 am: ec7447b291" into oc-dr1-dev-plus-aosp
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index f47807142376..511466ae01c3 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -599,7 +599,7 @@ public class ConnectivityManager { /** * @hide */ - public final static int REQUEST_ID_UNSET = 0; + public static final int REQUEST_ID_UNSET = 0; /** * Static unique request used as a tombstone for NetworkCallbacks that have been unregistered. @@ -607,7 +607,7 @@ public class ConnectivityManager { * registered and those that were already unregistered. * @hide */ - private final static NetworkRequest ALREADY_UNREGISTERED = + private static final NetworkRequest ALREADY_UNREGISTERED = new NetworkRequest.Builder().clearCapabilities().build(); /** |