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

Commit 0c39b6c6 authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Add a missing break; to restore old functionality and not turn off the... 

Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread
parents 62d83a0c 84047bc2

services/java/com/android/server/PowerManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -1052,6 +1052,7 @@ class PowerManagerService extends IPowerManager.Stub 
                        case SCREEN_DIM:

                            if (mDimDelay >= 0) {

                                when = now + mDimDelay;

                                break;

                            } else {

                                Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim");

                            }
@@ -1060,6 +1061,9 @@ class PowerManagerService extends IPowerManager.Stub 
                                when = now + mScreenOffDelay;

                            }

                            break;

                        default:

                            when = now;

                            break;

                    }

                } else {

                    override: {