diff options
| -rw-r--r-- | core/java/android/service/dreams/DreamService.java | 21 | ||||
| -rw-r--r-- | services/core/java/com/android/server/dreams/DreamController.java | 68 |
2 files changed, 28 insertions, 61 deletions
diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java index de4a5511fcdb..96a89bcd0120 100644 --- a/core/java/android/service/dreams/DreamService.java +++ b/core/java/android/service/dreams/DreamService.java @@ -1160,32 +1160,17 @@ public class DreamService extends Service implements Window.Callback { @Override public void attach(final IBinder windowToken, final boolean canDoze, IRemoteCallback started) { - mHandler.post(new Runnable() { - @Override - public void run() { - DreamService.this.attach(windowToken, canDoze, started); - } - }); + mHandler.post(() -> DreamService.this.attach(windowToken, canDoze, started)); } @Override public void detach() { - mHandler.post(new Runnable() { - @Override - public void run() { - DreamService.this.detach(); - } - }); + mHandler.post(DreamService.this::detach); } @Override public void wakeUp() { - mHandler.post(new Runnable() { - @Override - public void run() { - DreamService.this.wakeUp(true /*fromSystem*/); - } - }); + mHandler.post(() -> DreamService.this.wakeUp(true /*fromSystem*/)); } } } diff --git a/services/core/java/com/android/server/dreams/DreamController.java b/services/core/java/com/android/server/dreams/DreamController.java index fbad8dede87d..2ed4f390c973 100644 --- a/services/core/java/com/android/server/dreams/DreamController.java +++ b/services/core/java/com/android/server/dreams/DreamController.java @@ -16,8 +16,8 @@ package com.android.server.dreams; -import com.android.internal.logging.MetricsLogger; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import static android.view.Display.DEFAULT_DISPLAY; +import static android.view.WindowManager.LayoutParams.TYPE_DREAM; import android.content.ComponentName; import android.content.Context; @@ -27,10 +27,10 @@ import android.os.Binder; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; +import android.os.IBinder.DeathRecipient; import android.os.IRemoteCallback; import android.os.PowerManager; import android.os.RemoteException; -import android.os.IBinder.DeathRecipient; import android.os.SystemClock; import android.os.Trace; import android.os.UserHandle; @@ -38,15 +38,14 @@ import android.service.dreams.DreamService; import android.service.dreams.IDreamService; import android.util.Slog; import android.view.IWindowManager; -import android.view.WindowManager; import android.view.WindowManagerGlobal; +import com.android.internal.logging.MetricsLogger; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; + import java.io.PrintWriter; import java.util.NoSuchElementException; -import static android.view.Display.DEFAULT_DISPLAY; -import static android.view.WindowManager.LayoutParams.TYPE_DREAM; - /** * Internal controller for starting and stopping the current dream and managing related state. * @@ -86,12 +85,9 @@ final class DreamController { } }; - private final Runnable mStopStubbornDreamRunnable = new Runnable() { - @Override - public void run() { - Slog.w(TAG, "Stubborn dream did not finish itself in the time allotted"); - stopDream(true /*immediate*/); - } + private final Runnable mStopStubbornDreamRunnable = () -> { + Slog.w(TAG, "Stubborn dream did not finish itself in the time allotted"); + stopDream(true /*immediate*/); }; public DreamController(Context context, Handler handler, Listener listener) { @@ -244,12 +240,7 @@ final class DreamController { Slog.w(TAG, "Error removing window token for dream.", ex); } - mHandler.post(new Runnable() { - @Override - public void run() { - mListener.onDreamStopped(oldDream.mToken); - } - }); + mHandler.post(() -> mListener.onDreamStopped(oldDream.mToken)); } finally { Trace.traceEnd(Trace.TRACE_TAG_POWER); } @@ -313,13 +304,10 @@ final class DreamController { // May be called on any thread. @Override public void binderDied() { - mHandler.post(new Runnable() { - @Override - public void run() { - mService = null; - if (mCurrentDream == DreamRecord.this) { - stopDream(true /*immediate*/); - } + mHandler.post(() -> { + mService = null; + if (mCurrentDream == DreamRecord.this) { + stopDream(true /*immediate*/); } }); } @@ -327,16 +315,13 @@ final class DreamController { // May be called on any thread. @Override public void onServiceConnected(ComponentName name, final IBinder service) { - mHandler.post(new Runnable() { - @Override - public void run() { - mConnected = true; - if (mCurrentDream == DreamRecord.this && mService == null) { - attach(IDreamService.Stub.asInterface(service)); - // Wake lock will be released once dreaming starts. - } else { - releaseWakeLockIfNeeded(); - } + mHandler.post(() -> { + mConnected = true; + if (mCurrentDream == DreamRecord.this && mService == null) { + attach(IDreamService.Stub.asInterface(service)); + // Wake lock will be released once dreaming starts. + } else { + releaseWakeLockIfNeeded(); } }); } @@ -344,13 +329,10 @@ final class DreamController { // May be called on any thread. @Override public void onServiceDisconnected(ComponentName name) { - mHandler.post(new Runnable() { - @Override - public void run() { - mService = null; - if (mCurrentDream == DreamRecord.this) { - stopDream(true /*immediate*/); - } + mHandler.post(() -> { + mService = null; + if (mCurrentDream == DreamRecord.this) { + stopDream(true /*immediate*/); } }); } |