Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ea0df72 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Hide periodic scanning" am: ca7544ea am: c06722e7 am: c809a5b1 

am: f96f05b1

Change-Id: Ic65fa3ef68543405c1075c03079a4c5fa53ade4f
parents cbd62752 f96f05b1

api/current.txt

+0 −31
Original line number Original line Diff line number Diff line
@@ -7141,7 +7141,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);
@@ -8030,21 +8029,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();









@@ -8062,21 +8046,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>);

























api/system-current.txt



+0
−31




























Original line number
Original line
Diff line number
Diff line








@@ -7601,7 +7601,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);










@@ -8499,21 +8498,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();









@@ -8531,21 +8515,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();

























api/test-current.txt



+0
−31




























Original line number
Original line
Diff line number
Diff line








@@ -7171,7 +7171,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);










@@ -8060,21 +8059,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();









@@ -8092,21 +8076,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>);

























core/java/android/bluetooth/BluetoothAdapter.java



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -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())

































core/java/android/bluetooth/le/PeriodicAdvertisingCallback.java



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -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 {