Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "markVintfStability for priv-apps" am: e72e27929f am: 617e30b8a4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2268195

Change-Id: I2e393d437e75a69e3a81906b95b7893fb432824e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2022-10-26 21:11:10 +00:00
committed by Automerger Merge Worker
parent d8b146c75f 617e30b8a4
commit 0c29c5738b
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/module-lib-current.txt
View File

@@ -300,10 +300,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; 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 { public class BluetoothServiceManager {
method @NonNull public android.os.BluetoothServiceManager.ServiceRegisterer getBluetoothManagerServiceRegisterer(); method @NonNull public android.os.BluetoothServiceManager.ServiceRegisterer getBluetoothManagerServiceRegisterer();
} }

1
core/api/system-current.txt
View File

@@ -9239,6 +9239,7 @@ package android.os {
public class Binder implements android.os.IBinder { 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 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); method public static void setProxyTransactListener(@Nullable android.os.Binder.ProxyTransactListener);
} }

2
core/java/android/os/Binder.java
View File

@@ -562,7 +562,7 @@ public class Binder implements IBinder {
* *
* @hide * @hide
*/ */
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @SystemApi(client = SystemApi.Client.PRIVILEGED_APPS)
public final native void markVintfStability(); public final native void markVintfStability();
/** /**