commit ff98750c7072436afd8cd3cf8c69ccdbe961f2f4
author Xinyi Zhou <zxy@google.com> Wed Mar 09 17:38:41 2022 -0800
committer Xinyi Zhou <zxy@google.com> Thu Mar 10 02:41:19 2022 +0000
tree 512d7c969bc413cf0fc46be05d7af8427811d3d4
parent 000166f606dae88da839206513f709c1d57df2f7

Update system-current.txt and module-lib-current.txt to resolve API council comments

Bug: 216294721
Test: Compiled
Ignore-AOSP-First: nearby_not_in_aosp_yet
CTS-Coverage-Bug: 213364287
Change-Id: Ic01a517eb8d6cf4f193bf40e84cb33189f6c80d2

framework-t/api/module-lib-current.txt

diff --git a/framework-t/api/module-lib-current.txt b/framework-t/api/module-lib-current.txt
index 59ca730..d299fbf 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 {

framework-t/api/system-current.txt

diff --git a/framework-t/api/system-current.txt b/framework-t/api/system-current.txt
index 48acaf3..5ef7e29 100644
--- a/framework-t/api/system-current.txt
+++ b/framework-t/api/system-current.txt
@@ -322,10 +322,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);
@@ -469,7 +465,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);
@@ -489,7 +485,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);