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

Commit 0ada277a authored by Christine Franks's avatar Christine Franks
Browse files

Move ColorDisplayService to color subdirectory 

(and associated files)

Bug: 124474236
Test: atest FrameworksServicesTests:ColorDisplayServiceTest and
atest FrameworksServicesTests:AppSaturationControllerTest.

Change-Id: I07da4012caa341defddb8d9bbbe56e2beb0a6ef4
parent 92011a08

proto/src/metrics_constants/metrics_constants.proto

+1 −1
Original line number Diff line number Diff line
@@ -5434,7 +5434,7 @@ message MetricsEvent { 
    FIELD_END_BATTERY_PERCENT = 1308;



    // ACTION: Settings > Display > Night Light

    // SUBTYPE: com.android.server.display.ColorDisplayService.AutoMode value

    // SUBTYPE: com.android.server.display.color.ColorDisplayService.AutoMode value

    // CATEGORY: SETTINGS

    // OS: P

    ACTION_NIGHT_DISPLAY_AUTO_MODE_CHANGED = 1309;

services/art-profile

+48 −48
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ HPLcom/android/server/display/AutomaticBrightnessController;->updateAmbientLux() 
HPLcom/android/server/display/AutomaticBrightnessController;->weightIntegral(J)F

HPLcom/android/server/display/BrightnessTracker$Injector;->currentTimeMillis()J

HPLcom/android/server/display/BrightnessTracker$Injector;->elapsedRealtimeNanos()J

HPLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;->evaluate(F[F[F)[F

HPLcom/android/server/display/color/ColorDisplayService$ColorMatrixEvaluator;->evaluate(F[F[F)[F

HPLcom/android/server/display/ColorFade;->draw(F)Z

HPLcom/android/server/display/ColorFade;->drawFaded(FF)V

HPLcom/android/server/display/DisplayManagerService$BinderService;->getDisplayIds()[I
@@ -3413,7 +3413,7 @@ Lcom/android/server/devicepolicy/CryptoTestHelper; 
Lcom/android/server/devicepolicy/DevicePolicyManagerService$Lifecycle;

Lcom/android/server/display/-$$Lambda$VirtualDisplayAdapter$PFyqe-aYIEBicSVtuy5lL_bT8B0;

Lcom/android/server/display/AutomaticBrightnessController$Callbacks;

Lcom/android/server/display/ColorDisplayService;

Lcom/android/server/display/color/ColorDisplayService;

Lcom/android/server/display/DisplayAdapter$1;

Lcom/android/server/display/DisplayAdapter$2;

Lcom/android/server/display/DisplayAdapter$Listener;
@@ -3433,7 +3433,7 @@ Lcom/android/server/display/DisplayManagerService$SyncRoot; 
Lcom/android/server/display/DisplayManagerService;

Lcom/android/server/display/DisplayManagerShellCommand;

Lcom/android/server/display/DisplayPowerController;

Lcom/android/server/display/DisplayTransformManager;

Lcom/android/server/display/color/DisplayTransformManager;

Lcom/android/server/display/LocalDisplayAdapter$DisplayModeRecord;

Lcom/android/server/display/LocalDisplayAdapter$HotplugDisplayEventReceiver;

Lcom/android/server/display/LocalDisplayAdapter$LocalDisplayDevice$1;
@@ -10616,39 +10616,39 @@ PLcom/android/server/display/BrightnessTracker;->stopSensorListener()V 
PLcom/android/server/display/BrightnessTracker;->writeAmbientBrightnessStats()V

PLcom/android/server/display/BrightnessTracker;->writeEvents()V

PLcom/android/server/display/BrightnessTracker;->writeEventsLocked(Ljava/io/OutputStream;)V

PLcom/android/server/display/ColorDisplayService$2;-><init>(Lcom/android/server/display/ColorDisplayService;Lcom/android/server/display/DisplayTransformManager;)V

PLcom/android/server/display/ColorDisplayService$2;->onAnimationUpdate(Landroid/animation/ValueAnimator;)V

PLcom/android/server/display/ColorDisplayService$3;-><init>(Lcom/android/server/display/ColorDisplayService;Lcom/android/server/display/DisplayTransformManager;[F)V

PLcom/android/server/display/ColorDisplayService$3;->onAnimationEnd(Landroid/animation/Animator;)V

PLcom/android/server/display/ColorDisplayService$AutoMode;-><init>(Lcom/android/server/display/ColorDisplayService;)V

PLcom/android/server/display/ColorDisplayService$AutoMode;-><init>(Lcom/android/server/display/ColorDisplayService;Lcom/android/server/display/ColorDisplayService$1;)V

PLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;-><init>()V

PLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;-><init>(Lcom/android/server/display/ColorDisplayService$1;)V

PLcom/android/server/display/ColorDisplayService$ColorMatrixEvaluator;->evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

PLcom/android/server/display/ColorDisplayService$CustomAutoMode$1;-><init>(Lcom/android/server/display/ColorDisplayService$CustomAutoMode;Lcom/android/server/display/ColorDisplayService;)V

PLcom/android/server/display/ColorDisplayService$CustomAutoMode;-><init>(Lcom/android/server/display/ColorDisplayService;)V

PLcom/android/server/display/ColorDisplayService$CustomAutoMode;->onActivated(Z)V

PLcom/android/server/display/ColorDisplayService$CustomAutoMode;->onAlarm()V

PLcom/android/server/display/ColorDisplayService$CustomAutoMode;->onStart()V

PLcom/android/server/display/ColorDisplayService$CustomAutoMode;->updateActivated()V

PLcom/android/server/display/ColorDisplayService$CustomAutoMode;->updateNextAlarm(Ljava/lang/Boolean;Ljava/time/LocalDateTime;)V

PLcom/android/server/display/ColorDisplayService;-><init>(Landroid/content/Context;)V

PLcom/android/server/display/ColorDisplayService;->access$1000(Lcom/android/server/display/ColorDisplayService;)Ljava/lang/Boolean;

PLcom/android/server/display/ColorDisplayService;->access$602(Lcom/android/server/display/ColorDisplayService;Landroid/animation/ValueAnimator;)Landroid/animation/ValueAnimator;

PLcom/android/server/display/ColorDisplayService;->applyTint(Z)V

PLcom/android/server/display/ColorDisplayService;->getDateTimeAfter(Ljava/time/LocalTime;Ljava/time/LocalDateTime;)Ljava/time/LocalDateTime;

PLcom/android/server/display/ColorDisplayService;->getDateTimeBefore(Ljava/time/LocalTime;Ljava/time/LocalDateTime;)Ljava/time/LocalDateTime;

PLcom/android/server/display/ColorDisplayService;->isUserSetupCompleted(Landroid/content/ContentResolver;I)Z

PLcom/android/server/display/ColorDisplayService;->onActivated(Z)V

PLcom/android/server/display/ColorDisplayService;->onAutoModeChanged(I)V

PLcom/android/server/display/ColorDisplayService;->onBootPhase(I)V

PLcom/android/server/display/ColorDisplayService;->onDisplayColorModeChanged(I)V

PLcom/android/server/display/ColorDisplayService;->onStart()V

PLcom/android/server/display/ColorDisplayService;->onStartUser(I)V

PLcom/android/server/display/ColorDisplayService;->onUserChanged(I)V

PLcom/android/server/display/ColorDisplayService;->setCoefficientMatrix(Landroid/content/Context;Z)V

PLcom/android/server/display/ColorDisplayService;->setMatrix(I[F)V

PLcom/android/server/display/ColorDisplayService;->setUp()V

PLcom/android/server/display/color/ColorDisplayService$2;-><init>(Lcom/android/server/display/color/ColorDisplayService;Lcom/android/server/display/color/DisplayTransformManager;)V

PLcom/android/server/display/color/ColorDisplayService$2;->onAnimationUpdate(Landroid/animation/ValueAnimator;)V

PLcom/android/server/display/color/ColorDisplayService$3;-><init>(Lcom/android/server/display/color/ColorDisplayService;Lcom/android/server/display/color/DisplayTransformManager;[F)V

PLcom/android/server/display/color/ColorDisplayService$3;->onAnimationEnd(Landroid/animation/Animator;)V

PLcom/android/server/display/color/ColorDisplayService$AutoMode;-><init>(Lcom/android/server/display/color/ColorDisplayService;)V

PLcom/android/server/display/color/ColorDisplayService$AutoMode;-><init>(Lcom/android/server/display/color/ColorDisplayService;Lcom/android/server/display/color/ColorDisplayService$1;)V

PLcom/android/server/display/color/ColorDisplayService$ColorMatrixEvaluator;-><init>()V

PLcom/android/server/display/color/ColorDisplayService$ColorMatrixEvaluator;-><init>(Lcom/android/server/display/color/ColorDisplayService$1;)V

PLcom/android/server/display/color/ColorDisplayService$ColorMatrixEvaluator;->evaluate(FLjava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;

PLcom/android/server/display/color/ColorDisplayService$CustomAutoMode$1;-><init>(Lcom/android/server/display/color/ColorDisplayService$CustomAutoMode;Lcom/android/server/display/color/ColorDisplayService;)V

PLcom/android/server/display/color/ColorDisplayService$CustomAutoMode;-><init>(Lcom/android/server/display/color/ColorDisplayService;)V

PLcom/android/server/display/color/ColorDisplayService$CustomAutoMode;->onActivated(Z)V

PLcom/android/server/display/color/ColorDisplayService$CustomAutoMode;->onAlarm()V

PLcom/android/server/display/color/ColorDisplayService$CustomAutoMode;->onStart()V

PLcom/android/server/display/color/ColorDisplayService$CustomAutoMode;->updateActivated()V

PLcom/android/server/display/color/ColorDisplayService$CustomAutoMode;->updateNextAlarm(Ljava/lang/Boolean;Ljava/time/LocalDateTime;)V

PLcom/android/server/display/color/ColorDisplayService;-><init>(Landroid/content/Context;)V

PLcom/android/server/display/color/ColorDisplayService;->access$1000(Lcom/android/server/display/color/ColorDisplayService;)Ljava/lang/Boolean;

PLcom/android/server/display/color/ColorDisplayService;->access$602(Lcom/android/server/display/color/ColorDisplayService;Landroid/animation/ValueAnimator;)Landroid/animation/ValueAnimator;

PLcom/android/server/display/color/ColorDisplayService;->applyTint(Z)V

PLcom/android/server/display/color/ColorDisplayService;->getDateTimeAfter(Ljava/time/LocalTime;Ljava/time/LocalDateTime;)Ljava/time/LocalDateTime;

PLcom/android/server/display/color/ColorDisplayService;->getDateTimeBefore(Ljava/time/LocalTime;Ljava/time/LocalDateTime;)Ljava/time/LocalDateTime;

PLcom/android/server/display/color/ColorDisplayService;->isUserSetupCompleted(Landroid/content/ContentResolver;I)Z

PLcom/android/server/display/color/ColorDisplayService;->onActivated(Z)V

PLcom/android/server/display/color/ColorDisplayService;->onAutoModeChanged(I)V

PLcom/android/server/display/color/ColorDisplayService;->onBootPhase(I)V

PLcom/android/server/display/color/ColorDisplayService;->onDisplayColorModeChanged(I)V

PLcom/android/server/display/color/ColorDisplayService;->onStart()V

PLcom/android/server/display/color/ColorDisplayService;->onStartUser(I)V

PLcom/android/server/display/color/ColorDisplayService;->onUserChanged(I)V

PLcom/android/server/display/color/ColorDisplayService;->setCoefficientMatrix(Landroid/content/Context;Z)V

PLcom/android/server/display/color/ColorDisplayService;->setMatrix(I[F)V

PLcom/android/server/display/color/ColorDisplayService;->setUp()V

PLcom/android/server/display/ColorFade$NaturalSurfaceLayout;-><init>(Landroid/hardware/display/DisplayManagerInternal;ILandroid/view/SurfaceControl;)V

PLcom/android/server/display/ColorFade$NaturalSurfaceLayout;->dispose()V

PLcom/android/server/display/ColorFade$NaturalSurfaceLayout;->onDisplayTransaction()V
@@ -10878,17 +10878,17 @@ PLcom/android/server/display/DisplayPowerState;->setColorFadeLevel(F)V 
PLcom/android/server/display/DisplayPowerState;->setScreenBrightness(I)V

PLcom/android/server/display/DisplayPowerState;->setScreenState(I)V

PLcom/android/server/display/DisplayPowerState;->waitUntilClean(Ljava/lang/Runnable;)Z

PLcom/android/server/display/DisplayTransformManager;->applyColorMatrix([F)V

PLcom/android/server/display/DisplayTransformManager;->applySaturation(F)V

PLcom/android/server/display/DisplayTransformManager;->computeColorMatrixLocked()[F

PLcom/android/server/display/DisplayTransformManager;->getColorMatrix(I)[F

PLcom/android/server/display/DisplayTransformManager;->needsLinearColorMatrix()Z

PLcom/android/server/display/DisplayTransformManager;->needsLinearColorMatrix(I)Z

PLcom/android/server/display/DisplayTransformManager;->setColorMatrix(I[F)V

PLcom/android/server/display/DisplayTransformManager;->setColorMode(I[F)Z

PLcom/android/server/display/DisplayTransformManager;->setDaltonizerMode(I)V

PLcom/android/server/display/DisplayTransformManager;->setDisplayColor(I)V

PLcom/android/server/display/DisplayTransformManager;->updateConfiguration()V

PLcom/android/server/display/color/DisplayTransformManager;->applyColorMatrix([F)V

PLcom/android/server/display/color/DisplayTransformManager;->applySaturation(F)V

PLcom/android/server/display/color/DisplayTransformManager;->computeColorMatrixLocked()[F

PLcom/android/server/display/color/DisplayTransformManager;->getColorMatrix(I)[F

PLcom/android/server/display/color/DisplayTransformManager;->needsLinearColorMatrix()Z

PLcom/android/server/display/color/DisplayTransformManager;->needsLinearColorMatrix(I)Z

PLcom/android/server/display/color/DisplayTransformManager;->setColorMatrix(I[F)V

PLcom/android/server/display/color/DisplayTransformManager;->setColorMode(I[F)Z

PLcom/android/server/display/color/DisplayTransformManager;->setDaltonizerMode(I)V

PLcom/android/server/display/color/DisplayTransformManager;->setDisplayColor(I)V

PLcom/android/server/display/color/DisplayTransformManager;->updateConfiguration()V

PLcom/android/server/display/HysteresisLevels;-><init>([I[I[I)V

PLcom/android/server/display/HysteresisLevels;->getBrighteningThreshold(F)F

PLcom/android/server/display/HysteresisLevels;->getDarkeningThreshold(F)F
@@ -19436,7 +19436,7 @@ SPLcom/android/server/display/DisplayManagerService;->scheduleTraversalLocked(Z) 
SPLcom/android/server/display/DisplayManagerService;->sendDisplayEventLocked(II)V

SPLcom/android/server/display/DisplayManagerService;->updateDisplayStateLocked(Lcom/android/server/display/DisplayDevice;)Ljava/lang/Runnable;

SPLcom/android/server/display/DisplayManagerService;->updateLogicalDisplaysLocked()Z

SPLcom/android/server/display/DisplayTransformManager;-><init>()V

SPLcom/android/server/display/color/DisplayTransformManager;-><init>()V

SPLcom/android/server/display/LocalDisplayAdapter$DisplayModeRecord;-><init>(Landroid/view/SurfaceControl$PhysicalDisplayInfo;)V

SPLcom/android/server/display/LocalDisplayAdapter$DisplayModeRecord;->hasMatchingMode(Landroid/view/SurfaceControl$PhysicalDisplayInfo;)Z

SPLcom/android/server/display/LocalDisplayAdapter$HotplugDisplayEventReceiver;-><init>(Lcom/android/server/display/LocalDisplayAdapter;Landroid/os/Looper;)V

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

+0 −9
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ import com.android.server.DisplayThread; 
import com.android.server.LocalServices;

import com.android.server.SystemService;

import com.android.server.UiThread;

import com.android.server.display.ColorDisplayService.ColorDisplayServiceInternal;

import com.android.server.wm.SurfaceAnimationThread;

import com.android.server.wm.WindowManagerInternal;
@@ -357,7 +356,6 @@ public final class DisplayManagerService extends SystemService { 
        publishBinderService(Context.DISPLAY_SERVICE, new BinderService(),

                true /*allowIsolated*/);

        publishLocalService(DisplayManagerInternal.class, new LocalService());

        publishLocalService(DisplayTransformManager.class, new DisplayTransformManager());

    }



    @Override
@@ -1535,13 +1533,6 @@ public final class DisplayManagerService extends SystemService { 


            pw.println();

            mPersistentDataStore.dump(pw);



            final ColorDisplayServiceInternal cds = LocalServices.getService(

                    ColorDisplayServiceInternal.class);

            if (cds != null) {

                pw.println();

                cds.dump(pw);

            }

        }

    }

services/core/java/com/android/server/display/OWNERS

+0 −2
Original line number Diff line number Diff line
@@ -2,5 +2,3 @@ michaelwr@google.com 
dangittik@google.com

hackbod@google.com

ogunwale@google.com
 


per-file ColorDisplayService.java=christyfranks@google.com

services/core/java/com/android/server/display/AppSaturationController.java→services/core/java/com/android/server/display/color/AppSaturationController.java

+2 −2
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
 * limitations under the License.

 */



package com.android.server.display;

package com.android.server.display.color;



import android.annotation.UserIdInt;

import android.util.SparseArray;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.server.display.ColorDisplayService.ColorTransformController;

import com.android.server.display.color.ColorDisplayService.ColorTransformController;



import java.io.PrintWriter;

import java.lang.ref.WeakReference;