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

Commit 3e9c0446 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6388478 from 46a14ba7 to mainline-release 

Change-Id: I70b888fa342a8dd6df707f0443b7e69794578168
parents 7390c01f 46a14ba7

Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -339,9 +339,7 @@ java_defaults { 
            "sax/java",

            "telecomm/java",



            // TODO(b/148660295): remove this

            "apex/media/framework/java",



            "apex/media/aidl/stable",

            // TODO(b/147699819): remove this

            "telephony/java",

        ],

StubLibraries.bp

+7 −9
Original line number Diff line number Diff line
@@ -256,18 +256,16 @@ droidstubs { 
/////////////////////////////////////////////////////////////////////



java_defaults {

    name: "framework-stubs-default",

    name: "android_defaults_stubs_current",

    libs: [ "stub-annotations" ],

    static_libs: [ "private-stub-annotations-jar" ],

    sdk_version: "core_current",

    errorprone: {

        javacflags: [

            "-XepDisableAllChecks",

        ],

    },

    java_resources: [

        ":notices-for-framework-stubs",

    ],

    java_resources: [":notices-for-framework-stubs"],

    sdk_version: "none",

    system_modules: "none",

    java_version: "1.8",

    compile_dex: true,
@@ -276,25 +274,25 @@ java_defaults { 
java_library_static {

    name: "android_stubs_current",

    srcs: [ ":api-stubs-docs" ],

    defaults: ["framework-stubs-default"],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_system_stubs_current",

    srcs: [ ":system-api-stubs-docs" ],

    defaults: ["framework-stubs-default"],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_test_stubs_current",

    srcs: [ ":test-api-stubs-docs" ],

    defaults: ["framework-stubs-default"],

    defaults: ["android_defaults_stubs_current"],

}



java_library_static {

    name: "android_module_lib_stubs_current",

    srcs: [ ":module-lib-api-stubs-docs" ],

    defaults: ["framework-stubs-default"],

    defaults: ["android_defaults_stubs_current"],

    libs: ["android_system_stubs_current"],

}

apct-tests/perftests/core/src/android/wm/RecentsAnimationPerfTest.java

+5 −0
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ public class RecentsAnimationPerfTest extends WindowManagerPerfTestBase { 
                Assume.assumeNoException(

                        new AssertionError("onAnimationCanceled should not be called"));

            }



            @Override

            public void onTaskAppeared(RemoteAnimationTarget app) throws RemoteException {

                /* no-op */

            }

        };



        recentsSemaphore.tryAcquire();

apex/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ stubs_defaults { 
    name: "framework-module-stubs-defaults-publicapi",

    args: mainline_framework_stubs_args,

    installable: false,

    sdk_version: "current",

    sdk_version: "module_current",

    filter_packages: framework_packages_to_document,

    check_api: {

        current: {
@@ -86,7 +86,7 @@ stubs_defaults { 
    args: mainline_framework_stubs_args + priv_apps,

    libs: ["framework-annotations-lib"],

    installable: false,

    sdk_version: "system_current",

    sdk_version: "module_current",

    filter_packages: framework_packages_to_document,

    check_api: {

        current: {

apex/blobstore/framework/java/android/app/blob/XmlTags.java

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ public final class XmlTags { 


    // For committer

    public static final String TAG_COMMITTER = "c";

    public static final String ATTR_COMMIT_TIME_MS = "cmt";



    // For leasee

    public static final String TAG_LEASEE = "l";