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

Unverified Commit 11489ff8 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-16.0.0_r3' into staging/lineage-23.0_merge-android-16.0.0_r3 

Android 16.0.0 Release 3 (BP3A.250905.014)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCaRO/HAAKCRDorT+BmrEO
# ePncAJwNTdfNBqxszFmC+w8hBJ7UQI5McACcCos6jJztcqE7G+k627HrEu51OAU=
# =PPh4
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Nov 12 00:56:28 2025 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate]

# By Ben Reich (78) and others
# Via Android (Google) Code Review (219) and others
* tag 'android-16.0.0_r3': (277 commits)
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Synchronize access to Job.mState
  Allow the Material 3 override to bypass an already set value
  Revert^2 "[DocsUI, Search]: Add extras about slow search."
  Report failed paths when unpacking archive
  [DocsUI Peek] Fix background selection test
  [DocsUI Peek] Image preview
  Make Job.failureCount volatile
  Fix TrampolineActivityTest on Android T
  Revert "[DocsUI, Search]: Add extras about slow search."
  [DocsUI M3] Update a11y voice announcement for file selection
  [DocsUI Peek] Metadata sheet container
  Check CRC and size when extracting file from archive
  [DocsUI, Search]: Add extras about slow search.
  [DocsUI Peek] Simplify PeekUiTest
  ...

 Conflicts:
	src/com/android/documentsui/IconUtils.java
	src/com/android/documentsui/MenuManager.java
	src/com/android/documentsui/base/Shared.java
	tests/common/com/android/documentsui/dirlist/TestEnvironment.java

Change-Id: I6975fd813d50f1cd16992f7c10ef13ae74b14bab
parents d5fa33ed 82bd0a29

Android.bp

+9 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ java_defaults { 
        "androidx.legacy_legacy-support-core-ui",

        "androidx.legacy_legacy-support-v13",

        "androidx.legacy_legacy-support-v4",

        "androidx.lifecycle_lifecycle-viewmodel-ktx",

        "androidx.recyclerview_recyclerview",

        "androidx.recyclerview_recyclerview-selection",

        "androidx.transition_transition",
@@ -65,6 +66,12 @@ java_defaults { 
        "docsui-change-ids",

        "guava",

        "modules-utils-build_system",

        // Glide and dependencies. Optimized out when use_peek_preview_ro flag enabled.

        // See b/421076517 for more details.

        "androidx.exifinterface_exifinterface",

        "glide-disklrucache-prebuilt",

        "glide-gifdecoder-prebuilt",

        "glide-prebuilt",

    ],



    privileged: true,
@@ -102,7 +109,7 @@ genrule { 
    name: "statslog-docsui-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module docsui" +

        " --javaPackage com.android.documentsui --javaClass DocumentsStatsLog --minApiLevel 29",

        " --javaPackage com.android.documentsui --javaClass DocumentsStatsLog --minApiLevel 30",

    out: ["com/android/documentsui/DocumentsStatsLog.java"],

}
@@ -169,6 +176,7 @@ android_app { 
    licenses: [

        "Android-Apache-2.0",

        "packages_apps_DocumentsUI_res_drawable_pd_license",

        "opensourcerequest",

    ],



    required: ["privapp_whitelist_com.android.documentsui"],

AndroidManifest.xml

+4 −29
Original line number Diff line number Diff line
@@ -66,28 +66,12 @@ 
            android:theme="@android:style/Theme.NoDisplay"

            android:featureFlag="com.android.documentsui.flags.redirect_get_content_ro"

            android:visibleToInstantApps="true">

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.OPEN_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.CREATE_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.GET_CONTENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



        <activity
@@ -95,33 +79,25 @@ 
            android:exported="true"

            android:theme="@style/LauncherTheme"

            android:visibleToInstantApps="true">

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.OPEN_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.CREATE_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.GET_CONTENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

            <intent-filter android:priority="100">

                <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>
@@ -153,7 +129,6 @@ 
                <category android:name="android.intent.category.LAUNCHER" />

                <category android:name="android.intent.category.APP_FILES" />

            </intent-filter>

            <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts" />

        </activity-alias>



        <activity

OWNERS

+5 −1
Original line number Diff line number Diff line
@@ -2,5 +2,9 @@ 


include platform/frameworks/base:/core/java/android/os/storage/OWNERS



benreich@google.com

# For one of the below, please use android-files+reviews@google.com as the

# reviewer.

alexbn@google.com

benreich@google.com

lucmult@google.com

wenbojie@google.com

PREUPLOAD.cfg

+3 −0
Original line number Diff line number Diff line
@@ -2,3 +2,6 @@ 
checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}



# go/alint for details

alint_hook = ${REPO_ROOT}/vendor/google/tools/alint

TEST_MAPPING

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 
    }

  ],

  "desktop-postsubmit": [    {

      "name": "DocumentsUIGoogleTests",

      "keywords": ["primary-device"]

      "name": "DocumentsUIGoogleTests"

    },

    {

      "name": "DocumentsUIUnitTests"