Merge "Revert "Hide voice interaction APIs.""
diff --git a/api/current.txt b/api/current.txt
index cfc67c9..b2fe641 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22960,6 +22960,7 @@
field public static final java.lang.String CONTACT_LAST_UPDATED_TIMESTAMP = "contact_last_updated_timestamp";
field public static final java.lang.String DISPLAY_NAME = "display_name";
field public static final java.lang.String HAS_PHONE_NUMBER = "has_phone_number";
+ field public static final java.lang.String IN_DEFAULT_DIRECTORY = "in_default_directory";
field public static final java.lang.String IN_VISIBLE_GROUP = "in_visible_group";
field public static final java.lang.String IS_USER_PROFILE = "is_user_profile";
field public static final java.lang.String LOOKUP_KEY = "lookup";
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 11678a6..b53ea81 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -903,8 +903,6 @@
/**
* Flag that reflects whether the contact exists inside the default directory.
* Ie, whether the contact is designed to only be visible outside search.
- *
- * @hide
*/
public static final String IN_DEFAULT_DIRECTORY = "in_default_directory";
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index ef9c711..252c0bb 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -2312,7 +2312,6 @@
}
}
checkReadyForSleepLocked();
- setLockTaskModeLocked(null);
}
boolean shutdownLocked(int timeout) {
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index 292f844..769d974 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -400,8 +400,14 @@
/** @hide */
public static final int AUTO_JOIN_ENABLED = 0;
+ /** @hide
+ * if this is set, the WifiConfiguration cannot use linkages so as to bump
+ * it's relative priority.
+ * */
+ public static final int AUTO_JOIN_TEMPORARY_DISABLED = 1;
/** @hide */
- public static final int AUTO_JOIN_DISABLED_ON_AUTH_FAILURE = 1;
+ public static final int AUTO_JOIN_DISABLED_ON_AUTH_FAILURE = 2;
+
/**
* @hide
*/