joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix CTS for M-08" into udc-dev

Browse source
This commit is contained in:
Xinyi Zhou 2023-06-12 05:10:40 +00:00 • committed by Android (Google) Code Review
commit 7ae6c1ae94
2 changed files with 41 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
nearby/framework/java/android/nearby/NearbyManager.java
View file

@ -28,6 +28,7 @@ import android.annotation.SystemService;
import android.content.Context;
import android.nearby.aidl.IOffloadCallback;
import android.os.RemoteException;
import android.provider.Settings;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
@ -74,6 +75,7 @@ public class NearbyManager {
private static final String TAG = "NearbyManager";
/**
* TODO(b/286137024): Remove this when CTS R5 is rolled out.
* Whether allows Fast Pair to scan.
*
* (0 = disabled, 1 = enabled)
@ -418,4 +420,35 @@ public class NearbyManager {
});
}
}
/**
* TODO(b/286137024): Remove this when CTS R5 is rolled out.
* Read from {@link Settings} whether Fast Pair scan is enabled.
*
* @param context the {@link Context} to query the setting
* @return whether the Fast Pair is enabled
* @hide
*/
public static boolean getFastPairScanEnabled(@NonNull Context context) {
final int enabled = Settings.Secure.getInt(
context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, 0);
return enabled != 0;
}
/**
* TODO(b/286137024): Remove this when CTS R5 is rolled out.
* Write into {@link Settings} whether Fast Pair scan is enabled
*
* @param context the {@link Context} to set the setting
* @param enable whether the Fast Pair scan should be enabled
* @hide
*/
@RequiresPermission(Manifest.permission.WRITE_SECURE_SETTINGS)
public static void setFastPairScanEnabled(@NonNull Context context, boolean enable) {
Settings.Secure.putInt(
context.getContentResolver(), FAST_PAIR_SCAN_ENABLED, enable ? 1 : 0);
Log.v(TAG, String.format(
"successfully %s Fast Pair scan", enable ? "enables" : "disables"));
}
}

10
nearby/framework/java/android/nearby/ScanRequest.java
View file

@ -22,6 +22,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.WorkSource;
@ -215,8 +216,13 @@ public final class ScanRequest implements Parcelable {
stringBuilder.append("Request[")
.append("scanType=").append(mScanType);
stringBuilder.append(", scanMode=").append(scanModeToString(mScanMode));
stringBuilder.append(", bleEnabled=").append(mBleEnabled);
stringBuilder.append(", offloadOnly=").append(mOffloadOnly);
// TODO(b/286137024): Remove this when CTS R5 is rolled out.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
stringBuilder.append(", bleEnabled=").append(mBleEnabled);
stringBuilder.append(", offloadOnly=").append(mOffloadOnly);
} else {
stringBuilder.append(", enableBle=").append(mBleEnabled);
}
stringBuilder.append(", workSource=").append(mWorkSource);
stringBuilder.append(", scanFilters=").append(mScanFilters);
stringBuilder.append("]");