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

Commit 427113fa authored by Zak Cohen's avatar Zak Cohen Committed by Android (Google) Code Review
Browse files

Merge "Add temporary logging to try and debug: b/202414125" into sc-v2-dev

parents 27794e8f 21f6189c
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ import android.view.RemoteAnimationAdapter;
import android.view.RemoteAnimationTarget;
import android.view.RemoteAnimationTarget;
import android.view.SurfaceControl;
import android.view.SurfaceControl;


import com.android.launcher3.testing.TestProtocol;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.util.MainThreadInitializedObject;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.launcher3.util.SplitConfigurationOptions;
import com.android.systemui.shared.recents.ISystemUiProxy;
import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -444,6 +445,8 @@ public class SystemUiProxy implements ISystemUiProxy,
            } catch (RemoteException e) {
            } catch (RemoteException e) {
                Log.w(TAG, "Failed call handleImageBundleAsScreenshot");
                Log.w(TAG, "Failed call handleImageBundleAsScreenshot");
            }
            }
        } else if (TestProtocol.sDebugTracing) {
            Log.d(TestProtocol.NO_SCREENSHOT, "sysuiproxy, no proxy available");
        }
        }
    }
    }


+4 −0
Original line number Original line Diff line number Diff line
@@ -49,6 +49,7 @@ import androidx.core.content.FileProvider;


import com.android.internal.app.ChooserActivity;
import com.android.internal.app.ChooserActivity;
import com.android.launcher3.BuildConfig;
import com.android.launcher3.BuildConfig;
import com.android.launcher3.testing.TestProtocol;
import com.android.quickstep.SystemUiProxy;
import com.android.quickstep.SystemUiProxy;
import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.recents.model.Task;
import com.android.systemui.shared.recents.utilities.BitmapUtil;
import com.android.systemui.shared.recents.utilities.BitmapUtil;
@@ -77,6 +78,9 @@ public class ImageActionUtils {
    public static void saveScreenshot(SystemUiProxy systemUiProxy, Bitmap screenshot,
    public static void saveScreenshot(SystemUiProxy systemUiProxy, Bitmap screenshot,
            Rect screenshotBounds,
            Rect screenshotBounds,
            Insets visibleInsets, Task.TaskKey task) {
            Insets visibleInsets, Task.TaskKey task) {
        if (TestProtocol.sDebugTracing) {
            Log.d(TestProtocol.NO_SCREENSHOT, "image action utils calling into sysuiproxy");
        }
        systemUiProxy.handleImageBundleAsScreenshot(BitmapUtil.hardwareBitmapToBundle(screenshot),
        systemUiProxy.handleImageBundleAsScreenshot(BitmapUtil.hardwareBitmapToBundle(screenshot),
                screenshotBounds, visibleInsets, task);
                screenshotBounds, visibleInsets, task);
    }
    }
+1 −0
Original line number Original line Diff line number Diff line
@@ -122,4 +122,5 @@ public final class TestProtocol {
    public static final String TASK_VIEW_ID_CRASH = "b/195430732";
    public static final String TASK_VIEW_ID_CRASH = "b/195430732";
    public static final String NO_DROP_TARGET = "b/195031154";
    public static final String NO_DROP_TARGET = "b/195031154";
    public static final String NULL_INT_SET = "b/200572078";
    public static final String NULL_INT_SET = "b/200572078";
    public static final String NO_SCREENSHOT = "b/202414125";
}
}