From 7bd553fc119e12a64dccce7b2846ec76a3478353 Mon Sep 17 00:00:00 2001 From: Anthony Lee Date: Fri, 15 May 2015 16:22:39 -0700 Subject: [PATCH 1/6] Add Carrier Presence to CP2: Phone Carrier Presence (RCS-based) is required for IMS-based telephony services: VoLTE, WFC, and VT (Video Telephony). Public API in the form of Presence column is added to Phone. Initial bit-field is defined for for VT capability. Change-Id: Ice78f895acf89a91f7478115e64caeb8d26f5456 --- api/current.txt | 2 ++ api/system-current.txt | 2 ++ core/java/android/provider/ContactsContract.java | 15 +++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/api/current.txt b/api/current.txt index 704db3134e66c..d187675e109c8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24457,6 +24457,8 @@ package android.provider { } protected static abstract interface ContactsContract.DataColumns { + field public static final java.lang.String CARRIER_PRESENCE = "carrier_presence"; + field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1 field public static final java.lang.String DATA1 = "data1"; field public static final java.lang.String DATA10 = "data10"; field public static final java.lang.String DATA11 = "data11"; diff --git a/api/system-current.txt b/api/system-current.txt index 3efe5a9526745..01559250f5af9 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26151,6 +26151,8 @@ package android.provider { } protected static abstract interface ContactsContract.DataColumns { + field public static final java.lang.String CARRIER_PRESENCE = "carrier_presence"; + field public static final int CARRIER_PRESENCE_VT_CAPABLE = 1; // 0x1 field public static final java.lang.String DATA1 = "data1"; field public static final java.lang.String DATA10 = "data10"; field public static final java.lang.String DATA11 = "data11"; diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 18a9eb1d0e8b2..a76902be6653d 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -4082,6 +4082,21 @@ public final class ContactsContract { public static final String SYNC3 = "data_sync3"; /** Generic column for use by sync adapters. */ public static final String SYNC4 = "data_sync4"; + + /** + * Carrier presence information. + *

+ * Type: INTEGER (A bitmask of CARRIER_PRESENCE_* fields) + *

+ */ + public static final String CARRIER_PRESENCE = "carrier_presence"; + + /** + * Bitmask flags for CARRIER_PRESENCE column. Each value represents + * a bit (or a set of bits) which may be set independently of each + * other. + */ + public static final int CARRIER_PRESENCE_VT_CAPABLE = 0x01; } /** From c4ea0369dd01ec1ed53b5c8930d2f3831d793442 Mon Sep 17 00:00:00 2001 From: Pierre Vandwalle Date: Wed, 20 May 2015 15:15:31 -0700 Subject: [PATCH 2/6] fix annoying typo Change-Id: Ic8411d622755ee168da6495d2e86201fb3c1154f --- wifi/java/android/net/wifi/WifiConfiguration.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index feab4b8a91d0b..09af531921a42 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -1071,7 +1071,7 @@ public class WifiConfiguration implements Parcelable { if (diff <= 0) { sbuf.append(" blackListed since "); } else { - sbuf.append(" blackListed: ").append(Long.toString(diff/1000)).append( "sec"); + sbuf.append(" blackListed: ").append(Long.toString(diff/1000)).append( "sec "); } } if (this.lastConnected != 0) { @@ -1080,27 +1080,27 @@ public class WifiConfiguration implements Parcelable { if (diff <= 0) { sbuf.append("lastConnected since "); } else { - sbuf.append("lastConnected: ").append(Long.toString(diff/1000)).append( "sec"); + sbuf.append("lastConnected: ").append(Long.toString(diff/1000)).append( "sec "); } } if (this.lastConnectionFailure != 0) { sbuf.append('\n'); long diff = now_ms - this.lastConnectionFailure; if (diff <= 0) { - sbuf.append("lastConnectionFailure since "); + sbuf.append("lastConnectionFailure since "); } else { sbuf.append("lastConnectionFailure: ").append(Long.toString(diff/1000)); - sbuf.append( "sec"); + sbuf.append( "sec "); } } if (this.lastRoamingFailure != 0) { sbuf.append('\n'); long diff = now_ms - this.lastRoamingFailure; if (diff <= 0) { - sbuf.append("lastRoamingFailure since "); + sbuf.append("lastRoamingFailure since "); } else { sbuf.append("lastRoamingFailure: ").append(Long.toString(diff/1000)); - sbuf.append( "sec"); + sbuf.append( "sec "); } } sbuf.append("roamingFailureBlackListTimeMilli: "). From e447fcd445f339f12d81dafa98a3b8d8a6a1ae7e Mon Sep 17 00:00:00 2001 From: Pierre Vandwalle Date: Wed, 20 May 2015 18:23:45 -0700 Subject: [PATCH 3/6] keep hal based pno disabled by default Change-Id: Ia0de13fa127877a6bfd8b46b5a8b940b1faa7f3d --- core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index d5097e47e45fb..efbd24b863248 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -496,7 +496,7 @@ false - true + false true From 56fbb20da1d9fc731abb423f637cbf6f15afcff7 Mon Sep 17 00:00:00 2001 From: Soonil Nagarkar Date: Tue, 26 May 2015 17:32:13 -0700 Subject: [PATCH 4/6] Add NO_BATCH flag to WifiScanner Change-Id: Ic9971260d88793c35ce13bf2e1b64f7b6ef08e65 --- wifi/java/android/net/wifi/WifiScanner.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index fea934f860c67..bd0ded1e5b740 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -136,12 +136,17 @@ public class WifiScanner { } } - /** reports {@link ScanListener#onResults} when underlying buffers are full */ + /** reports {@link ScanListener#onResults} when underlying buffers are full + * @deprecated + */ + @Deprecated public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0; /** reports {@link ScanListener#onResults} after each scan */ public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1; /** reports {@link ScanListener#onFullResult} whenever each beacon is discovered */ public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; + /** do not batch */ + public static final int REPORT_EVENT_NO_BATCH = 4; /** * scan configuration parameters to be sent to {@link #startBackgroundScan} From 5b2b40a0d5cca2a5f19fbb5e0e99348c5c30ce62 Mon Sep 17 00:00:00 2001 From: Soonil Nagarkar Date: Wed, 27 May 2015 10:37:08 -0700 Subject: [PATCH 5/6] Revert "Add NO_BATCH flag to WifiScanner" This reverts commit 56fbb20da1d9fc731abb423f637cbf6f15afcff7. --- wifi/java/android/net/wifi/WifiScanner.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index bd0ded1e5b740..fea934f860c67 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -136,17 +136,12 @@ public class WifiScanner { } } - /** reports {@link ScanListener#onResults} when underlying buffers are full - * @deprecated - */ - @Deprecated + /** reports {@link ScanListener#onResults} when underlying buffers are full */ public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0; /** reports {@link ScanListener#onResults} after each scan */ public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1; /** reports {@link ScanListener#onFullResult} whenever each beacon is discovered */ public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; - /** do not batch */ - public static final int REPORT_EVENT_NO_BATCH = 4; /** * scan configuration parameters to be sent to {@link #startBackgroundScan} From b9e6d98c6c0a05ebfc73a14d1ac2a47d58290241 Mon Sep 17 00:00:00 2001 From: Soonil Nagarkar Date: Wed, 27 May 2015 11:23:37 -0700 Subject: [PATCH 6/6] Add NO_BATCH flag to WifiScanner Change-Id: Idd521f724684986ff84306327d42b810f7b30245 --- api/system-current.txt | 3 ++- wifi/java/android/net/wifi/WifiScanner.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 01559250f5af9..904c2493072b2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -19799,9 +19799,10 @@ package android.net.wifi { field public static final int REASON_NOT_AUTHORIZED = -4; // 0xfffffffc field public static final int REASON_SUCCEEDED = 0; // 0x0 field public static final int REASON_UNSPECIFIED = -1; // 0xffffffff - field public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0; // 0x0 + field public static final deprecated int REPORT_EVENT_AFTER_BUFFER_FULL = 0; // 0x0 field public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1; // 0x1 field public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; // 0x2 + field public static final int REPORT_EVENT_NO_BATCH = 4; // 0x4 field public static final int WIFI_BAND_24_GHZ = 1; // 0x1 field public static final int WIFI_BAND_5_GHZ = 2; // 0x2 field public static final int WIFI_BAND_5_GHZ_DFS_ONLY = 4; // 0x4 diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index fea934f860c67..bd0ded1e5b740 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -136,12 +136,17 @@ public class WifiScanner { } } - /** reports {@link ScanListener#onResults} when underlying buffers are full */ + /** reports {@link ScanListener#onResults} when underlying buffers are full + * @deprecated + */ + @Deprecated public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0; /** reports {@link ScanListener#onResults} after each scan */ public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1; /** reports {@link ScanListener#onFullResult} whenever each beacon is discovered */ public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; + /** do not batch */ + public static final int REPORT_EVENT_NO_BATCH = 4; /** * scan configuration parameters to be sent to {@link #startBackgroundScan}