summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorPrerepa Viswanadham <dham@google.com>2015-05-05 01:05:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-05 01:06:38 +0000
commitd1808401ca3bfd6b6b9a975c1e739b194d18f849 (patch)
tree50c16a5c966772fd3b3ac4f7d2e79c97252935c7 /wifi
parent44b60be189183138437a3faf9a73388af0efcf44 (diff)
parent059ded5a7b7389b7eefc2502bd712228931ed107 (diff)
downloadframeworks_base-d1808401ca3bfd6b6b9a975c1e739b194d18f849.zip
frameworks_base-d1808401ca3bfd6b6b9a975c1e739b194d18f849.tar.gz
frameworks_base-d1808401ca3bfd6b6b9a975c1e739b194d18f849.tar.bz2
Merge changes from topic 'mwd-merge-050415' into mnc-dev
* changes: Merge commit 'b6f59f4' into master_merge Merge commit 'f6db0ce' into master_merge Merge commit '17455a3' into master_merge Merge commit 'b4d5b32' into master_merge Merge commit 'a1a2fa7' into master_merge Merge commit '8dfdb98' into master_merge Merge commit 'eba66c3' into master_merge
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/RttManager.java2
-rw-r--r--wifi/java/android/net/wifi/WifiConfiguration.java2
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 {