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

Commit ff52fa4d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update BrightnessSynchronizer Logic" into tm-dev am: 5b0c795a 

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



Change-Id: I57735cd1bc24078a2d27bc37f8411ecc19d852c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 864d1882 5b0c795a

core/java/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -51,6 +51,12 @@ filegroup { 
    srcs: ["android/tracing/TraceReportParams.aidl"],

}



filegroup {

    name: "framework-internal-display-sources",

    srcs: ["com/android/internal/display/BrightnessSynchronizer.java"],

    visibility: ["//frameworks/base/services/tests/mockingservicestests"],

}



// These are subset of framework-core-sources that are needed by the

// android.test.mock library. The implementation of android.test.mock references

// private members of various components to allow mocking of classes that cannot

core/java/com/android/internal/display/BrightnessSynchronizer.java

+318 −111

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/display/DisplayManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -2503,6 +2503,7 @@ public final class DisplayManagerService extends SystemService { 
        }

        pw.println();

        mDisplayModeDirector.dump(pw);

        mBrightnessSynchronizer.dump(pw);

    }



    private static float[] getFloatArray(TypedArray array) {

services/tests/mockingservicestests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ android_test { 
    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        ":framework-internal-display-sources",

    ],



    static_libs: [

services/tests/mockingservicestests/src/com/android/server/display/BrightnessSynchronizerTest.java

0 → 100644
+255 −0

File added.

Preview size limit exceeded, changes collapsed.