Merge "markVintfStability for priv-apps" am: e72e27929f am: 617e30b8a4 am: 0c29c5738b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2268195 Change-Id: I32a9b8b9ce4664d1bdc7e093a67b485972527fad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -301,10 +301,6 @@ package android.os {
|
||||
method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void reportNetworkInterfaceForTransports(@NonNull String, @NonNull int[]) throws java.lang.RuntimeException;
|
||||
}
|
||||
|
||||
public class Binder implements android.os.IBinder {
|
||||
method public final void markVintfStability();
|
||||
}
|
||||
|
||||
public class BluetoothServiceManager {
|
||||
method @NonNull public android.os.BluetoothServiceManager.ServiceRegisterer getBluetoothManagerServiceRegisterer();
|
||||
}
|
||||
|
||||
@@ -9351,6 +9351,7 @@ package android.os {
|
||||
|
||||
public class Binder implements android.os.IBinder {
|
||||
method public int handleShellCommand(@NonNull android.os.ParcelFileDescriptor, @NonNull android.os.ParcelFileDescriptor, @NonNull android.os.ParcelFileDescriptor, @NonNull String[]);
|
||||
method public final void markVintfStability();
|
||||
method public static void setProxyTransactListener(@Nullable android.os.Binder.ProxyTransactListener);
|
||||
}
|
||||
|
||||
|
||||
@@ -562,7 +562,7 @@ public class Binder implements IBinder {
|
||||
*
|
||||
* @hide
|
||||
*/
|
||||
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
|
||||
@SystemApi(client = SystemApi.Client.PRIVILEGED_APPS)
|
||||
public final native void markVintfStability();
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user