diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-05-01 10:12:11 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-05-01 10:12:11 -0700 |
| commit | b6f9da0b7f26b50163461a767cafcd8014328742 (patch) | |
| tree | 0b03f879e1dd004edbfa15510500a110e91eb194 /wifi/java/android | |
| parent | 9dc9c87aadc94c5d35675cc5bfe9e72c5daab885 (diff) | |
| parent | 17455a3d39350a39eb995897929977d793358365 (diff) | |
| download | frameworks_base-b6f9da0b7f26b50163461a767cafcd8014328742.zip frameworks_base-b6f9da0b7f26b50163461a767cafcd8014328742.tar.gz frameworks_base-b6f9da0b7f26b50163461a767cafcd8014328742.tar.bz2 | |
Merge commit '17455a3' into master_merge
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/RttManager.java | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/RttManager.java b/wifi/java/android/net/wifi/RttManager.java index d2fb0dd..dde8dba 100644 --- a/wifi/java/android/net/wifi/RttManager.java +++ b/wifi/java/android/net/wifi/RttManager.java @@ -134,6 +134,8 @@ public class RttManager { public static final int REASON_NOT_AVAILABLE = -2; public static final int REASON_INVALID_LISTENER = -3; public static final int REASON_INVALID_REQUEST = -4; + /** Do not have required permission */ + public static final int REASON_PERMISSION_DENIED = -5; public static final String DESCRIPTION_KEY = "android.net.wifi.RttManager.Description"; diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index b731316..a38a96e 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -926,7 +926,7 @@ public class WifiConfiguration implements Parcelable { public boolean isValid() { String reason = strIsValid(); if (reason != null) { - Log.e("WFII", "WiFi Config not valid: " + reason); + Log.e(TAG, "WiFi Config not valid: " + reason); return false; } else { |