Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0273a3c1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5406228 from 419b391c to qt-release 

Change-Id: Iaa6c0b343d187e1e27f5a0650077e73afd2de66d
parents f27f84b1 419b391c

Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ java_defaults { 
        "core/java/android/service/vr/IVrListener.aidl",

        "core/java/android/service/vr/IVrManager.aidl",

        "core/java/android/service/vr/IVrStateCallbacks.aidl",

        "core/java/android/service/watchdog/IExplicitHealthCheckService.aidl",

        "core/java/android/print/ILayoutResultCallback.aidl",

        "core/java/android/print/IPrinterDiscoveryObserver.aidl",

        "core/java/android/print/IPrintDocumentAdapter.aidl",
@@ -475,7 +476,10 @@ java_defaults { 
        "media/java/android/media/IMediaHTTPConnection.aidl",

        "media/java/android/media/IMediaHTTPService.aidl",

        "media/java/android/media/IMediaResourceMonitor.aidl",

        "media/java/android/media/IMediaRoute2Callback.aidl",

        "media/java/android/media/IMediaRoute2Provider.aidl",

        "media/java/android/media/IMediaRouterClient.aidl",

        "media/java/android/media/IMediaRouter2ManagerClient.aidl",

        "media/java/android/media/IMediaRouterService.aidl",

        "media/java/android/media/IMediaScannerListener.aidl",

        "media/java/android/media/IMediaScannerService.aidl",
@@ -1626,6 +1630,7 @@ droidstubs { 
        ":openjdk_java_files",

        ":non_openjdk_java_files",

        ":opt-telephony-common-srcs",

        "core/java/**/*.java",

    ],

    arg_files: [

        "core/res/AndroidManifest.xml",

api/current.txt

+14 −12
Original line number Diff line number Diff line
@@ -6952,7 +6952,6 @@ package android.app.admin { 
    field public static final int PRIVATE_DNS_SET_NO_ERROR = 0; // 0x0

    field public static final int PROVISIONING_MODE_FULLY_MANAGED_DEVICE = 1; // 0x1

    field public static final int PROVISIONING_MODE_MANAGED_PROFILE = 2; // 0x2

    field public static final int PROVISIONING_MODE_MANAGED_PROFILE_ON_FULLY_MANAGED_DEVICE = 3; // 0x3

    field public static final int RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT = 2; // 0x2

    field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1

    field public static final int SKIP_SETUP_WIZARD = 1; // 0x1
@@ -11385,6 +11384,7 @@ package android.content.pm { 
  public class PackageInstaller {

    method public void abandonSession(int);

    method public int createSession(@NonNull android.content.pm.PackageInstaller.SessionParams) throws java.io.IOException;

    method @Nullable public android.content.pm.PackageInstaller.SessionInfo getActiveStagedSession();

    method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getAllSessions();

    method @NonNull public java.util.List<android.content.pm.PackageInstaller.SessionInfo> getMySessions();

    method @Nullable public android.content.pm.PackageInstaller.SessionInfo getSessionInfo(int);
@@ -11469,6 +11469,7 @@ package android.content.pm { 
    method @NonNull public String getStagedSessionErrorMessage();

    method @NonNull public android.os.UserHandle getUser();

    method public boolean isActive();

    method public boolean isCommitted();

    method public boolean isMultiPackage();

    method public boolean isSealed();

    method public boolean isStaged();
@@ -28634,7 +28635,7 @@ package android.net { 
  public class ConnectivityManager {

    method public void addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);

    method public boolean bindProcessToNetwork(@Nullable android.net.Network);

    method public android.net.SocketKeepalive createSocketKeepalive(@NonNull android.net.Network, @NonNull android.net.IpSecManager.UdpEncapsulationSocket, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);

    method @NonNull public android.net.SocketKeepalive createSocketKeepalive(@NonNull android.net.Network, @NonNull android.net.IpSecManager.UdpEncapsulationSocket, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);

    method @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) @Nullable public android.net.Network getActiveNetwork();

    method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public android.net.NetworkInfo getActiveNetworkInfo();

    method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public android.net.NetworkInfo[] getAllNetworkInfo();
@@ -28712,7 +28713,7 @@ package android.net { 
  public static class ConnectivityManager.NetworkCallback {

    ctor public ConnectivityManager.NetworkCallback();

    method public void onAvailable(android.net.Network);

    method public void onBlockedStatusChanged(android.net.Network, boolean);

    method public void onBlockedStatusChanged(@NonNull android.net.Network, boolean);

    method public void onCapabilitiesChanged(android.net.Network, android.net.NetworkCapabilities);

    method public void onLinkPropertiesChanged(android.net.Network, android.net.LinkProperties);

    method public void onLosing(android.net.Network, int);
@@ -29169,7 +29170,7 @@ package android.net { 
    method public final void start(@IntRange(from=0xa, to=0xe10) int);

    method public final void stop();

    field public static final int ERROR_HARDWARE_ERROR = -31; // 0xffffffe1

    field public static final int ERROR_HARDWARE_UNSUPPORTED = -30; // 0xffffffe2

    field public static final int ERROR_INSUFFICIENT_RESOURCES = -32; // 0xffffffe0

    field public static final int ERROR_INVALID_INTERVAL = -24; // 0xffffffe8

    field public static final int ERROR_INVALID_IP_ADDRESS = -21; // 0xffffffeb

    field public static final int ERROR_INVALID_LENGTH = -23; // 0xffffffe9
@@ -29177,6 +29178,7 @@ package android.net { 
    field public static final int ERROR_INVALID_PORT = -22; // 0xffffffea

    field public static final int ERROR_INVALID_SOCKET = -25; // 0xffffffe7

    field public static final int ERROR_SOCKET_NOT_IDLE = -26; // 0xffffffe6

    field public static final int ERROR_UNSUPPORTED = -30; // 0xffffffe2

  }















  public static class SocketKeepalive.Callback {










@@ -45500,26 +45502,26 @@ package android.telephony.data {













  public static class ApnSetting.Builder {















    ctor public ApnSetting.Builder();















    method public android.telephony.data.ApnSetting build();













    method @NonNull public android.telephony.data.ApnSetting.Builder setApnName(String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setApnName(@Nullable String);















    method @NonNull public android.telephony.data.ApnSetting.Builder setApnTypeBitmask(int);















    method @NonNull public android.telephony.data.ApnSetting.Builder setAuthType(int);















    method @NonNull public android.telephony.data.ApnSetting.Builder setCarrierEnabled(boolean);















    method @NonNull public android.telephony.data.ApnSetting.Builder setCarrierId(int);













    method @NonNull public android.telephony.data.ApnSetting.Builder setEntryName(String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setEntryName(@Nullable String);















    method @Deprecated public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.net.InetAddress);













    method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(@Nullable String);















    method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyPort(int);













    method @NonNull public android.telephony.data.ApnSetting.Builder setMmsc(android.net.Uri);













    method @NonNull public android.telephony.data.ApnSetting.Builder setMmsc(@Nullable android.net.Uri);















    method @NonNull public android.telephony.data.ApnSetting.Builder setMvnoType(int);















    method @NonNull public android.telephony.data.ApnSetting.Builder setNetworkTypeBitmask(int);













    method @NonNull public android.telephony.data.ApnSetting.Builder setOperatorNumeric(String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setPassword(String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setOperatorNumeric(@Nullable String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setPassword(@Nullable String);















    method @NonNull public android.telephony.data.ApnSetting.Builder setProtocol(int);















    method @Deprecated public android.telephony.data.ApnSetting.Builder setProxyAddress(java.net.InetAddress);













    method @NonNull public android.telephony.data.ApnSetting.Builder setProxyAddress(String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setProxyAddress(@Nullable String);















    method @NonNull public android.telephony.data.ApnSetting.Builder setProxyPort(int);















    method @NonNull public android.telephony.data.ApnSetting.Builder setRoamingProtocol(int);













    method @NonNull public android.telephony.data.ApnSetting.Builder setUser(String);













    method @NonNull public android.telephony.data.ApnSetting.Builder setUser(@Nullable String);















  }





























}

























api/system-current.txt



+25
−9






























Original line number
Diff line number
Diff line








@@ -1740,7 +1740,7 @@ package android.content.pm {













  }





























  public class ShortcutManager {













    method @NonNull public java.util.List<android.content.pm.ShortcutManager.ShareShortcutInfo> getShareTargets(@NonNull android.content.IntentFilter);













    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_APP_PREDICTIONS) public java.util.List<android.content.pm.ShortcutManager.ShareShortcutInfo> getShareTargets(@NonNull android.content.IntentFilter);















    method public boolean hasShareTargets(@NonNull String);















  }
























@@ -4019,8 +4019,8 @@ package android.net {













  }





























  public class ConnectivityManager {













    method @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) public android.net.SocketKeepalive createNattKeepalive(@NonNull android.net.Network, @NonNull java.io.FileDescriptor, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);













    method @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) public android.net.SocketKeepalive createSocketKeepalive(@NonNull android.net.Network, @NonNull java.net.Socket, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);













    method @NonNull @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) public android.net.SocketKeepalive createNattKeepalive(@NonNull android.net.Network, @NonNull android.os.ParcelFileDescriptor, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);













    method @NonNull @RequiresPermission(android.Manifest.permission.PACKET_KEEPALIVE_OFFLOAD) public android.net.SocketKeepalive createSocketKeepalive(@NonNull android.net.Network, @NonNull java.net.Socket, @NonNull java.util.concurrent.Executor, @NonNull android.net.SocketKeepalive.Callback);















    method @RequiresPermission(android.Manifest.permission.LOCAL_MAC_ADDRESS) public String getCaptivePortalServerUrl();















    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void getLatestTetheringEntitlementResult(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEntitlementResultListener);















    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();










@@ -4216,7 +4216,7 @@ package android.net {













    method @Nullable public String getDomains();















    method @Nullable public java.net.InetAddress getGateway();















    method @Nullable public android.net.LinkAddress getIpAddress();













    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(String);













    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(@Nullable String);















    method public void setDomains(@Nullable String);















    method public void setGateway(@Nullable java.net.InetAddress);















    method public void setIpAddress(@Nullable android.net.LinkAddress);










@@ -4436,7 +4436,7 @@ package android.net.metrics {













  }





























  public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {













    method public static String getProbeName(int);













    method @NonNull public static String getProbeName(int);















    field public static final int DNS_FAILURE = 0; // 0x0















    field public static final int DNS_SUCCESS = 1; // 0x1















    field public static final int PROBE_DNS = 0; // 0x0










@@ -6322,8 +6322,8 @@ package android.service.attention {













    ctor public AttentionService();















    method public final void disableSelf();















    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);













    method public abstract void onCancelAttentionCheck(int);













    method public abstract void onCheckAttention(int, @NonNull android.service.attention.AttentionService.AttentionCallback);













    method public abstract void onCancelAttentionCheck(@NonNull android.service.attention.AttentionService.AttentionCallback);













    method public abstract void onCheckAttention(@NonNull android.service.attention.AttentionService.AttentionCallback);















    field public static final int ATTENTION_FAILURE_CAMERA_PERMISSION_ABSENT = 6; // 0x6















    field public static final int ATTENTION_FAILURE_CANCELLED = 3; // 0x3















    field public static final int ATTENTION_FAILURE_PREEMPTED = 4; // 0x4









@@ -6335,8 +6335,8 @@ package android.service.attention {













  }





























  public static final class AttentionService.AttentionCallback {













    method public void onFailure(int, int);













    method public void onSuccess(int, int, long);













    method public void onFailure(int);













    method public void onSuccess(int, long);















  }





























}










@@ -6895,6 +6895,22 @@ package android.service.wallpaper {



























}



























package android.service.watchdog {

























  public abstract class ExplicitHealthCheckService extends android.app.Service {













    ctor public ExplicitHealthCheckService();













    method public final void notifyHealthCheckPassed(@NonNull String);













    method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);













    method public abstract void onCancelHealthCheck(@NonNull String);













    method @NonNull public abstract java.util.List<java.lang.String> onGetRequestedPackages();













    method @NonNull public abstract java.util.List<java.lang.String> onGetSupportedPackages();













    method public abstract void onRequestHealthCheck(@NonNull String);













    field public static final String BIND_PERMISSION = "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE";













    field public static final String SERVICE_INTERFACE = "android.service.watchdog.ExplicitHealthCheckService";













  }

























}



























package android.telecom {





























  @Deprecated public class AudioState implements android.os.Parcelable {

































api/test-current.txt



+5
−5






























Original line number
Diff line number
Diff line








@@ -1316,7 +1316,7 @@ package android.net {













    method @Nullable public String getDomains();















    method @Nullable public java.net.InetAddress getGateway();















    method @Nullable public android.net.LinkAddress getIpAddress();













    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(String);













    method @NonNull public java.util.List<android.net.RouteInfo> getRoutes(@Nullable String);















    method public void setDomains(@Nullable String);















    method public void setGateway(@Nullable java.net.InetAddress);















    method public void setIpAddress(@Nullable android.net.LinkAddress);










@@ -1535,7 +1535,7 @@ package android.net.metrics {













  }































  public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {













    method public static String getProbeName(int);













    method @NonNull public static String getProbeName(int);















    field public static final int DNS_FAILURE = 0; // 0x0















    field public static final int DNS_SUCCESS = 1; // 0x1















    field public static final int PROBE_DNS = 0; // 0x0










@@ -2150,9 +2150,9 @@ package android.provider {













    method @RequiresPermission(android.Manifest.permission.CLEAR_APP_USER_DATA) public static long getContributedMediaSize(android.content.Context, String, android.os.UserHandle) throws java.io.IOException;















    method @NonNull public static java.io.File getVolumePath(@NonNull String) throws java.io.FileNotFoundException;















    method @NonNull public static java.util.Collection<java.io.File> getVolumeScanPaths(@NonNull String) throws java.io.FileNotFoundException;













    field public static final String EXTRA_ORIGINATED_FROM_SHELL = "android.intent.extra.originated_from_shell";













    field public static final String SCAN_FILE_CALL = "scan_file";













    field public static final String SCAN_VOLUME_CALL = "scan_volume";













    method public static android.net.Uri scanFile(android.content.Context, java.io.File);













    method public static android.net.Uri scanFileFromShell(android.content.Context, java.io.File);













    method public static void scanVolume(android.content.Context, java.io.File);















  }































  public final class Settings {

































cmds/statsd/src/atoms.proto



+2
−0






























Original line number
Diff line number
Diff line








@@ -2433,6 +2433,8 @@ message TouchEventReported {













    optional float latency_mean_micros = 3;















    // Standard deviation















    optional float latency_stdev_micros = 4;













    // Number of touch events (input_event) in this report













    optional int32 count = 5;















}































/**