summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hugo Benichi <hugobenichi@google.com> 2017-06-22 08:03:46 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-22 08:03:46 +0000
commitec7447b291e083e8fdeb40cb5759420f8941ee7c (patch)
tree75e842c98095d96ca7d615f1a165f23df600e488
parent8a4667b911a53b0a73ef249f120dbfad4969b72b (diff)
parentec54a403396062a812aee22eb67b218f0b8ff681 (diff)
Merge "ConnectivityManager: fix style issue" am: e74f3adba5
am: ec54a40339 Change-Id: I5a420534268a0daec19f1f0677dcfe7abd8faf73
-rw-r--r--core/java/android/net/ConnectivityManager.java4
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();
/**