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

Commit 5691806f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10216924 from e4fb3654 to udc-qpr1-release 

Change-Id: I6ff3b632caae1837e0921f51987f93e7cf82934c
parents 53270541 e4fb3654

core/java/android/view/contentprotection/OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Bug component: 544200



include /core/java/android/view/contentcapture/OWNERS

core/java/android/window/SurfaceSyncGroup.java

+6 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.Debug; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.Looper;

import android.os.RemoteException;

import android.os.Trace;

import android.util.ArraySet;
@@ -800,22 +801,25 @@ public final class SurfaceSyncGroup { 
    }



    private void addTimeout() {

        Looper looper = null;

        synchronized (sHandlerThreadLock) {

            if (sHandlerThread == null) {

                sHandlerThread = new HandlerThread("SurfaceSyncGroupTimer");

                sHandlerThread.start();

            }



            looper = sHandlerThread.getLooper();

        }



        synchronized (mLock) {

            if (mTimeoutAdded || mTimeoutDisabled) {

            if (mTimeoutAdded || mTimeoutDisabled || looper == null) {

                // We only need one timeout for the entire SurfaceSyncGroup since we just want to

                // ensure it doesn't stay stuck forever.

                return;

            }



            if (mHandler == null) {

                mHandler = new Handler(sHandlerThread.getLooper());

                mHandler = new Handler(looper);

            }



            mTimeoutAdded = true;

core/tests/coretests/src/android/content/OWNERS

+2 −0
Original line number Diff line number Diff line
@@ -5,3 +5,5 @@ per-file *Launcher* = file:/core/java/android/content/pm/LAUNCHER_OWNERS 
per-file *Shortcut* = file:/core/java/android/content/pm/SHORTCUT_OWNERS

per-file *ComponentCallbacks* = file:/services/core/java/com/android/server/wm/OWNERS

per-file *ComponentCallbacks* = charlesccchen@google.com

per-file ContentCaptureOptions* = file:/core/java/android/view/contentcapture/OWNERS

core/tests/coretests/src/android/view/contentprotection/OWNERS

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# Bug component: 544200



include /core/java/android/view/contentcapture/OWNERS

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopModeController.java

+5 −0
Original line number Diff line number Diff line
@@ -519,6 +519,11 @@ public class DesktopModeController implements RemoteCallable<DesktopModeControll 
                    controller -> controller.showDesktopApps(displayId));

        }



        @Override

        public void showDesktopApp(int taskId) throws RemoteException {

            // TODO

        }



        @Override

        public int getVisibleTaskCount(int displayId) throws RemoteException {

            int[] result = new int[1];