Merge "Update system-current.txt and module-lib-current.txt to resolve API council comments" into tm-dev
diff --git a/framework-t/api/module-lib-current.txt b/framework-t/api/module-lib-current.txt
index 75a8625..ebcf620 100644
--- a/framework-t/api/module-lib-current.txt
+++ b/framework-t/api/module-lib-current.txt
@@ -25,6 +25,14 @@
}
+package android.nearby {
+
+ public final class NearbyFrameworkInitializer {
+ method public static void registerServiceWrappers();
+ }
+
+}
+
package android.net {
public final class ConnectivityFrameworkInitializerTiramisu {
diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index 4739d8d..46eb9ee 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -324,10 +324,6 @@
method @NonNull public android.nearby.NearbyDeviceParcelable.Builder setRssi(int);
}
- public final class NearbyFrameworkInitializer {
- method public static void registerServiceWrappers();
- }
-
public class NearbyManager {
method public static boolean getFastPairScanEnabled(@NonNull android.content.Context, boolean);
method public static void setFastPairScanEnabled(@NonNull android.content.Context, boolean);
@@ -466,7 +462,7 @@
method public int getScanMode();
method public int getScanType();
method @NonNull public android.os.WorkSource getWorkSource();
- method public boolean isEnableBle();
+ method public boolean isBleEnabled();
method public static boolean isValidScanMode(int);
method public static boolean isValidScanType(int);
method @NonNull public static String scanModeToString(int);
@@ -486,7 +482,7 @@
ctor public ScanRequest.Builder();
method @NonNull public android.nearby.ScanRequest.Builder addScanFilter(@NonNull android.nearby.ScanFilter);
method @NonNull public android.nearby.ScanRequest build();
- method @NonNull public android.nearby.ScanRequest.Builder setEnableBle(boolean);
+ method @NonNull public android.nearby.ScanRequest.Builder setBleEnabled(boolean);
method @NonNull public android.nearby.ScanRequest.Builder setScanMode(int);
method @NonNull public android.nearby.ScanRequest.Builder setScanType(int);
method @NonNull @RequiresPermission(android.Manifest.permission.UPDATE_DEVICE_STATS) public android.nearby.ScanRequest.Builder setWorkSource(@Nullable android.os.WorkSource);