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

Commit 9c505541 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault"... 

Merge "Use -Xjvm-default=all instead of -Xjvm-default=enable or @JvmDefault" into udc-qpr-dev-plus-aosp am: ef56d22d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24119976



Change-Id: I6c6c5246c664b3b2c89943efa91f4cfe45bf5396
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62f869b6 ef56d22d

libs/WindowManager/Shell/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -166,7 +166,7 @@ android_library { 
        // *.kt sources are inside a filegroup.

        // *.kt sources are inside a filegroup.

        "kotlin-annotations",

        "kotlin-annotations",

    ],

    ],

    kotlincflags: ["-Xjvm-default=enable"],

    kotlincflags: ["-Xjvm-default=all"],

    manifest: "AndroidManifest.xml",

    manifest: "AndroidManifest.xml",

    plugins: ["dagger2-compiler"],

    plugins: ["dagger2-compiler"],

}
 
}

libs/WindowManager/Shell/src/com/android/wm/shell/common/FloatingContentCoordinator.kt

+0 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,6 @@ class FloatingContentCoordinator constructor() { 
         * non-overlapping.

         * non-overlapping.

         * @return The new bounds for this content.

         * @return The new bounds for this content.

         */

         */

        @JvmDefault

        fun calculateNewBoundsOnOverlap(

        fun calculateNewBoundsOnOverlap(

            overlappingContentBounds: Rect,

            overlappingContentBounds: Rect,

            otherContentBounds: List<Rect>

            otherContentBounds: List<Rect>

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeTaskRepository.kt

+1 −4
Original line number Original line Diff line number Diff line
@@ -368,7 +368,6 @@ class DesktopModeTaskRepository { 
        /**

        /**

         * Called when the active tasks change in desktop mode.

         * Called when the active tasks change in desktop mode.

         */

         */

        @JvmDefault

        fun onActiveTasksChanged(displayId: Int) {}

        fun onActiveTasksChanged(displayId: Int) {}

    }

    }
@@ -379,13 +378,11 @@ class DesktopModeTaskRepository { 
        /**

        /**

         * Called when the desktop starts or stops showing freeform tasks.

         * Called when the desktop starts or stops showing freeform tasks.

         */

         */

        @JvmDefault

        fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) {}

        fun onVisibilityChanged(displayId: Int, hasVisibleFreeformTasks: Boolean) {}





        /**

        /**

         * Called when the desktop stashed status changes.

         * Called when the desktop stashed status changes.

         */

         */

        @JvmDefault

        fun onStashedChanged(displayId: Int, stashed: Boolean) {}

        fun onStashedChanged(displayId: Int, stashed: Boolean) {}

    }

    }

}

}

libs/WindowManager/Shell/tests/unittest/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ android_test { 
        "libstaticjvmtiagent",

        "libstaticjvmtiagent",

    ],

    ],





    kotlincflags: ["-Xjvm-default=enable"],

    kotlincflags: ["-Xjvm-default=all"],





    plugins: ["dagger2-compiler"],

    plugins: ["dagger2-compiler"],

packages/CredentialManager/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ android_app { 
    platform_apis: true,

    platform_apis: true,

    privileged: true,

    privileged: true,





    kotlincflags: ["-Xjvm-default=enable"],

    kotlincflags: ["-Xjvm-default=all"],





    optimize: {

    optimize: {

        proguard_compatibility: false,

        proguard_compatibility: false,