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

Merge "Marshal dream overlay connection logic with Handler." into tm-qpr-dev am: 0f588ae57d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17969592

Change-Id: I2b29fde6de7248300e390347fcd6834248391775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bryce Lee
2022-04-27 17:33:47 +00:00
committed by Automerger Merge Worker
parent 2fefe88ef5 0f588ae57d
commit 7e45bd4652
1 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,6 +251,8 @@ public class DreamService extends Service implements Window.Callback {
// A Queue of pending requests to execute on the overlay.
private final ArrayDeque<Consumer<IDreamOverlay>> mRequests;
private Handler mHandler = new Handler(Looper.getMainLooper());
private boolean mBound;
OverlayConnection() {
@@ -259,34 +261,40 @@ public class DreamService extends Service implements Window.Callback {
public void bind(Context context, @Nullable ComponentName overlayService,
ComponentName dreamService) {
if (overlayService == null) {
return;
}
mHandler.post(() -> {
if (overlayService == null) {
return;
}
final ServiceInfo serviceInfo = fetchServiceInfo(context, dreamService);
final ServiceInfo serviceInfo = fetchServiceInfo(context, dreamService);
final Intent overlayIntent = new Intent();
overlayIntent.setComponent(overlayService);
overlayIntent.putExtra(EXTRA_SHOW_COMPLICATIONS,
fetchShouldShowComplications(context, serviceInfo));
final Intent overlayIntent = new Intent();
overlayIntent.setComponent(overlayService);
overlayIntent.putExtra(EXTRA_SHOW_COMPLICATIONS,
fetchShouldShowComplications(context, serviceInfo));
context.bindService(overlayIntent,
this, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE);
mBound = true;
context.bindService(overlayIntent,
this, Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE);
mBound = true;
});
}
public void unbind(Context context) {
if (!mBound) {
return;
}
mHandler.post(() -> {
if (!mBound) {
return;
}
context.unbindService(this);
mBound = false;
context.unbindService(this);
mBound = false;
});
}
public void request(Consumer<IDreamOverlay> request) {
mRequests.push(request);
evaluate();
mHandler.post(() -> {
mRequests.push(request);
evaluate();
});
}
private void evaluate() {
@@ -304,15 +312,19 @@ public class DreamService extends Service implements Window.Callback {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
// Store Overlay and execute pending requests.
mOverlay = IDreamOverlay.Stub.asInterface(service);
evaluate();
mHandler.post(() -> {
// Store Overlay and execute pending requests.
mOverlay = IDreamOverlay.Stub.asInterface(service);
evaluate();
});
}
@Override
public void onServiceDisconnected(ComponentName name) {
// Clear Overlay binder to prevent further request processing.
mOverlay = null;
mHandler.post(() -> {
// Clear Overlay binder to prevent further request processing.
mOverlay = null;
});
}
}