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

Commit 8241f19a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "dmd_log_and_fix_sc-dev" into sc-dev 

* changes:
  Fix ambient information which did not get for locking refresh rate
  Added to enable/disable log for DisplayModeDirector
parents b9de6898 a1324f30

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

+8 −0
Original line number Diff line number Diff line
@@ -1538,6 +1538,14 @@ public final class DisplayManagerService extends SystemService { 
        }

    }



    void setDisplayModeDirectorLoggingEnabled(boolean enabled) {

        synchronized (mSyncRoot) {

            if (mDisplayModeDirector != null) {

                mDisplayModeDirector.setLoggingEnabled(enabled);

            }

        }

    }



    void setAmbientColorTemperatureOverride(float cct) {

        synchronized (mSyncRoot) {

            final DisplayPowerController displayPowerController = mDisplayPowerControllers.get(

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

+13 −0
Original line number Diff line number Diff line
@@ -54,6 +54,10 @@ class DisplayManagerShellCommand extends ShellCommand { 
                return setDisplayWhiteBalanceLoggingEnabled(true);

            case "dwb-logging-disable":

                return setDisplayWhiteBalanceLoggingEnabled(false);

            case "dmd-logging-enable":

                return setDisplayModeDirectorLoggingEnabled(true);

            case "dmd-logging-disable":

                return setDisplayModeDirectorLoggingEnabled(false);

            case "dwb-set-cct":

                return setAmbientColorTemperatureOverride();

            case "set-fold":
@@ -82,6 +86,10 @@ class DisplayManagerShellCommand extends ShellCommand { 
        pw.println("    Enable display white-balance logging.");

        pw.println("  dwb-logging-disable");

        pw.println("    Disable display white-balance logging.");

        pw.println("  dmd-logging-enable");

        pw.println("    Enable display mode director logging.");

        pw.println("  dmd-logging-disable");

        pw.println("    Disable display mode director logging.");

        pw.println("  dwb-set-cct CCT");

        pw.println("    Sets the ambient color temperature override to CCT (use -1 to disable).");

        pw.println("  set-fold [fold|unfold|reset]");
@@ -136,6 +144,11 @@ class DisplayManagerShellCommand extends ShellCommand { 
        return 0;

    }



    private int setDisplayModeDirectorLoggingEnabled(boolean enabled) {

        mService.setDisplayModeDirectorLoggingEnabled(enabled);

        return 0;

    }



    private int setAmbientColorTemperatureOverride() {

        String cctText = getNextArg();

        if (cctText == null) {

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

+57 −22
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ import java.util.Objects; 
 */

public class DisplayModeDirector {

    private static final String TAG = "DisplayModeDirector";

    private static final boolean DEBUG = false;

    private boolean mLoggingEnabled;



    private static final int MSG_REFRESH_RATE_RANGE_CHANGED = 1;

    private static final int MSG_LOW_BRIGHTNESS_THRESHOLDS_CHANGED = 2;
@@ -155,6 +155,14 @@ public class DisplayModeDirector { 
        }

    }



    public void setLoggingEnabled(boolean loggingEnabled) {

        if (mLoggingEnabled == loggingEnabled) {

            return;

        }

        mLoggingEnabled = loggingEnabled;

        mBrightnessObserver.setLoggingEnabled(loggingEnabled);

    }



    @NonNull

    private SparseArray<Vote> getVotesLocked(int displayId) {

        SparseArray<Vote> displayVotes = mVotesByDisplay.get(displayId);
@@ -269,7 +277,7 @@ public class DisplayModeDirector { 


                availableModes = filterModes(modes, primarySummary);

                if (availableModes.length > 0) {

                    if (DEBUG) {

                    if (mLoggingEnabled) {

                        Slog.w(TAG, "Found available modes=" + Arrays.toString(availableModes)

                                + " with lowest priority considered "

                                + Vote.priorityToString(lowestConsideredPriority)
@@ -282,7 +290,7 @@ public class DisplayModeDirector { 
                    break;

                }



                if (DEBUG) {

                if (mLoggingEnabled) {

                    Slog.w(TAG, "Couldn't find available modes with lowest priority set to "

                            + Vote.priorityToString(lowestConsideredPriority)

                            + " and with the following constraints: "
@@ -307,7 +315,7 @@ public class DisplayModeDirector { 
                    Math.min(appRequestSummary.minRefreshRate, primarySummary.minRefreshRate);

            appRequestSummary.maxRefreshRate =

                    Math.max(appRequestSummary.maxRefreshRate, primarySummary.maxRefreshRate);

            if (DEBUG) {

            if (mLoggingEnabled) {

                Slog.i(TAG,

                        String.format("App request range: [%.0f %.0f]",

                                appRequestSummary.minRefreshRate,
@@ -357,7 +365,7 @@ public class DisplayModeDirector { 
        for (Display.Mode mode : supportedModes) {

            if (mode.getPhysicalWidth() != summary.width

                    || mode.getPhysicalHeight() != summary.height) {

                if (DEBUG) {

                if (mLoggingEnabled) {

                    Slog.w(TAG, "Discarding mode " + mode.getModeId() + ", wrong size"

                            + ": desiredWidth=" + summary.width

                            + ": desiredHeight=" + summary.height
@@ -372,7 +380,7 @@ public class DisplayModeDirector { 
            // comparison.

            if (refreshRate < (summary.minRefreshRate - FLOAT_TOLERANCE)

                    || refreshRate > (summary.maxRefreshRate + FLOAT_TOLERANCE)) {

                if (DEBUG) {

                if (mLoggingEnabled) {

                    Slog.w(TAG, "Discarding mode " + mode.getModeId()

                            + ", outside refresh rate bounds"

                            + ": minRefreshRate=" + summary.minRefreshRate
@@ -516,7 +524,7 @@ public class DisplayModeDirector { 
    }



    private void updateVoteLocked(int displayId, int priority, Vote vote) {

        if (DEBUG) {

        if (mLoggingEnabled) {

            Slog.i(TAG, "updateVoteLocked(displayId=" + displayId

                    + ", priority=" + Vote.priorityToString(priority)

                    + ", vote=" + vote + ")");
@@ -537,7 +545,7 @@ public class DisplayModeDirector { 
        }



        if (votes.size() == 0) {

            if (DEBUG) {

            if (mLoggingEnabled) {

                Slog.i(TAG, "No votes left for display " + displayId + ", removing.");

            }

            mVotesByDisplay.remove(displayId);
@@ -1287,6 +1295,7 @@ public class DisplayModeDirector { 
        private boolean mShouldObserveAmbientLowChange;

        private boolean mShouldObserveDisplayHighChange;

        private boolean mShouldObserveAmbientHighChange;

        private boolean mLoggingEnabled;



        private SensorManager mSensorManager;

        private Sensor mLightSensor;
@@ -1303,7 +1312,6 @@ public class DisplayModeDirector { 
        // changeable and low power mode off. After initialization, these states will

        // be updated from the same handler thread.

        private int mDefaultDisplayState = Display.STATE_UNKNOWN;

        private boolean mIsDeviceActive = false;

        private boolean mRefreshRateChangeable = false;

        private boolean mLowPowerModeEnabled = false;
@@ -1415,6 +1423,14 @@ public class DisplayModeDirector { 
            mDeviceConfigDisplaySettings.startListening();

        }



        public void setLoggingEnabled(boolean loggingEnabled) {

            if (mLoggingEnabled == loggingEnabled) {

                return;

            }

            mLoggingEnabled = loggingEnabled;

            mLightSensorListener.setLoggingEnabled(loggingEnabled);

        }



        public void onRefreshRateSettingChangedLocked(float min, float max) {

            boolean changeable = (max - min > 1f && max > 60f);

            if (mRefreshRateChangeable != changeable) {
@@ -1485,7 +1501,6 @@ public class DisplayModeDirector { 
            pw.println("    mAmbientLux: " + mAmbientLux);

            pw.println("    mBrightness: " + mBrightness);

            pw.println("    mDefaultDisplayState: " + mDefaultDisplayState);

            pw.println("    mIsDeviceActive: " + mIsDeviceActive);

            pw.println("    mLowPowerModeEnabled: " + mLowPowerModeEnabled);

            pw.println("    mRefreshRateChangeable: " + mRefreshRateChangeable);

            pw.println("    mShouldObserveDisplayLowChange: " + mShouldObserveDisplayLowChange);
@@ -1691,7 +1706,7 @@ public class DisplayModeDirector { 
                vote = Vote.forRefreshRates(mRefreshRateInHighZone, mRefreshRateInHighZone);

            }



            if (DEBUG) {

            if (mLoggingEnabled) {

                Slog.d(TAG, "Display brightness " + mBrightness + ", ambient lux " +  mAmbientLux

                        + ", Vote " + vote);

            }
@@ -1720,6 +1735,11 @@ public class DisplayModeDirector { 


        @VisibleForTesting

        public void setDefaultDisplayState(int state) {

            if (mLoggingEnabled) {

                Slog.d(TAG, "setDefaultDisplayState: mDefaultDisplayState = "

                        + mDefaultDisplayState + ", state = " + state);

            }



            if (mDefaultDisplayState != state) {

                mDefaultDisplayState = state;

                updateSensorStatus();
@@ -1731,36 +1751,58 @@ public class DisplayModeDirector { 
                return;

            }



            if (mLoggingEnabled) {

                Slog.d(TAG, "updateSensorStatus: mShouldObserveAmbientLowChange = "

                        + mShouldObserveAmbientLowChange + ", mShouldObserveAmbientHighChange = "

                        + mShouldObserveAmbientHighChange);

                Slog.d(TAG, "updateSensorStatus: mLowPowerModeEnabled = "

                        + mLowPowerModeEnabled + ", mRefreshRateChangeable = "

                        + mRefreshRateChangeable);

            }



            if ((mShouldObserveAmbientLowChange || mShouldObserveAmbientHighChange)

                     && isDeviceActive() && !mLowPowerModeEnabled && mRefreshRateChangeable) {

                mSensorManager.registerListener(mLightSensorListener,

                        mLightSensor, LIGHT_SENSOR_RATE_MS * 1000, mHandler);

                if (mLoggingEnabled) {

                    Slog.d(TAG, "updateSensorStatus: registerListener");

                }

            } else {

                mLightSensorListener.removeCallbacks();

                mSensorManager.unregisterListener(mLightSensorListener);

                if (mLoggingEnabled) {

                    Slog.d(TAG, "updateSensorStatus: unregisterListener");

                }

            }

        }



        private boolean isDeviceActive() {

            mIsDeviceActive = mInjector.isDeviceInteractive(mContext);

            return (mDefaultDisplayState == Display.STATE_ON)

                    && mIsDeviceActive;

            return mDefaultDisplayState == Display.STATE_ON;

        }



        private final class LightSensorEventListener implements SensorEventListener {

            final private static int INJECT_EVENTS_INTERVAL_MS = LIGHT_SENSOR_RATE_MS;

            private float mLastSensorData;

            private long mTimestamp;

            private boolean mLoggingEnabled;



            public void dumpLocked(PrintWriter pw) {

                pw.println("    mLastSensorData: " + mLastSensorData);

                pw.println("    mTimestamp: " + formatTimestamp(mTimestamp));

            }





            public void setLoggingEnabled(boolean loggingEnabled) {

                if (mLoggingEnabled == loggingEnabled) {

                    return;

                }

                mLoggingEnabled = loggingEnabled;

            }



            @Override

            public void onSensorChanged(SensorEvent event) {

                mLastSensorData = event.values[0];

                if (DEBUG) {

                if (mLoggingEnabled) {

                    Slog.d(TAG, "On sensor changed: " + mLastSensorData);

                }
@@ -2009,8 +2051,6 @@ public class DisplayModeDirector { 


        void registerPeakRefreshRateObserver(@NonNull ContentResolver cr,

                @NonNull ContentObserver observer);



        boolean isDeviceInteractive(@NonNull Context context);

    }



    @VisibleForTesting
@@ -2041,11 +2081,6 @@ public class DisplayModeDirector { 
            cr.registerContentObserver(PEAK_REFRESH_RATE_URI, false /*notifyDescendants*/,

                    observer, UserHandle.USER_SYSTEM);

        }



        @Override

        public boolean isDeviceInteractive(@NonNull Context ctx) {

            return ctx.getSystemService(PowerManager.class).isInteractive();

        }

    }



}

services/tests/servicestests/src/com/android/server/display/DisplayModeDirectorTest.java

+0 −5
Original line number Diff line number Diff line
@@ -818,10 +818,5 @@ public class DisplayModeDirectorTest { 
                        PEAK_REFRESH_RATE_URI);

            }

        }



        @Override

        public boolean isDeviceInteractive(@NonNull Context context) {

            return true;

        }

    }

}