Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide periodic scanning"

Browse Source
This commit is contained in:
Jakub Pawlowski
2017-03-30 03:17:48 +00:00
committed by Gerrit Code Review
parent 62c5f64fa5 63fad69a19
commit ca7544ea15
7 changed files with 4 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
api/current.txt
View File

@@ -6696,7 +6696,6 @@ package android.bluetooth {
method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter(); method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter();
method public int getLeMaximumAdvertisingDataLength(); method public int getLeMaximumAdvertisingDataLength();
method public java.lang.String getName(); method public java.lang.String getName();
method public android.bluetooth.le.PeriodicAdvertisingManager getPeriodicAdvertisingManager();
method public int getProfileConnectionState(int); method public int getProfileConnectionState(int);
method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int); method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int);
method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String); method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String);
@@ -7585,21 +7584,6 @@ package android.bluetooth.le {
method public void stopScan(android.bluetooth.le.ScanCallback); 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 { public final class PeriodicAdvertisingParameters implements android.os.Parcelable {
method public int describeContents(); method public int describeContents();
method public boolean getEnable(); method public boolean getEnable();
@@ -7617,21 +7601,6 @@ package android.bluetooth.le {
method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); 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<android.bluetooth.le.PeriodicAdvertisingReport> CREATOR;
field public static final int DATA_COMPLETE = 0; // 0x0
field public static final int DATA_INCOMPLETE_TRUNCATED = 2; // 0x2
}
public abstract class ScanCallback { public abstract class ScanCallback {
ctor public ScanCallback(); ctor public ScanCallback();
method public void onBatchScanResults(java.util.List<android.bluetooth.le.ScanResult>); method public void onBatchScanResults(java.util.List<android.bluetooth.le.ScanResult>);

31
api/system-current.txt
View File

@@ -6995,7 +6995,6 @@ package android.bluetooth {
method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter(); method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter();
method public int getLeMaximumAdvertisingDataLength(); method public int getLeMaximumAdvertisingDataLength();
method public java.lang.String getName(); method public java.lang.String getName();
method public android.bluetooth.le.PeriodicAdvertisingManager getPeriodicAdvertisingManager();
method public int getProfileConnectionState(int); method public int getProfileConnectionState(int);
method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int); method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int);
method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String); method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String);
@@ -7893,21 +7892,6 @@ package android.bluetooth.le {
method public void stopScan(android.bluetooth.le.ScanCallback); 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 { public final class PeriodicAdvertisingParameters implements android.os.Parcelable {
method public int describeContents(); method public int describeContents();
method public boolean getEnable(); method public boolean getEnable();
@@ -7925,21 +7909,6 @@ package android.bluetooth.le {
method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); 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<android.bluetooth.le.PeriodicAdvertisingReport> 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 { public final class ResultStorageDescriptor implements android.os.Parcelable {
ctor public ResultStorageDescriptor(int, int, int); ctor public ResultStorageDescriptor(int, int, int);
method public int describeContents(); method public int describeContents();

31
api/test-current.txt
View File

@@ -6705,7 +6705,6 @@ package android.bluetooth {
method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter(); method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter();
method public int getLeMaximumAdvertisingDataLength(); method public int getLeMaximumAdvertisingDataLength();
method public java.lang.String getName(); method public java.lang.String getName();
method public android.bluetooth.le.PeriodicAdvertisingManager getPeriodicAdvertisingManager();
method public int getProfileConnectionState(int); method public int getProfileConnectionState(int);
method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int); method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int);
method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String); method public android.bluetooth.BluetoothDevice getRemoteDevice(java.lang.String);
@@ -7594,21 +7593,6 @@ package android.bluetooth.le {
method public void stopScan(android.bluetooth.le.ScanCallback); 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 { public final class PeriodicAdvertisingParameters implements android.os.Parcelable {
method public int describeContents(); method public int describeContents();
method public boolean getEnable(); method public boolean getEnable();
@@ -7626,21 +7610,6 @@ package android.bluetooth.le {
method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int); 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<android.bluetooth.le.PeriodicAdvertisingReport> CREATOR;
field public static final int DATA_COMPLETE = 0; // 0x0
field public static final int DATA_INCOMPLETE_TRUNCATED = 2; // 0x2
}
public abstract class ScanCallback { public abstract class ScanCallback {
ctor public ScanCallback(); ctor public ScanCallback();
method public void onBatchScanResults(java.util.List<android.bluetooth.le.ScanResult>); method public void onBatchScanResults(java.util.List<android.bluetooth.le.ScanResult>);

1
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -638,6 +638,7 @@ public final class BluetoothAdapter {
* <p> * <p>
* Use {@link #isLePeriodicAdvertisingSupported()} to check whether LE Periodic Advertising is * Use {@link #isLePeriodicAdvertisingSupported()} to check whether LE Periodic Advertising is
* supported on this device before calling this method. * supported on this device before calling this method.
* @hide
*/ */
public PeriodicAdvertisingManager getPeriodicAdvertisingManager() { public PeriodicAdvertisingManager getPeriodicAdvertisingManager() {
if (!getLeAccess()) if (!getLeAccess())

1
core/java/android/bluetooth/le/PeriodicAdvertisingCallback.java
View File

@@ -23,6 +23,7 @@ import android.bluetooth.BluetoothDevice;
* advertising operation status. * advertising operation status.
* *
* @see PeriodicAdvertisingManager#createSync * @see PeriodicAdvertisingManager#createSync
* @hide
*/ */
public abstract class PeriodicAdvertisingCallback { public abstract class PeriodicAdvertisingCallback {

1
core/java/android/bluetooth/le/PeriodicAdvertisingManager.java
View File

@@ -37,6 +37,7 @@ import java.util.Map;
* <p> * <p>
* <b>Note:</b> Most of the methods here require * <b>Note:</b> Most of the methods here require
* {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. * {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.
* @hide
*/ */
public final class PeriodicAdvertisingManager { public final class PeriodicAdvertisingManager {

1
core/java/android/bluetooth/le/PeriodicAdvertisingReport.java
View File

@@ -24,6 +24,7 @@ import java.util.Objects;
/** /**
* PeriodicAdvertisingReport for Bluetooth LE synchronized advertising. * PeriodicAdvertisingReport for Bluetooth LE synchronized advertising.
* @hide
*/ */
public final class PeriodicAdvertisingReport implements Parcelable { public final class PeriodicAdvertisingReport implements Parcelable {