Merge "Merge Android 12"
diff --git a/apex/media/OWNERS b/apex/media/OWNERS
index 73f02d3..bed3895 100644
--- a/apex/media/OWNERS
+++ b/apex/media/OWNERS
@@ -8,3 +8,6 @@
# go/android-fwk-media-solutions for info on areas of ownership.
include platform/frameworks/av:/media/janitors/media_solutions_OWNERS
+
+# media reliability team packages/delivers the media mainline builds.
+include platform/frameworks/av:/media/janitors/reliability_mainline_OWNERS
diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp
index cc45589..c134822 100644
--- a/cmds/idmap2/Android.bp
+++ b/cmds/idmap2/Android.bp
@@ -52,6 +52,7 @@
"-readability-const-return-type",
"-readability-convert-member-functions-to-static",
"-readability-else-after-return",
+ "-readability-identifier-length",
"-readability-named-parameter",
"-readability-redundant-access-specifiers",
"-readability-uppercase-literal-suffix",
diff --git a/core/api/current.txt b/core/api/current.txt
index fe62c6d..738851b 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -39607,6 +39607,7 @@
field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
field public static final int CAPABILITY_MUTE = 64; // 0x40
+ field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 268435456; // 0x10000000
field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
@@ -39893,6 +39894,7 @@
field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
field public static final int CAPABILITY_MUTE = 64; // 0x40
+ field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 536870912; // 0x20000000
field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java
index f215325..92eb7a5 100644
--- a/core/java/android/os/Bundle.java
+++ b/core/java/android/os/Bundle.java
@@ -33,6 +33,9 @@
/**
* A mapping from String keys to various {@link Parcelable} values.
*
+ * <p><b>Warning:</b> Note that {@link Bundle} is a lazy container and as such it does NOT implement
+ * {@link #equals(Object)} or {@link #hashCode()}.
+ *
* @see PersistableBundle
*/
public final class Bundle extends BaseBundle implements Cloneable, Parcelable {
@@ -1230,6 +1233,10 @@
maybePrefillHasFds();
}
+ /**
+ * Returns a string representation of the {@link Bundle} that may be suitable for debugging. It
+ * won't print the internal map if its content hasn't been unparcelled.
+ */
@Override
public synchronized String toString() {
if (mParcelledData != null) {
diff --git a/core/java/android/os/PersistableBundle.java b/core/java/android/os/PersistableBundle.java
index 76b88a3..7b55e710 100644
--- a/core/java/android/os/PersistableBundle.java
+++ b/core/java/android/os/PersistableBundle.java
@@ -43,6 +43,9 @@
* supported by this class is purposefully restricted to simple objects that can
* safely be persisted to and restored from disk.
*
+ * <p><b>Warning:</b> Note that {@link PersistableBundle} is a lazy container and as such it does
+ * NOT implement {@link #equals(Object)} or {@link #hashCode()}.
+ *
* @see Bundle
*/
public final class PersistableBundle extends BaseBundle implements Cloneable, Parcelable,
@@ -324,8 +327,12 @@
return new PersistableBundle(); // An empty mutable PersistableBundle
}
+ /**
+ * Returns a string representation of the {@link PersistableBundle} that may be suitable for
+ * debugging. It won't print the internal map if its content hasn't been unparcelled.
+ */
@Override
- synchronized public String toString() {
+ public synchronized String toString() {
if (mParcelledData != null) {
if (isEmptyParcel()) {
return "PersistableBundle[EMPTY_PARCEL]";
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
old mode 100755
new mode 100644
index f0d43fa..d94fafc
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -564,8 +564,14 @@
*/
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x08000000;
+ /**
+ * Indicates whether the remote party supports RTT or not to the UI.
+ */
+
+ public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 0x10000000;
+
//******************************************************************************************
- // Next CAPABILITY value: 0x10000000
+ // Next CAPABILITY value: 0x20000000
//******************************************************************************************
/**
@@ -817,6 +823,9 @@
if (can(capabilities, CAPABILITY_TRANSFER_CONSULTATIVE)) {
builder.append(" CAPABILITY_TRANSFER_CONSULTATIVE");
}
+ if (can(capabilities, CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT)) {
+ builder.append(" CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT");
+ }
builder.append("]");
return builder.toString();
}
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 300caa8..d06fe45 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -422,8 +422,14 @@
*/
public static final int CAPABILITY_TRANSFER_CONSULTATIVE = 0x10000000;
+ /**
+ * Indicates whether the remote party supports RTT or not to the UI.
+ */
+
+ public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 0x20000000;
+
//**********************************************************************************************
- // Next CAPABILITY value: 0x20000000
+ // Next CAPABILITY value: 0x40000000
//**********************************************************************************************
/**
@@ -1123,6 +1129,10 @@
== CAPABILITY_TRANSFER_CONSULTATIVE) {
builder.append(isLong ? " CAPABILITY_TRANSFER_CONSULTATIVE" : " sup_cTrans");
}
+ if ((capabilities & CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT)
+ == CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT) {
+ builder.append(isLong ? " CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT" : " sup_rtt");
+ }
builder.append("]");
return builder.toString();
}