Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306
Merged-In: I4f880323b200e49ebfba43ced35b7c1aab8d6cc4
Change-Id: I3b3f30b8bc1ae4f5fb4c5ce1c35d63be8cc38ee6

Author: delphij

Diff for: PREUPLOAD.cfg

@@ -4,9 +4,12 @@
 [Builtin Hooks]
 rustfmt = true
 ktfmt = true
+bpfmt = true
+clang_format = true
 
 [Builtin Hooks Options]
 ktfmt = --kotlinlang-style
+clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
 
 [Options]
 ignore_merged_commits = true

Diff for: apps/ShareTest/Android.bp

@@ -23,7 +23,7 @@ android_app {
         "**/*.kt",
     ],
     asset_dirs: ["assets"],
-    sdk_version: "current",
+    sdk_version: "35",
     static_libs: [
         "androidx.core_core-ktx",
         "androidx.compose.runtime_runtime",

Diff for: apps/ShareTest/res/layout/activity_main.xml

@@ -437,6 +437,19 @@
                 android:layout_height="wrap_content"
                 android:text="Include Caller Direct Target"
                 />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subtitle"
+                android:text="Exclude Targets"
+                />
+            <CheckBox
+                android:id="@+id/exclude_self"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Exclude self from targets (for Shareousel payload change: set for an odd number of items)"
+                />
         </LinearLayout>
     </ScrollView>
     <Button

Diff for: apps/ShareTest/src/com/android/sharetest/AdditionalContentProvider.kt

@@ -1,5 +1,6 @@
 package com.android.sharetest
 
+import android.content.ComponentName
 import android.content.ContentProvider
 import android.content.ContentValues
 import android.content.Intent
@@ -27,19 +28,19 @@ class AdditionalContentProvider : ContentProvider() {
         val cursor = MatrixCursor(arrayOf(AdditionalContentContract.Columns.URI))
         val chooserIntent =
             queryArgs?.getParcelable(Intent.EXTRA_INTENT, Intent::class.java) ?: return cursor
-        val count = runCatching {
-            uri.getQueryParameter(PARAM_COUNT)?.toInt()
-        }.getOrNull() ?: ImageContentProvider.IMAGE_COUNT
-        val includeSize = runCatching {
-            uri.getQueryParameter(PARAM_SIZE_META).toBoolean()
-        }.getOrDefault(true)
-        val mimeTypes = kotlin.runCatching {
-            uri.getQueryParameters(PARAM_MIME_TYPE)
-        }.getOrNull() ?: listOf("image/jpeg")
+        val count =
+            runCatching { uri.getQueryParameter(PARAM_COUNT)?.toInt() }.getOrNull()
+                ?: ImageContentProvider.IMAGE_COUNT
+        val includeSize =
+            runCatching { uri.getQueryParameter(PARAM_SIZE_META).toBoolean() }.getOrDefault(true)
+        val mimeTypes =
+            kotlin.runCatching { uri.getQueryParameters(PARAM_MIME_TYPE) }.getOrNull()
+                ?: listOf("image/jpeg")
         // Images are img1 ... img8
-        val uris = Array(count) { idx ->
-            ImageContentProvider.makeItemUri(idx, mimeTypes[idx % mimeTypes.size], includeSize)
-        }
+        val uris =
+            Array(count) { idx ->
+                ImageContentProvider.makeItemUri(idx, mimeTypes[idx % mimeTypes.size], includeSize)
+            }
         val callingPackage = getCallingPackage()
         for (u in uris) {
             cursor.addRow(arrayOf(u.toString()))
@@ -48,11 +49,12 @@ class AdditionalContentProvider : ContentProvider() {
         val startPos = chooserIntent.getIntExtra(CURSOR_START_POSITION, -1)
         if (startPos >= 0) {
             var cursorExtras = cursor.extras
-            cursorExtras = if (cursorExtras == null) {
-                Bundle()
-            } else {
-                Bundle(cursorExtras)
-            }
+            cursorExtras =
+                if (cursorExtras == null) {
+                    Bundle()
+                } else {
+                    Bundle(cursorExtras)
+                }
             cursorExtras.putInt(AdditionalContentContract.CursorExtraKeys.POSITION, startPos)
             cursor.extras = cursorExtras
         }
@@ -78,22 +80,22 @@ class AdditionalContentProvider : ContentProvider() {
 
         // Update alternate intent if the chooser intent has one.
         if (chooserIntent.hasExtra(Intent.EXTRA_ALTERNATE_INTENTS)) {
-            chooserIntent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)
-                ?.let { targetIntent ->
-                    result.putParcelableArray(
-                        Intent.EXTRA_ALTERNATE_INTENTS,
-                        arrayOf(createAlternateIntent(targetIntent))
-                    )
-                }
+            chooserIntent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)?.let {
+                targetIntent ->
+                result.putParcelableArray(
+                    Intent.EXTRA_ALTERNATE_INTENTS,
+                    arrayOf(createAlternateIntent(targetIntent))
+                )
+            }
         }
 
         if (chooserIntent.hasExtra(Intent.EXTRA_CHOOSER_MODIFY_SHARE_ACTION)) {
             result.setModifyShareAction(
                 context,
-                chooserIntent.getParcelableExtra(
-                    Intent.EXTRA_INTENT,
-                    Intent::class.java
-                )?.extraStream?.size ?: -1
+                chooserIntent
+                    .getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)
+                    ?.extraStream
+                    ?.size ?: -1
             )
         }
 
@@ -105,12 +107,10 @@ class AdditionalContentProvider : ContentProvider() {
                         context,
                         buildString {
                             append("Modified Caller Target. Shared URIs:")
-                            chooserIntent.getParcelableExtra(
-                                Intent.EXTRA_INTENT,
-                                Intent::class.java
-                            )?.extraStream?.forEach {
-                                append("\n * $it")
-                            }
+                            chooserIntent
+                                .getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)
+                                ?.extraStream
+                                ?.forEach { append("\n * $it") }
                         }
                     )
                 )
@@ -124,6 +124,24 @@ class AdditionalContentProvider : ContentProvider() {
             )
         }
 
+        if (chooserIntent.hasExtra(Intent.EXTRA_EXCLUDE_COMPONENTS)) {
+            chooserIntent.getParcelableExtra(Intent.EXTRA_INTENT, Intent::class.java)?.let {
+                targetIntent ->
+                val excluded =
+                    if (targetIntent.extraStream.size % 2 == 0) {
+                        null
+                    } else {
+                        arrayOf(
+                            ComponentName(
+                                context.packageName,
+                                CallerDirectTargetActivity::class.java.name
+                            )
+                        )
+                    }
+                result.putParcelableArray(Intent.EXTRA_EXCLUDE_COMPONENTS, excluded)
+            }
+        }
+
         val latency = chooserIntent.getIntExtra(EXTRA_SELECTION_LATENCY, 0)
         if (latency > 0) {
             SystemClock.sleep(latency.toLong())
@@ -172,4 +190,3 @@ class AdditionalContentProvider : ContentProvider() {
         val PARAM_MIME_TYPE = "mimetype"
     }
 }
-