Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up dreamland am: a8e4641296

Browse Source 
Change-Id: I72a2a845db0d5488ac5532917be429bb5095184e
This commit is contained in:
Automerger Merge Worker
2020-02-25 10:24:38 +00:00
parent 36d955d28f a8e4641296
commit 6c2ed35774
2 changed files with 28 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/service/dreams/DreamService.java
View File

@@ -1160,32 +1160,17 @@ public class DreamService extends Service implements Window.Callback {
@Override @Override
public void attach(final IBinder windowToken, final boolean canDoze, public void attach(final IBinder windowToken, final boolean canDoze,
IRemoteCallback started) { IRemoteCallback started) {
mHandler.post(new Runnable() { mHandler.post(() -> DreamService.this.attach(windowToken, canDoze, started));
@Override
public void run() {
DreamService.this.attach(windowToken, canDoze, started);
}
});
} }
@Override @Override
public void detach() { public void detach() {
mHandler.post(new Runnable() { mHandler.post(DreamService.this::detach);
@Override
public void run() {
DreamService.this.detach();
}
});
} }
@Override @Override
public void wakeUp() { public void wakeUp() {
mHandler.post(new Runnable() { mHandler.post(() -> DreamService.this.wakeUp(true /*fromSystem*/));
@Override
public void run() {
DreamService.this.wakeUp(true /*fromSystem*/);
}
});
} }
} }
} }

68
services/core/java/com/android/server/dreams/DreamController.java
View File

@@ -16,8 +16,8 @@
package com.android.server.dreams; package com.android.server.dreams;
import com.android.internal.logging.MetricsLogger; import static android.view.Display.DEFAULT_DISPLAY;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import static android.view.WindowManager.LayoutParams.TYPE_DREAM;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@@ -27,10 +27,10 @@ import android.os.Binder;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.IBinder.DeathRecipient;
import android.os.IRemoteCallback; import android.os.IRemoteCallback;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.IBinder.DeathRecipient;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.Trace; import android.os.Trace;
import android.os.UserHandle; import android.os.UserHandle;
@@ -38,15 +38,14 @@ import android.service.dreams.DreamService;
import android.service.dreams.IDreamService; import android.service.dreams.IDreamService;
import android.util.Slog; import android.util.Slog;
import android.view.IWindowManager; import android.view.IWindowManager;
import android.view.WindowManager;
import android.view.WindowManagerGlobal; import android.view.WindowManagerGlobal;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.NoSuchElementException; 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. * 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() { private final Runnable mStopStubbornDreamRunnable = () -> {
@Override Slog.w(TAG, "Stubborn dream did not finish itself in the time allotted");
public void run() { stopDream(true /*immediate*/);
Slog.w(TAG, "Stubborn dream did not finish itself in the time allotted");
stopDream(true /*immediate*/);
}
}; };
public DreamController(Context context, Handler handler, Listener listener) { 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); Slog.w(TAG, "Error removing window token for dream.", ex);
} }
mHandler.post(new Runnable() { mHandler.post(() -> mListener.onDreamStopped(oldDream.mToken));
@Override
public void run() {
mListener.onDreamStopped(oldDream.mToken);
}
});
} finally { } finally {
Trace.traceEnd(Trace.TRACE_TAG_POWER); Trace.traceEnd(Trace.TRACE_TAG_POWER);
} }
@@ -313,13 +304,10 @@ final class DreamController {
// May be called on any thread. // May be called on any thread.
@Override @Override
public void binderDied() { public void binderDied() {
mHandler.post(new Runnable() { mHandler.post(() -> {
@Override mService = null;
public void run() { if (mCurrentDream == DreamRecord.this) {
mService = null; stopDream(true /*immediate*/);
if (mCurrentDream == DreamRecord.this) {
stopDream(true /*immediate*/);
}
} }
}); });
} }
@@ -327,16 +315,13 @@ final class DreamController {
// May be called on any thread. // May be called on any thread.
@Override @Override
public void onServiceConnected(ComponentName name, final IBinder service) { public void onServiceConnected(ComponentName name, final IBinder service) {
mHandler.post(new Runnable() { mHandler.post(() -> {
@Override mConnected = true;
public void run() { if (mCurrentDream == DreamRecord.this && mService == null) {
mConnected = true; attach(IDreamService.Stub.asInterface(service));
if (mCurrentDream == DreamRecord.this && mService == null) { // Wake lock will be released once dreaming starts.
attach(IDreamService.Stub.asInterface(service)); } else {
// Wake lock will be released once dreaming starts. releaseWakeLockIfNeeded();
} else {
releaseWakeLockIfNeeded();
}
} }
}); });
} }
@@ -344,13 +329,10 @@ final class DreamController {
// May be called on any thread. // May be called on any thread.
@Override @Override
public void onServiceDisconnected(ComponentName name) { public void onServiceDisconnected(ComponentName name) {
mHandler.post(new Runnable() { mHandler.post(() -> {
@Override mService = null;
public void run() { if (mCurrentDream == DreamRecord.this) {
mService = null; stopDream(true /*immediate*/);
if (mCurrentDream == DreamRecord.this) {
stopDream(true /*immediate*/);
}
} }
}); });
} }