LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing SystemApi added in aosp/2685327

Browse Source 
Removing all SystemApi added in aosp/2685327 until M-2023-11 train  release
Apis will be placed back after that

Test: built successfully.
Bug: 290092977
API-Coverage-Bug: 294934095
Change-Id: I12e8b21e6d21541930acdd14322156ad75b27be5
This commit is contained in:
Igor Zaslavsky
2023-08-30 21:07:44 +00:00
parent 2eb2f7998d
commit edb12a4234
5 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
remoteauth/framework/java/android/remoteauth/DeviceDiscoveryCallback.java
View File

@@ -16,10 +16,7 @@
package android.remoteauth;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import androidx.annotation.IntDef;
@@ -31,7 +28,7 @@ import java.lang.annotation.RetentionPolicy;
*
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
// TODO(b/290092977): Add back after M-2023-11 release - @SystemApi(client = MODULE_LIBRARIES)
public interface DeviceDiscoveryCallback {
/** The device is no longer seen in the discovery process. */
int STATE_LOST = 0;

3
remoteauth/framework/java/android/remoteauth/RemoteAuthFrameworkInitializer.java
View File

@@ -16,7 +16,6 @@
package android.remoteauth;
import android.annotation.SystemApi;
import android.app.SystemServiceRegistry;
import android.content.Context;
@@ -25,7 +24,7 @@ import android.content.Context;
*
* @hide
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
// TODO(b/290092977): Add back after M-2023-11 release - @SystemApi(client = MODULE_LIBRARIES)
public final class RemoteAuthFrameworkInitializer {
private RemoteAuthFrameworkInitializer() {}

10
remoteauth/framework/java/android/remoteauth/RemoteAuthManager.java
View File

@@ -16,14 +16,12 @@
package android.remoteauth;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import static android.remoteauth.DeviceDiscoveryCallback.STATE_LOST;
import static android.remoteauth.DeviceDiscoveryCallback.STATE_SEEN;
import android.annotation.CallbackExecutor;
import android.annotation.NonNull;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.UserIdInt;
import android.content.Context;
@@ -47,7 +45,7 @@ import java.util.concurrent.Executor;
*
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
// TODO(b/290092977): Add back after M-2023-11 release - @SystemApi(client = MODULE_LIBRARIES)
// TODO(b/290092977): Change to Context.REMOTE_AUTH_SERVICE after aosp/2681375
// is automerges from aosp-main to udc-mainline-prod
@SystemService(RemoteAuthManager.REMOTE_AUTH_SERVICE)
@@ -79,7 +77,7 @@ public class RemoteAuthManager {
* @return true if this device can be enrolled
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
// TODO(b/290092977): Add back after M-2023-11 release - @SystemApi(client = MODULE_LIBRARIES)
// TODO(b/297301535): @RequiresPermission(MANAGE_REMOTE_AUTH)
public boolean isRemoteAuthSupported() {
try {
@@ -100,7 +98,7 @@ public class RemoteAuthManager {
* @return {@code true} if discovery began successfully, {@code false} otherwise
* @hide
*/
@SystemApi(client = MODULE_LIBRARIES)
// TODO(b/290092977): Add back after M-2023-11 release - @SystemApi(client = MODULE_LIBRARIES)
// TODO(b/297301535): @RequiresPermission(MANAGE_REMOTE_AUTH)
public boolean startDiscovery(
int timeoutMs,
@@ -149,7 +147,7 @@ public class RemoteAuthManager {
// Suppressed lint: Registration methods should have overload that accepts delivery Executor.
// Already have executor in startDiscovery() method.
@SuppressLint("ExecutorRegistration")
@SystemApi(client = MODULE_LIBRARIES)
// TODO(b/290092977): Add back after M-2023-11 release - @SystemApi(client = MODULE_LIBRARIES)
// TODO(b/297301535): @RequiresPermission(MANAGE_REMOTE_AUTH)
public void stopDiscovery(@NonNull DeviceDiscoveryCallback callback) {
Preconditions.checkNotNull(callback, "invalid null scanCallback");

5
remoteauth/framework/java/android/remoteauth/RemoteDevice.java
View File

@@ -16,12 +16,9 @@
package android.remoteauth;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -35,7 +32,7 @@ import java.util.Objects;
* @hide
*/
// TODO(b/295407748) Change to use @DataClass
@SystemApi(client = MODULE_LIBRARIES)
// TODO(b/290092977): Add back after M-2023-11 release - @SystemApi(client = MODULE_LIBRARIES)
public final class RemoteDevice implements Parcelable {
/** The remote device is not registered as remote authenticator. */
public static final int STATE_NOT_REGISTERED = 0;