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

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

Snap for 11915075 from 9cde09e3 to 24Q4-release 

Change-Id: I25e893c33d5249acbdc491c3a32c33e6f4ebf24b
parents 8f327448 9cde09e3

PREUPLOAD.cfg

+5 −2
Original line number Diff line number Diff line 
[Builtin Hooks]

bpfmt = true

ktfmt = true



[Builtin Hooks Options]

bpfmt = -d

ktfmt = --kotlinlang-style



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/frameworks/libs/systemui/ktfmt_includes.txt ${PREUPLOAD_FILES}



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



[Tool Paths]

ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java

+14 −3
Original line number Diff line number Diff line
@@ -583,7 +583,12 @@ public abstract class BaseIconCache { 
                            PackageManager.PackageInfoFlags.of(flags));

                    ApplicationInfo appInfo = info.applicationInfo;

                    if (appInfo == null) {

                        throw new NameNotFoundException("ApplicationInfo is null");

                        NameNotFoundException e = new NameNotFoundException(

                                "ApplicationInfo is null");

                        logdPersistently(TAG,

                                String.format("ApplicationInfo is null for %s", packageName),

                                e);

                        throw e;

                    }



                    BaseIconFactory li = getIconFactory();
@@ -591,8 +596,9 @@ public abstract class BaseIconCache { 
                    // only keep the low resolution icon instead of the larger full-sized icon

                    Drawable appIcon = appInfo.loadIcon(mPackageManager);

                    if (mPackageManager.isDefaultApplicationIcon(appIcon)) {

                        // TODO(b/343233224): Log in more persistent location such as FileLog.

                        Log.d(TAG, String.format("Default icon returned for %s", packageName));

                        logdPersistently(TAG,

                                String.format("Default icon returned for %s", packageName),

                                null);

                    }

                    BitmapInfo iconInfo = li.createBadgedIconBitmap(appIcon,

                            new IconOptions().setUser(user).setInstantApp(isInstantApp(appInfo)));
@@ -809,4 +815,9 @@ public abstract class BaseIconCache { 
            throw new IllegalStateException("Cache accessed on wrong thread " + Looper.myLooper());

        }

    }



    /** Log to Log.d. Subclasses can override this method to log persistently for debugging. */

    protected void logdPersistently(String tag, String message, @Nullable Exception e) {

        Log.d(tag, message, e);

    }

}

ktfmt_includes.txt

deleted100644 → 0
+0 −80
Original line number Diff line number Diff line 
+

-animationlib/tests/robolectric/src/com/android/app/animation/robolectric/ShadowAnimationUtils2.kt

-animationlib/tests/src/com/android/app/animation/InterpolatorResourcesTest.kt

-animationlib/tests/src/com/android/app/animation/InterpolatorsAndroidXTest.kt

-motiontoollib/src/com/android/app/motiontool/DdmHandleMotionTool.kt

-motiontoollib/src/com/android/app/motiontool/MotionToolManager.kt

-motiontoollib/tests/com/android/app/motiontool/DdmHandleMotionToolTest.kt

-motiontoollib/tests/com/android/app/motiontool/MotionToolManagerTest.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/activity/TorusViewerActivity.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/app/KeyguardLockController.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/content/ConfigurationChangeListener.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/engine/TorusEngine.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/engine/listener/TorusTouchListener.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/extensions/ConfigurationExt.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/geometry/Vertex.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/power/FpsThrottler.kt

-toruslib/torus-core/src/main/java/com/google/android/torus/core/time/TimeController.kt

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

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

-toruslib/torus-framework-canvas/src/main/java/com/google/android/torus/canvas/engine/CanvasWallpaperEngine.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/AffineTransform.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/MathUtils.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/MatrixTransform.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/RotationQuaternion.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/SphericalTransform.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/Vector2.kt

-toruslib/torus-math/src/main/java/com/google/android/torus/math/Vector3.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/BitmapUtils.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/animation/EasingUtils.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/broadcast/BroadcastEventController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/broadcast/PowerSaveController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/content/ResourcesManager.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/display/DisplayOrientationController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/display/DisplaySizeType.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/display/DisplayUtils.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/extensions/ActivityExt.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/extensions/AssetManagerExt.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/extensions/SizeExt.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/interaction/Gyro2dController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/interaction/HingeController.kt

-toruslib/torus-utils/src/main/java/com/google/android/torus/utils/wallpaper/WallpaperUtils.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/BaseSliceConfigProvider.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/ColorChipsRowBuilder.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/InputRangeRowBuilder.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/SingleSelectionRowConfigProvider.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/inlinecontrol/SliceConfigController.kt

-toruslib/torus-wallpaper-settings/src/main/java/com/google/android/torus/settings/storage/CustomizedSharedPreferences.kt

-viewcapturelib/src/com/android/app/viewcapture/NoOpViewCapture.kt

-viewcapturelib/src/com/android/app/viewcapture/SettingsAwareViewCapture.kt

-viewcapturelib/src/com/android/app/viewcapture/SimpleViewCapture.kt

-viewcapturelib/tests/com/android/app/viewcapture/SettingsAwareViewCaptureTest.kt

-viewcapturelib/tests/com/android/app/viewcapture/TestActivity.kt

-viewcapturelib/tests/com/android/app/viewcapture/ViewCaptureTest.kt

-weathereffects/debug/src/com/google/android/wallpaper/weathereffects/WallpaperEffectsDebugActivity.kt

-weathereffects/debug/src/com/google/android/wallpaper/weathereffects/WallpaperEffectsDebugApplication.kt

-weathereffects/debug/src/com/google/android/wallpaper/weathereffects/dagger/DebugApplicationComponent.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherEngine.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/WeatherWallpaperService.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/dagger/ApplicationComponent.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/dagger/DependencyProvider.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/dagger/Qualifiers.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/data/repository/WallpaperFileUtils.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/data/repository/WeatherEffectsRepository.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/domain/WeatherEffectsInteractor.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/fog/FogEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/fog/FogEffectConfig.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/graphics/FrameBuffer.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/none/NoEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/provider/WallpaperInfoContract.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/provider/WeatherEffectsContentProvider.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/rain/RainEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/rain/RainEffectConfig.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/shared/model/WallpaperFileModel.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/snow/SnowEffect.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/snow/SnowEffectConfig.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/utils/GraphicsUtils.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/utils/ImageCrop.kt

-weathereffects/src/com/google/android/wallpaper/weathereffects/utils/MatrixUtils.kt

-weathereffects/tests/src/com/google/android/wallpaper/weathereffects/provider/WeatherEffectsContentProviderTest.kt

motiontoollib/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ android_library { 
    name: "motion_tool_lib",

    manifest: "AndroidManifest.xml",

    platform_apis: true,

    min_sdk_version: "26",

    min_sdk_version: "30",



    static_libs: [

        "androidx.core_core",
@@ -58,7 +58,7 @@ android_test { 
    name: "motion_tool_lib_tests",

    manifest: "tests/AndroidManifest.xml",

    platform_apis: true,

    min_sdk_version: "26",

    min_sdk_version: "30",



    static_libs: [

        "androidx.core_core",

tracinglib/core/host/src-fake/Flags.fake.kt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ private var isCoroutineTracingFlagEnabledForTests = true 


object Flags {

    fun coroutineTracing() = isCoroutineTracingFlagEnabledForTests



    fun disableCoroutineTracing() {

        isCoroutineTracingFlagEnabledForTests = false

    }