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

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

Merge "Remove some unused fields and methods in WM"

parents 8484e652 76af2232

services/core/java/com/android/server/wm/ActivityRecord.java

+0 −47
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; 
import static android.content.pm.ActivityInfo.SIZE_CHANGES_SUPPORTED_METADATA;

import static android.content.pm.ActivityInfo.SIZE_CHANGES_SUPPORTED_OVERRIDE;

import static android.content.pm.ActivityInfo.SIZE_CHANGES_UNSUPPORTED_OVERRIDE;

import static android.content.pm.ActivityInfo.isFixedOrientationLandscape;

import static android.content.pm.ActivityInfo.isFixedOrientationPortrait;

import static android.content.res.Configuration.ASSETS_SEQ_UNDEFINED;

import static android.content.res.Configuration.EMPTY;

import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
@@ -4160,29 +4158,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                true /* topToBottom */);

    }



    WindowState getImeTargetBelowWindow(WindowState w) {

        final int index = mChildren.indexOf(w);

        if (index > 0) {

            return mChildren.get(index - 1)

                    .getWindow(WindowState::canBeImeTarget);

        }

        return null;

    }



    WindowState getHighestAnimLayerWindow(WindowState currentTarget) {

        WindowState candidate = null;

        for (int i = mChildren.indexOf(currentTarget); i >= 0; i--) {

            final WindowState w = mChildren.get(i);

            if (w.mRemoved) {

                continue;

            }

            if (candidate == null) {

                candidate = w;

            }

        }

        return candidate;

    }



    @Override

    boolean forAllActivities(Predicate<ActivityRecord> callback, boolean traverseTopToBottom) {

        return callback.test(this);
@@ -7017,11 +6992,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        clearThumbnail();

    }



    @VisibleForTesting

    WindowContainerThumbnail getThumbnail() {

        return mThumbnail;

    }



    private void clearThumbnail() {

        if (mThumbnail == null) {

            return;
@@ -7034,9 +7004,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        return mTransit;

    }



    int getTransitFlags() {

        return mTransitFlags;

    }



    void registerRemoteAnimations(RemoteAnimationDefinition definition) {

        mRemoteAnimationDefinition = definition;
@@ -8089,20 +8056,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
        super.onResize();

    }



    /** Returns true if the configuration is compatible with this activity. */

    boolean isConfigurationCompatible(Configuration config) {

        final int orientation = getRequestedOrientation();

        if (isFixedOrientationPortrait(orientation)

                && config.orientation != ORIENTATION_PORTRAIT) {

            return false;

        }

        if (isFixedOrientationLandscape(orientation)

                && config.orientation != ORIENTATION_LANDSCAPE) {

            return false;

        }

        return true;

    }



    private boolean applyAspectRatio(Rect outBounds, Rect containingAppBounds,

            Rect containingBounds) {

        return applyAspectRatio(outBounds, containingAppBounds, containingBounds,

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+2 −10
Original line number Diff line number Diff line
@@ -501,9 +501,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
     */

    private Configuration mTempConfig = new Configuration();



    /** Temporary to avoid allocations. */

    final StringBuilder mStringBuilder = new StringBuilder(256);



    /**

     * Whether normal application switches are allowed; a call to {@link #stopAppSwitches()

     * disables this.
@@ -3096,11 +3093,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        throw new SecurityException(msg);

    }



    @VisibleForTesting

    int checkGetTasksPermission(String permission, int pid, int uid) {

        return checkPermission(permission, pid, uid);

    }



    static int checkPermission(String permission, int pid, int uid) {

        if (permission == null) {

            return PackageManager.PERMISSION_DENIED;
@@ -3120,10 +3112,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            return true;

        }



        boolean allowed = checkGetTasksPermission(android.Manifest.permission.REAL_GET_TASKS,

        boolean allowed = checkPermission(android.Manifest.permission.REAL_GET_TASKS,

                callingPid, callingUid) == PackageManager.PERMISSION_GRANTED;

        if (!allowed) {

            if (checkGetTasksPermission(android.Manifest.permission.GET_TASKS,

            if (checkPermission(android.Manifest.permission.GET_TASKS,

                    callingPid, callingUid) == PackageManager.PERMISSION_GRANTED) {

                // Temporary compatibility: some existing apps on the system image may

                // still be requesting the old permission and not switched to the new

services/core/java/com/android/server/wm/DisplayContent.java

+0 −12
Original line number Diff line number Diff line
@@ -555,9 +555,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    /** Windows removed since {@link #mCurrentFocus} was set to null. Used for ANR blaming. */

    final ArrayList<WindowState> mWinRemovedSinceNullFocus = new ArrayList<>();



    /** Windows whose client's insets states are not up-to-date. */

    final ArrayList<WindowState> mWinInsetsChanged = new ArrayList<>();



    private ScreenRotationAnimation mScreenRotationAnimation;



    /**
@@ -637,9 +634,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    /** The surface parent of the IME container. */

    private SurfaceControl mInputMethodSurfaceParent;



    /** If {@code true} hold off on modifying the animation layer of {@link #mImeLayeringTarget} */

    boolean mImeLayeringTargetWaitingAnim;



    /** The screenshot IME surface to place on the task while transitioning to the next task. */

    SurfaceControl mImeScreenshot;
@@ -4976,12 +4970,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        }

    }



    void assignRootTaskOrdering() {

        forAllTaskDisplayAreas(taskDisplayArea -> {

            taskDisplayArea.assignRootTaskOrdering(getPendingTransaction());

        });

    }



    /**

     * Increment the deferral count to determine whether to update the IME target.

     */

services/core/java/com/android/server/wm/DisplayPolicy.java

+0 −11
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ import com.android.server.policy.WindowManagerPolicy.ScreenOnListener; 
import com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs;

import com.android.server.statusbar.StatusBarManagerInternal;

import com.android.server.wallpaper.WallpaperManagerInternal;

import com.android.server.wm.InputMonitor.EventReceiverInputConsumer;



import java.io.PrintWriter;

import java.util.ArrayList;
@@ -395,7 +394,6 @@ public class DisplayPolicy { 


    // -------- PolicyHandler --------

    private static final int MSG_REQUEST_TRANSIENT_BARS = 2;

    private static final int MSG_DISPOSE_INPUT_CONSUMER = 3;

    private static final int MSG_ENABLE_POINTER_LOCATION = 4;

    private static final int MSG_DISABLE_POINTER_LOCATION = 5;
@@ -424,9 +422,6 @@ public class DisplayPolicy { 
                        }

                    }

                    break;

                case MSG_DISPOSE_INPUT_CONSUMER:

                    disposeInputConsumer((EventReceiverInputConsumer) msg.obj);

                    break;

                case MSG_ENABLE_POINTER_LOCATION:

                    enablePointerLocation();

                    break;
@@ -2573,12 +2568,6 @@ public class DisplayPolicy { 
        mImmersiveModeConfirmation.confirmCurrentPrompt();

    }



    private void disposeInputConsumer(EventReceiverInputConsumer inputConsumer) {

        if (inputConsumer != null) {

            inputConsumer.dispose();

        }

    }



    boolean isKeyguardShowing() {

        return mService.mPolicy.isKeyguardShowing();

    }

services/core/java/com/android/server/wm/InputMonitor.java

+0 −40
Original line number Diff line number Diff line
@@ -54,14 +54,12 @@ import android.graphics.Rect; 
import android.graphics.Region;

import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.Trace;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.EventLog;

import android.util.Slog;

import android.view.InputChannel;

import android.view.InputEventReceiver;

import android.view.InputWindowHandle;

import android.view.SurfaceControl;
@@ -112,44 +110,6 @@ final class InputMonitor { 
    private WeakReference<ActivityRecord> mActiveRecentsActivity = null;

    private WeakReference<ActivityRecord> mActiveRecentsLayerRef = null;



    /**

     * Representation of a input consumer that the policy has added to the window manager to consume

     * input events going to windows below it.

     */

    static final class EventReceiverInputConsumer extends InputConsumerImpl {

        private InputMonitor mInputMonitor;

        private final InputEventReceiver mInputEventReceiver;



        EventReceiverInputConsumer(WindowManagerService service, InputMonitor monitor,

                                   Looper looper, String name,

                                   InputEventReceiver.Factory inputEventReceiverFactory,

                                   int clientPid, UserHandle clientUser, int displayId) {

            super(service, null /* token */, name, null /* inputChannel */, clientPid, clientUser,

                    displayId);

            mInputMonitor = monitor;

            mInputEventReceiver = inputEventReceiverFactory.createInputEventReceiver(

                    mClientChannel, looper);

        }



        /** Removes the input consumer from the window manager. */

        void dismiss() {

            synchronized (mService.mGlobalLock) {

                mInputMonitor.mInputConsumers.remove(mName);

                hide(mInputMonitor.mInputTransaction);

                mInputMonitor.updateInputWindowsLw(true /* force */);

            }

        }



        /** Disposes the input consumer and input receiver from the associated thread. */

        void dispose() {

            synchronized (mService.mGlobalLock) {

                disposeChannelsLw(mInputMonitor.mInputTransaction);

                mInputEventReceiver.dispose();

                mInputMonitor.updateInputWindowsLw(true /* force */);

            }

        }

    }



    private class UpdateInputWindows implements Runnable {

        @Override

        public void run() {