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

Merge "Removing SystemApi added in aosp/2685327" into main am: e423ae1076

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2733765

Change-Id: I78bc441c765538098017916007b443671cb95fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Igor Zaslavsky
2023-08-31 10:07:08 +00:00
committed by Automerger Merge Worker
parent dd7ddb4ad9 e423ae1076
commit 378d54c4d5
5 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
framework-t/api/module-lib-current.txt
View File

@@ -207,43 +207,3 @@ package android.net {
}
package android.remoteauth {
public interface DeviceDiscoveryCallback {
method public void onDeviceUpdate(@NonNull android.remoteauth.RemoteDevice, int);
method public void onTimeout();
field public static final int STATE_LOST = 0; // 0x0
field public static final int STATE_SEEN = 1; // 0x1
}
public final class RemoteAuthFrameworkInitializer {
method public static void registerServiceWrappers();
}
public class RemoteAuthManager {
method public boolean isRemoteAuthSupported();
method public boolean startDiscovery(int, @NonNull java.util.concurrent.Executor, @NonNull android.remoteauth.DeviceDiscoveryCallback);
method public void stopDiscovery(@NonNull android.remoteauth.DeviceDiscoveryCallback);
}
public final class RemoteDevice implements android.os.Parcelable {
method public int describeContents();
method @NonNull public int getConnectionId();
method @Nullable public String getName();
method public int getRegistrationState();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.remoteauth.RemoteDevice> CREATOR;
field public static final int STATE_NOT_REGISTERED = 0; // 0x0
field public static final int STATE_REGISTERED = 1; // 0x1
}
public static final class RemoteDevice.Builder {
ctor public RemoteDevice.Builder(int);
method @NonNull public android.remoteauth.RemoteDevice build();
method @NonNull public android.remoteauth.RemoteDevice.Builder setConnectionId(int);
method @NonNull public android.remoteauth.RemoteDevice.Builder setName(@Nullable String);
method @NonNull public android.remoteauth.RemoteDevice.Builder setRegistrationState(int);
}
}

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;