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

Commit 893b4269 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5351881 from 9990911b to qt-release 

Change-Id: If84aa5389732cd092c43de36dcee465bbf1e70b1
parents cec13830 9990911b

Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -1788,3 +1788,10 @@ filegroup { 
    ],

}



// Creates an index of AIDL methods; used for adding UnsupportedAppUsage

// annotations to private apis

aidl_mapping {

    name: "framework-aidl-mappings",

    srcs: [":framework-defaults"],

    output: "framework-aidl-mappings.txt"

}
 
 No newline at end of file

api/current.txt

+82 −81

File changed.

Preview size limit exceeded, changes collapsed.

api/system-current.txt

+91 −82

File changed.

Preview size limit exceeded, changes collapsed.

api/test-current.txt

+59 −22
Original line number Diff line number Diff line
@@ -193,29 +193,36 @@ package android.app { 
    field public static final String OPSTR_WRITE_SMS = "android:write_sms";

    field public static final String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper";

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

    field public static final int OP_FLAGS_ALL = 31; // 0x1f

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

    field public static final int OP_FLAG_TRUSTED_PROXIED = 8; // 0x8

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

    field public static final int OP_FLAG_UNTRUSTED_PROXIED = 16; // 0x10

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

    field public static final int OP_RECORD_AUDIO = 27; // 0x1b

    field public static final int OP_START_FOREGROUND = 76; // 0x4c

    field public static final int OP_SYSTEM_ALERT_WINDOW = 24; // 0x18

    field public static final int UID_STATE_BACKGROUND = 5; // 0x5

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

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

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

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

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

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

    field public static final int UID_STATE_BACKGROUND = 600; // 0x258

    field public static final int UID_STATE_CACHED = 700; // 0x2bc

    field public static final int UID_STATE_FOREGROUND = 500; // 0x1f4

    field public static final int UID_STATE_FOREGROUND_SERVICE = 400; // 0x190

    field public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300; // 0x12c

    field public static final int UID_STATE_PERSISTENT = 100; // 0x64

    field public static final int UID_STATE_TOP = 200; // 0xc8

  }



  public static final class AppOpsManager.HistoricalOp implements android.os.Parcelable {

    method public int describeContents();

    method public long getAccessCount(int);

    method public long getAccessDuration(int);

    method public long getBackgroundAccessCount();

    method public long getBackgroundAccessDuration();

    method public long getBackgroundRejectCount();

    method public long getForegroundAccessCount();

    method public long getForegroundAccessDuration();

    method public long getForegroundRejectCount();

    method public long getAccessCount(int, int, int);

    method public long getAccessDuration(int, int, int);

    method public long getBackgroundAccessCount(int);

    method public long getBackgroundAccessDuration(int);

    method public long getBackgroundRejectCount(int);

    method public long getForegroundAccessCount(int);

    method public long getForegroundAccessDuration(int);

    method public long getForegroundRejectCount(int);

    method @NonNull public String getOpName();

    method public long getRejectCount(int);

    method public long getRejectCount(int, int, int);

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOp> CREATOR;

  }
@@ -228,9 +235,9 @@ package android.app { 
    method public int getUidCount();

    method @Nullable public android.app.AppOpsManager.HistoricalUidOps getUidOps(int);

    method @NonNull public android.app.AppOpsManager.HistoricalUidOps getUidOpsAt(int);

    method public void increaseAccessCount(int, int, @NonNull String, int, long);

    method public void increaseAccessDuration(int, int, @NonNull String, int, long);

    method public void increaseRejectCount(int, int, @NonNull String, int, long);

    method public void increaseAccessCount(int, int, @NonNull String, int, int, long);

    method public void increaseAccessDuration(int, int, @NonNull String, int, int, long);

    method public void increaseRejectCount(int, int, @NonNull String, int, int, long);

    method public void offsetBeginAndEndTime(long);

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.HistoricalOps> CREATOR;
@@ -242,6 +249,7 @@ package android.app { 
  public static final class AppOpsManager.HistoricalOpsRequest.Builder {

    ctor public AppOpsManager.HistoricalOpsRequest.Builder(long, long);

    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest build();

    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setFlags(int);

    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setOpNames(@Nullable java.util.List<java.lang.String>);

    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setPackageName(@Nullable String);

    method @NonNull public android.app.AppOpsManager.HistoricalOpsRequest.Builder setUid(int);
@@ -271,6 +279,31 @@ package android.app { 
    method public void onOpActiveChanged(int, int, String, boolean);

  }



  public static final class AppOpsManager.OpEntry implements android.os.Parcelable {

    method public int describeContents();

    method public long getDuration();

    method public long getLastAccessBackgroundTime(int);

    method public long getLastAccessForegroundTime(int);

    method public long getLastAccessTime(int);

    method public long getLastAccessTime(int, int, int);

    method public long getLastBackgroundDuration(int);

    method public long getLastDuration(int, int, int);

    method public long getLastForegroundDuration(int);

    method public long getLastRejectBackgroundTime(int);

    method public long getLastRejectForegroundTime(int);

    method public long getLastRejectTime(int);

    method public long getLastRejectTime(int, int, int);

    method public int getMode();

    method @NonNull public String getOpStr();

    method @Nullable public String getProxyPackageName();

    method @Nullable public String getProxyPackageName(int, int);

    method public int getProxyUid();

    method public int getProxyUid(int, int);

    method public boolean isRunning();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.AppOpsManager.OpEntry> CREATOR;

  }



  public class DownloadManager {

    field public static final String COLUMN_MEDIASTORE_URI = "mediastore_uri";

  }
@@ -978,7 +1011,7 @@ package android.media { 
    method public android.media.MediaPlayer2.DrmInfo getDrmInfo(@NonNull android.media.DataSourceDesc);

    method public android.media.MediaDrm.KeyRequest getDrmKeyRequest(@NonNull android.media.DataSourceDesc, @Nullable byte[], @Nullable byte[], @Nullable String, int, @Nullable java.util.Map<java.lang.String,java.lang.String>) throws android.media.MediaPlayer2.NoDrmSchemeException;

    method public String getDrmPropertyString(@NonNull android.media.DataSourceDesc, @NonNull String) throws android.media.MediaPlayer2.NoDrmSchemeException;

    method public Object prepareDrm(@NonNull android.media.DataSourceDesc, @NonNull java.util.UUID);

    method @NonNull public Object prepareDrm(@NonNull android.media.DataSourceDesc, @NonNull java.util.UUID);

    method public byte[] provideDrmKeyResponse(@NonNull android.media.DataSourceDesc, @Nullable byte[], @NonNull byte[]) throws android.media.DeniedByServerException, android.media.MediaPlayer2.NoDrmSchemeException;

    method public void releaseDrm(@NonNull android.media.DataSourceDesc) throws android.media.MediaPlayer2.NoDrmSchemeException;

    method public void restoreDrmKeys(@NonNull android.media.DataSourceDesc, @NonNull byte[]) throws android.media.MediaPlayer2.NoDrmSchemeException;
@@ -2335,7 +2368,7 @@ package android.telecom { 
  public class TelecomManager {

    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCurrentTtyMode();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean isInEmergencyCall();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(android.telecom.PhoneAccountHandle);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUserSelectedOutgoingPhoneAccount(@Nullable android.telecom.PhoneAccountHandle);

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

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

    field public static final int TTY_MODE_OFF = 0; // 0x0
@@ -2732,6 +2765,10 @@ package android.view { 
    field public static final int CALLBACK_ANIMATION = 1; // 0x1

  }



  public final class Display {

    method public boolean hasAccess(int);

  }



  public class FocusFinder {

    method public static void sort(android.view.View[], int, int, android.view.ViewGroup, boolean);

  }
@@ -2996,7 +3033,7 @@ package android.view.inspector { 
    method public abstract String value();

  }



  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD}) public @interface InspectableProperty {

  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.FIELD}) public @interface InspectableProperty {

    method public abstract int attributeId() default android.content.res.Resources.ID_NULL;

    method public abstract android.view.inspector.InspectableProperty.EnumMap[] enumMapping() default {};

    method public abstract android.view.inspector.InspectableProperty.FlagMap[] flagMapping() default {};

cmds/incident_helper/src/ih_util.cpp

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ record_t parseRecordByColumns(const std::string& line, const std::vector<int>& i 
    }

    if (lineSize - lastIndex > 0) {

        int beginning = lastIndex;

        if (record.size() == indices.size()) {

        if (record.size() == indices.size() && !record.empty()) {

            // We've already encountered all of the columns...put whatever is

            // left in the last column.

            record.pop_back();