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

Commit 4a4282f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Define SurfaceControl.Transaction aidl in SurfaceControl.aidl file"

parents 017d7e43 676cdb31

core/java/android/view/IWindowSession.aidl

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import android.view.WindowManager; 
import android.view.InsetsState;

import android.view.Surface;

import android.view.SurfaceControl;

import android.view.Transaction;

import android.view.SurfaceControl.Transaction;



import java.util.List;
@@ -156,7 +156,7 @@ interface IWindowSession { 
     * is null if there is no sync required.

     */

    @UnsupportedAppUsage

    void finishDrawing(IWindow window, in Transaction postDrawTransaction);

    void finishDrawing(IWindow window, in SurfaceControl.Transaction postDrawTransaction);



    @UnsupportedAppUsage

    void setInTouchMode(boolean showFocus);

core/java/android/view/SurfaceControl.aidl

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ 
package android.view;



parcelable SurfaceControl;

parcelable SurfaceControl.Transaction;

core/java/android/view/Transaction.aidl

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.view.SurfaceControl;



parcelable Transaction;