From a537b3f1f84a44dd0cd97e9d1c324dfbd3fc3e6f Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Wed, 29 Mar 2017 17:00:44 -0700 Subject: [PATCH] Hide periodic scanning Bug: 30622771 Test: manual Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c (cherry picked from commit 63fad69a19bbfe78e64d56c9d775ddf6d7cd84c9) --- api/current.txt | 31 ---------------------- api/system-current.txt | 31 ---------------------- api/test-current.txt | 31 ---------------------- core/java/android/bluetooth/BluetoothAdapter.java | 1 + .../bluetooth/le/PeriodicAdvertisingCallback.java | 1 + .../bluetooth/le/PeriodicAdvertisingManager.java | 1 + .../bluetooth/le/PeriodicAdvertisingReport.java | 1 + 7 files changed, 4 insertions(+), 93 deletions(-) diff --git a/api/current.txt b/api/current.txt index 5074ab299323..6f274723a3b7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7148,7 +7148,6 @@ package android.bluetooth { method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter(); method public int getLeMaximumAdvertisingDataLength(); method public java.lang.String getName(); - method public android.bluetooth.le.PeriodicAdvertisingManager getPeriodicAdvertisingManager(); method public int getProfileConnectionState(int); method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int); method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String); @@ -8037,21 +8036,6 @@ package android.bluetooth.le { method public void stopScan(android.bluetooth.le.ScanCallback); } - public abstract class PeriodicAdvertisingCallback { - ctor public PeriodicAdvertisingCallback(); - method public void onPeriodicAdvertisingReport(android.bluetooth.le.PeriodicAdvertisingReport); - method public void onSyncEstablished(int, android.bluetooth.BluetoothDevice, int, int, int, int); - method public void onSyncLost(int); - field public static final int SYNC_NO_RESOURCES = 2; // 0x2 - field public static final int SYNC_NO_RESPONSE = 1; // 0x1 - } - - public final class PeriodicAdvertisingManager { - method public void registerSync(android.bluetooth.le.ScanResult, int, int, android.bluetooth.le.PeriodicAdvertisingCallback); - method public void registerSync(android.bluetooth.le.ScanResult, int, int, android.bluetooth.le.PeriodicAdvertisingCallback, android.os.Handler); - method public void unregisterSync(android.bluetooth.le.PeriodicAdvertisingCallback); - } - public final class PeriodicAdvertisingParameters implements android.os.Parcelable { method public int describeContents(); method public boolean getEnable(); @@ -8069,21 +8053,6 @@ package android.bluetooth.le { method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); } - public final class PeriodicAdvertisingReport implements android.os.Parcelable { - ctor public PeriodicAdvertisingReport(int, int, int, int, android.bluetooth.le.ScanRecord); - method public int describeContents(); - method public android.bluetooth.le.ScanRecord getData(); - method public int getDataStatus(); - method public int getRssi(); - method public int getSyncHandle(); - method public long getTimestampNanos(); - method public int getTxPower(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public static final int DATA_COMPLETE = 0; // 0x0 - field public static final int DATA_INCOMPLETE_TRUNCATED = 2; // 0x2 - } - public abstract class ScanCallback { ctor public ScanCallback(); method public void onBatchScanResults(java.util.List); diff --git a/api/system-current.txt b/api/system-current.txt index 9120e55fe35a..819d63b86141 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7608,7 +7608,6 @@ package android.bluetooth { method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter(); method public int getLeMaximumAdvertisingDataLength(); method public java.lang.String getName(); - method public android.bluetooth.le.PeriodicAdvertisingManager getPeriodicAdvertisingManager(); method public int getProfileConnectionState(int); method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int); method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String); @@ -8506,21 +8505,6 @@ package android.bluetooth.le { method public void stopScan(android.bluetooth.le.ScanCallback); } - public abstract class PeriodicAdvertisingCallback { - ctor public PeriodicAdvertisingCallback(); - method public void onPeriodicAdvertisingReport(android.bluetooth.le.PeriodicAdvertisingReport); - method public void onSyncEstablished(int, android.bluetooth.BluetoothDevice, int, int, int, int); - method public void onSyncLost(int); - field public static final int SYNC_NO_RESOURCES = 2; // 0x2 - field public static final int SYNC_NO_RESPONSE = 1; // 0x1 - } - - public final class PeriodicAdvertisingManager { - method public void registerSync(android.bluetooth.le.ScanResult, int, int, android.bluetooth.le.PeriodicAdvertisingCallback); - method public void registerSync(android.bluetooth.le.ScanResult, int, int, android.bluetooth.le.PeriodicAdvertisingCallback, android.os.Handler); - method public void unregisterSync(android.bluetooth.le.PeriodicAdvertisingCallback); - } - public final class PeriodicAdvertisingParameters implements android.os.Parcelable { method public int describeContents(); method public boolean getEnable(); @@ -8538,21 +8522,6 @@ package android.bluetooth.le { method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); } - public final class PeriodicAdvertisingReport implements android.os.Parcelable { - ctor public PeriodicAdvertisingReport(int, int, int, int, android.bluetooth.le.ScanRecord); - method public int describeContents(); - method public android.bluetooth.le.ScanRecord getData(); - method public int getDataStatus(); - method public int getRssi(); - method public int getSyncHandle(); - method public long getTimestampNanos(); - method public int getTxPower(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public static final int DATA_COMPLETE = 0; // 0x0 - field public static final int DATA_INCOMPLETE_TRUNCATED = 2; // 0x2 - } - public final class ResultStorageDescriptor implements android.os.Parcelable { ctor public ResultStorageDescriptor(int, int, int); method public int describeContents(); diff --git a/api/test-current.txt b/api/test-current.txt index 06a1221027d0..57bb24043330 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -7178,7 +7178,6 @@ package android.bluetooth { method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter(); method public int getLeMaximumAdvertisingDataLength(); method public java.lang.String getName(); - method public android.bluetooth.le.PeriodicAdvertisingManager getPeriodicAdvertisingManager(); method public int getProfileConnectionState(int); method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int); method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String); @@ -8067,21 +8066,6 @@ package android.bluetooth.le { method public void stopScan(android.bluetooth.le.ScanCallback); } - public abstract class PeriodicAdvertisingCallback { - ctor public PeriodicAdvertisingCallback(); - method public void onPeriodicAdvertisingReport(android.bluetooth.le.PeriodicAdvertisingReport); - method public void onSyncEstablished(int, android.bluetooth.BluetoothDevice, int, int, int, int); - method public void onSyncLost(int); - field public static final int SYNC_NO_RESOURCES = 2; // 0x2 - field public static final int SYNC_NO_RESPONSE = 1; // 0x1 - } - - public final class PeriodicAdvertisingManager { - method public void registerSync(android.bluetooth.le.ScanResult, int, int, android.bluetooth.le.PeriodicAdvertisingCallback); - method public void registerSync(android.bluetooth.le.ScanResult, int, int, android.bluetooth.le.PeriodicAdvertisingCallback, android.os.Handler); - method public void unregisterSync(android.bluetooth.le.PeriodicAdvertisingCallback); - } - public final class PeriodicAdvertisingParameters implements android.os.Parcelable { method public int describeContents(); method public boolean getEnable(); @@ -8099,21 +8083,6 @@ package android.bluetooth.le { method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); } - public final class PeriodicAdvertisingReport implements android.os.Parcelable { - ctor public PeriodicAdvertisingReport(int, int, int, int, android.bluetooth.le.ScanRecord); - method public int describeContents(); - method public android.bluetooth.le.ScanRecord getData(); - method public int getDataStatus(); - method public int getRssi(); - method public int getSyncHandle(); - method public long getTimestampNanos(); - method public int getTxPower(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - field public static final int DATA_COMPLETE = 0; // 0x0 - field public static final int DATA_INCOMPLETE_TRUNCATED = 2; // 0x2 - } - public abstract class ScanCallback { ctor public ScanCallback(); method public void onBatchScanResults(java.util.List); diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 4e1e42da4fe7..845a47d99842 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -638,6 +638,7 @@ public final class BluetoothAdapter { *

* Use {@link #isLePeriodicAdvertisingSupported()} to check whether LE Periodic Advertising is * supported on this device before calling this method. + * @hide */ public PeriodicAdvertisingManager getPeriodicAdvertisingManager() { if (!getLeAccess()) diff --git a/core/java/android/bluetooth/le/PeriodicAdvertisingCallback.java b/core/java/android/bluetooth/le/PeriodicAdvertisingCallback.java index 6616231bcdf8..364b575b4d8d 100644 --- a/core/java/android/bluetooth/le/PeriodicAdvertisingCallback.java +++ b/core/java/android/bluetooth/le/PeriodicAdvertisingCallback.java @@ -23,6 +23,7 @@ import android.bluetooth.BluetoothDevice; * advertising operation status. * * @see PeriodicAdvertisingManager#createSync + * @hide */ public abstract class PeriodicAdvertisingCallback { diff --git a/core/java/android/bluetooth/le/PeriodicAdvertisingManager.java b/core/java/android/bluetooth/le/PeriodicAdvertisingManager.java index 12c8a8c8ffd4..d9c2d8819a33 100644 --- a/core/java/android/bluetooth/le/PeriodicAdvertisingManager.java +++ b/core/java/android/bluetooth/le/PeriodicAdvertisingManager.java @@ -37,6 +37,7 @@ import java.util.Map; *

* Note: Most of the methods here require * {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. + * @hide */ public final class PeriodicAdvertisingManager { diff --git a/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java b/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java index 3ff4ca580069..51b93cbd64dc 100644 --- a/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java +++ b/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java @@ -24,6 +24,7 @@ import java.util.Objects; /** * PeriodicAdvertisingReport for Bluetooth LE synchronized advertising. + * @hide */ public final class PeriodicAdvertisingReport implements Parcelable { -- 2.11.0