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

Commit 553eeb31 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12348750 from 8f6ec868 to 24Q4-release 

Change-Id: I3f952ae28d65b4e8bcdde6175e544c8d5c390f60
parents 423c6115 8f6ec868

iconloaderlib/src/com/android/launcher3/util/ComponentKey.java

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ public class ComponentKey { 


    @Override

    public boolean equals(Object o) {

        ComponentKey other = (ComponentKey) o;

        return other.componentName.equals(componentName) && other.user.equals(user);

        return (o instanceof ComponentKey other)

                && other.componentName.equals(componentName) && other.user.equals(user);

    }



    /**

toruslib/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -47,7 +47,5 @@ android_library { 
    optimize: {

        enabled: true,

    },

    min_sdk_version: "31",

    sdk_version: "system_current",

    platform_apis: true,

}

toruslib/torus-core/src/main/java/com/google/android/torus/core/wallpaper/LiveWallpaper.kt

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ abstract class LiveWallpaper : WallpaperService() { 
        /**

         * This is overriding a hidden API [WallpaperService.shouldZoomOutWallpaper].

         */

        fun shouldZoomOutWallpaper(): Boolean {

        override fun shouldZoomOutWallpaper(): Boolean {

            if (wallpaperEngine is LiveWallpaperEventListener) {

                return (wallpaperEngine as LiveWallpaperEventListener).shouldZoomOutWallpaper()

            }

tracinglib/benchmark/Android.bp

0 → 100644
+48 −0
Original line number Diff line number Diff line 
// Copyright (C) 2024 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



package {

    default_team: "trendy_team_performance",

    default_applicable_licenses: ["Android-Apache-2.0"],

}



android_test {

    name: "tracinglib-benchmark",



    srcs: ["src/**/*.kt"],



    static_libs: [

        "androidx.annotation_annotation",

        "androidx.benchmark_benchmark-common",

        "androidx.benchmark_benchmark-junit4",

        "androidx.test.core",

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "androidx.test.runner",

        "apct-perftests-utils",

        "collector-device-lib",

        "flag-junit",

        "kotlinx_coroutines_android",

        "platform-test-rules",

        "tracinglib-platform",

    ],



    data: [":perfetto_artifacts"],



    sdk_version: "current",

    certificate: "platform",

    use_resource_processor: true,



    test_suites: ["device-tests"],

}

tracinglib/benchmark/AndroidManifest.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2024 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.app.tracing.benchmark" >



    <application/>



    <instrumentation android:name="androidx.benchmark.junit4.AndroidBenchmarkRunner"

                     android:targetPackage="com.android.app.tracing.benchmark"

                     android:label="Benchmark tests for tracinglib"/>



</manifest>