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

Commit 70dd89e1 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5413448 from 7e8e0dd1 to qt-release

Change-Id: I4b26a655824f4a0433c45d813cfb2df55edb8b2a
parents 7a74fa5f 7e8e0dd1
Loading
Loading
Loading
Loading
+42 −5
Original line number Diff line number Diff line
@@ -721,6 +721,7 @@ java_defaults {
            "frameworks/av/camera/aidl",
            "frameworks/av/media/libaudioclient/aidl",
            "frameworks/native/aidl/gui",
            "frameworks/native/libs/incidentcompanion/binder",
            "system/core/storaged/binder",
            "system/vold/binder",
            "system/gsid/aidl",
@@ -968,7 +969,10 @@ java_library {
        output_params: ["store_unknown_fields=true"],
        include_dirs: ["external/protobuf/src"],
    },

    exclude_srcs: [
        "core/proto/android/privacy.proto",
        "core/proto/android/section.proto",
    ],
    sdk_version: "current",
    srcs: [
        "core/proto/**/*.proto",
@@ -988,6 +992,10 @@ java_library {
        "core/proto/**/*.proto",
        "libs/incident/proto/android/os/**/*.proto",
    ],
    exclude_srcs: [
        "core/proto/android/privacy.proto",
        "core/proto/android/section.proto",
    ],
    // Protos have lots of MissingOverride and similar.
    errorprone: {
        javacflags: ["-XepDisableAllChecks"],
@@ -995,9 +1003,9 @@ java_library {
}

// ====  c++ proto device library  ==============================
cc_library {
    name: "libplatformprotos",
    host_supported: true,
cc_defaults {
    name: "libplatformprotos-defaults",

    proto: {
        export_proto_headers: true,
        include_dirs: ["external/protobuf/src"],
@@ -1011,8 +1019,13 @@ cc_library {

    srcs: [
        "core/proto/**/*.proto",
        "libs/incident/**/*.proto",
    ],
}

cc_library {
    name: "libplatformprotos",
    defaults: ["libplatformprotos-defaults"],
    host_supported: true,

    target: {
        host: {
@@ -1024,6 +1037,9 @@ cc_library {
            proto: {
                type: "lite",
            },
            shared_libs: [
                "libprotobuf-cpp-lite",
            ],
            shared: {
                enabled: false,
            },
@@ -1031,6 +1047,26 @@ cc_library {
    },
}

// This is the full proto version of libplatformprotos. It may only
// be used by test code that is not shipped on the device.
cc_library {
    name: "libplatformprotos-test",
    defaults: ["libplatformprotos-defaults"],
    host_supported: false,

    target: {
        android: {
            proto: {
                type: "full",
            },
            shared: {
                enabled: false,
            },
        },
    },
}


gensrcs {
    name: "gen-platform-proto-constants",
    depfile: true,
@@ -1068,6 +1104,7 @@ gensrcs {
    output_extension: "proto.h",
}


subdirs = [
    "cmds/*",
    "core/*",
+50 −37
Original line number Diff line number Diff line
@@ -5480,7 +5480,7 @@ package android.app {
    method public int describeContents();
    method public boolean getAutoExpandBubble();
    method @Nullable public android.app.PendingIntent getDeleteIntent();
    method public int getDesiredHeight();
    method @Dimension(unit=android.annotation.Dimension.DP) public int getDesiredHeight();
    method @DimenRes public int getDesiredHeightResId();
    method @NonNull public android.graphics.drawable.Icon getIcon();
    method @NonNull public android.app.PendingIntent getIntent();
@@ -5494,7 +5494,7 @@ package android.app {
    method @NonNull public android.app.Notification.BubbleMetadata build();
    method @NonNull public android.app.Notification.BubbleMetadata.Builder setAutoExpandBubble(boolean);
    method @NonNull public android.app.Notification.BubbleMetadata.Builder setDeleteIntent(@Nullable android.app.PendingIntent);
    method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeight(int);
    method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeight(@Dimension(unit=android.annotation.Dimension.DP) int);
    method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeightResId(@DimenRes int);
    method @NonNull public android.app.Notification.BubbleMetadata.Builder setIcon(@NonNull android.graphics.drawable.Icon);
    method @NonNull public android.app.Notification.BubbleMetadata.Builder setIntent(@NonNull android.app.PendingIntent);
@@ -14100,8 +14100,9 @@ package android.graphics {
  }
  public class ComposeShader extends android.graphics.Shader {
    ctor public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.Xfermode);
    ctor public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.PorterDuff.Mode);
    ctor @Deprecated public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.Xfermode);
    ctor @Deprecated public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.PorterDuff.Mode);
    ctor public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.BlendMode);
  }
  public class CornerPathEffect extends android.graphics.PathEffect {
@@ -14795,37 +14796,37 @@ package android.graphics {
    field public float y;
  }
  public class PorterDuff {
    ctor public PorterDuff();
  @Deprecated public class PorterDuff {
    ctor @Deprecated public PorterDuff();
  }
  public enum PorterDuff.Mode {
    enum_constant public static final android.graphics.PorterDuff.Mode ADD;
    enum_constant public static final android.graphics.PorterDuff.Mode CLEAR;
    enum_constant public static final android.graphics.PorterDuff.Mode DARKEN;
    enum_constant public static final android.graphics.PorterDuff.Mode DST;
    enum_constant public static final android.graphics.PorterDuff.Mode DST_ATOP;
    enum_constant public static final android.graphics.PorterDuff.Mode DST_IN;
    enum_constant public static final android.graphics.PorterDuff.Mode DST_OUT;
    enum_constant public static final android.graphics.PorterDuff.Mode DST_OVER;
    enum_constant public static final android.graphics.PorterDuff.Mode LIGHTEN;
    enum_constant public static final android.graphics.PorterDuff.Mode MULTIPLY;
    enum_constant public static final android.graphics.PorterDuff.Mode OVERLAY;
    enum_constant public static final android.graphics.PorterDuff.Mode SCREEN;
    enum_constant public static final android.graphics.PorterDuff.Mode SRC;
    enum_constant public static final android.graphics.PorterDuff.Mode SRC_ATOP;
    enum_constant public static final android.graphics.PorterDuff.Mode SRC_IN;
    enum_constant public static final android.graphics.PorterDuff.Mode SRC_OUT;
    enum_constant public static final android.graphics.PorterDuff.Mode SRC_OVER;
    enum_constant public static final android.graphics.PorterDuff.Mode XOR;
  @Deprecated public enum PorterDuff.Mode {
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode ADD;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode CLEAR;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DARKEN;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_ATOP;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_IN;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_OUT;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_OVER;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode LIGHTEN;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode MULTIPLY;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode OVERLAY;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SCREEN;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_ATOP;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_IN;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_OUT;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_OVER;
    enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode XOR;
  }
  @Deprecated public class PorterDuffColorFilter extends android.graphics.ColorFilter {
    ctor @Deprecated public PorterDuffColorFilter(@ColorInt int, @NonNull android.graphics.PorterDuff.Mode);
  }
  public class PorterDuffXfermode extends android.graphics.Xfermode {
    ctor public PorterDuffXfermode(android.graphics.PorterDuff.Mode);
  @Deprecated public class PorterDuffXfermode extends android.graphics.Xfermode {
    ctor @Deprecated public PorterDuffXfermode(android.graphics.PorterDuff.Mode);
  }
  public interface PostProcessor {
@@ -15387,7 +15388,8 @@ package android.graphics.drawable {
    method public boolean setState(@NonNull int[]);
    method public void setTint(@ColorInt int);
    method public void setTintList(@Nullable android.content.res.ColorStateList);
    method public void setTintMode(@NonNull android.graphics.PorterDuff.Mode);
    method @Deprecated public void setTintMode(@NonNull android.graphics.PorterDuff.Mode);
    method public void setTintMode(@NonNull android.graphics.BlendMode);
    method public boolean setVisible(boolean, boolean);
    method public void unscheduleSelf(@NonNull Runnable);
  }
@@ -15545,7 +15547,8 @@ package android.graphics.drawable {
    method public void loadDrawableAsync(android.content.Context, android.graphics.drawable.Icon.OnDrawableLoadedListener, android.os.Handler);
    method public android.graphics.drawable.Icon setTint(@ColorInt int);
    method public android.graphics.drawable.Icon setTintList(android.content.res.ColorStateList);
    method public android.graphics.drawable.Icon setTintMode(android.graphics.PorterDuff.Mode);
    method @Deprecated @NonNull public android.graphics.drawable.Icon setTintMode(@NonNull android.graphics.PorterDuff.Mode);
    method @NonNull public android.graphics.drawable.Icon setTintMode(@NonNull android.graphics.BlendMode);
    method public void writeToParcel(android.os.Parcel, int);
    field @NonNull public static final android.os.Parcelable.Creator<android.graphics.drawable.Icon> CREATOR;
    field public static final int TYPE_ADAPTIVE_BITMAP = 5; // 0x5
@@ -23041,6 +23044,9 @@ package android.media {
    method public int getUsage();
    method public int getVolumeControlStream();
    method public void writeToParcel(android.os.Parcel, int);
    field public static final int ALLOW_CAPTURE_BY_ALL = 1; // 0x1
    field public static final int ALLOW_CAPTURE_BY_NONE = 3; // 0x3
    field public static final int ALLOW_CAPTURE_BY_SYSTEM = 2; // 0x2
    field public static final int CONTENT_TYPE_MOVIE = 3; // 0x3
    field public static final int CONTENT_TYPE_MUSIC = 2; // 0x2
    field public static final int CONTENT_TYPE_SONIFICATION = 4; // 0x4
@@ -23072,7 +23078,7 @@ package android.media {
    ctor public AudioAttributes.Builder();
    ctor public AudioAttributes.Builder(android.media.AudioAttributes);
    method public android.media.AudioAttributes build();
    method @NonNull public android.media.AudioAttributes.Builder setAllowCapture(boolean);
    method @NonNull public android.media.AudioAttributes.Builder setAllowedCapturePolicy(int);
    method public android.media.AudioAttributes.Builder setContentType(int);
    method public android.media.AudioAttributes.Builder setFlags(int);
    method public android.media.AudioAttributes.Builder setLegacyStreamType(int);
@@ -25069,7 +25075,7 @@ package android.media {
    field public static final String KEY_LANGUAGE = "language";
    field public static final String KEY_LATENCY = "latency";
    field public static final String KEY_LEVEL = "level";
    field public static final String KEY_MAX_BFRAMES = "max-bframes";
    field public static final String KEY_MAX_B_FRAMES = "max-bframes";
    field public static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";
    field public static final String KEY_MAX_HEIGHT = "max-height";
    field public static final String KEY_MAX_INPUT_SIZE = "max-input-size";
@@ -38851,6 +38857,7 @@ package android.provider {
    field public static final String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS";
    field public static final String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS";
    field public static final String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";
    field public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS";
    field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";
    field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";
    field public static final String ACTION_APP_USAGE_SETTINGS = "android.settings.action.APP_USAGE_SETTINGS";
@@ -49718,8 +49725,9 @@ package android.view {
    method public default CharSequence getContentDescription();
    method public int getGroupId();
    method public android.graphics.drawable.Drawable getIcon();
    method @Nullable public default android.graphics.BlendMode getIconTintBlendMode();
    method @Nullable public default android.content.res.ColorStateList getIconTintList();
    method @Nullable public default android.graphics.PorterDuff.Mode getIconTintMode();
    method @Deprecated @Nullable public default android.graphics.PorterDuff.Mode getIconTintMode();
    method public android.content.Intent getIntent();
    method public int getItemId();
    method public android.view.ContextMenu.ContextMenuInfo getMenuInfo();
@@ -49748,7 +49756,8 @@ package android.view {
    method public android.view.MenuItem setIcon(android.graphics.drawable.Drawable);
    method public android.view.MenuItem setIcon(@DrawableRes int);
    method public default android.view.MenuItem setIconTintList(@Nullable android.content.res.ColorStateList);
    method public default android.view.MenuItem setIconTintMode(@Nullable android.graphics.PorterDuff.Mode);
    method @Deprecated @NonNull public default android.view.MenuItem setIconTintMode(@Nullable android.graphics.PorterDuff.Mode);
    method @NonNull public default android.view.MenuItem setIconTintMode(@Nullable android.graphics.BlendMode);
    method public android.view.MenuItem setIntent(android.content.Intent);
    method public android.view.MenuItem setNumericShortcut(char);
    method public default android.view.MenuItem setNumericShortcut(char, int);
@@ -50401,8 +50410,9 @@ package android.view {
    method public int getAutofillType();
    method @Nullable public android.view.autofill.AutofillValue getAutofillValue();
    method public android.graphics.drawable.Drawable getBackground();
    method @Nullable public android.graphics.BlendMode getBackgroundBlendMode();
    method @Nullable public android.content.res.ColorStateList getBackgroundTintList();
    method @Nullable public android.graphics.PorterDuff.Mode getBackgroundTintMode();
    method @Deprecated @Nullable public android.graphics.PorterDuff.Mode getBackgroundTintMode();
    method @android.view.ViewDebug.ExportedProperty(category="layout") public int getBaseline();
    method @android.view.ViewDebug.CapturedViewProperty public final int getBottom();
    method protected float getBottomFadingEdgeStrength();
@@ -50433,9 +50443,10 @@ package android.view {
    method public java.util.ArrayList<android.view.View> getFocusables(int);
    method public void getFocusedRect(android.graphics.Rect);
    method public android.graphics.drawable.Drawable getForeground();
    method @Nullable public android.graphics.BlendMode getForegroundBlendMode();
    method public int getForegroundGravity();
    method @Nullable public android.content.res.ColorStateList getForegroundTintList();
    method @Nullable public android.graphics.PorterDuff.Mode getForegroundTintMode();
    method @Deprecated @Nullable public android.graphics.PorterDuff.Mode getForegroundTintMode();
    method public boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point);
    method public final boolean getGlobalVisibleRect(android.graphics.Rect);
    method public android.os.Handler getHandler();
@@ -50751,7 +50762,8 @@ package android.view {
    method @Deprecated public void setBackgroundDrawable(android.graphics.drawable.Drawable);
    method public void setBackgroundResource(@DrawableRes int);
    method public void setBackgroundTintList(@Nullable android.content.res.ColorStateList);
    method public void setBackgroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
    method @Deprecated public void setBackgroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
    method public void setBackgroundTintMode(@Nullable android.graphics.BlendMode);
    method public final void setBottom(int);
    method public void setCameraDistance(float);
    method public void setClickable(boolean);
@@ -50778,7 +50790,8 @@ package android.view {
    method public void setForeground(android.graphics.drawable.Drawable);
    method public void setForegroundGravity(int);
    method public void setForegroundTintList(@Nullable android.content.res.ColorStateList);
    method public void setForegroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
    method @Deprecated public void setForegroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
    method public void setForegroundTintMode(@Nullable android.graphics.BlendMode);
    method public void setHapticFeedbackEnabled(boolean);
    method public void setHasTransientState(boolean);
    method public void setHorizontalFadingEdgeEnabled(boolean);
+13 −10

File changed.

Preview size limit exceeded, changes collapsed.

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ package android.location {
    method @Deprecated public boolean addGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener);
    method @Deprecated public void removeGpsMeasurementListener(android.location.GpsMeasurementsEvent.Listener);
    method @Deprecated public void removeGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener);
    method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void setLocationControllerExtraPackage(String);
    method @Deprecated @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public void setLocationControllerExtraPackageEnabled(boolean);
  }

}
+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ package android.content.pm {
  public abstract class PackageManager {
    method public abstract boolean arePermissionsIndividuallyControlled();
    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS_FULL") public abstract String getDefaultBrowserPackageNameAsUser(int);
    method public String getIncidentReportApproverPackageName();
    method @Nullable public String getIncidentReportApproverPackageName();
    method public abstract int getInstallReason(String, @NonNull android.os.UserHandle);
    method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);
    method @RequiresPermission("android.permission.INTERACT_ACROSS_USERS_FULL") public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
Loading