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

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

Merge "Remove visibleBehind functionality"

parents 284bd018 c981ad5a

core/java/android/app/Activity.java

+0 −8
Original line number Diff line number Diff line
@@ -801,10 +801,6 @@ public class Activity extends ContextThemeWrapper 
    final Handler mHandler = new Handler();

    final FragmentController mFragments = FragmentController.createController(new HostCallbacks());



    // Most recent call to requestVisibleBehind().

    @Deprecated

    boolean mVisibleBehind;



    private static final class ManagedCursor {

        ManagedCursor(Cursor cursor) {

            mCursor = cursor;
@@ -6459,10 +6455,6 @@ public class Activity extends ContextThemeWrapper 
    @Deprecated

    @SystemApi

    public boolean isBackgroundVisibleBehind() {

        try {

            return ActivityManager.getService().isBackgroundVisibleBehind(mToken);

        } catch (RemoteException e) {

        }

        return false;

    }

core/java/android/app/ActivityManager.java

+17 −31
Original line number Diff line number Diff line
@@ -24,42 +24,35 @@ import android.annotation.RequiresPermission; 
import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.content.pm.ActivityInfo;

import android.content.res.Configuration;

import android.graphics.Canvas;

import android.graphics.GraphicBuffer;

import android.graphics.Matrix;

import android.graphics.Point;

import android.os.BatteryStats;

import android.os.Build;

import android.os.Build.VERSION_CODES;

import android.os.IBinder;

import android.os.ParcelFileDescriptor;



import com.android.internal.app.procstats.ProcessStats;

import com.android.internal.os.RoSystemProperties;

import com.android.internal.os.TransferPipe;

import com.android.internal.util.FastPrintWriter;

import com.android.server.LocalServices;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.UriPermission;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.ConfigurationInfo;

import android.content.pm.IPackageDataObserver;

import android.content.pm.PackageManager;

import android.content.pm.ParceledListSlice;

import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Color;

import android.graphics.GraphicBuffer;

import android.graphics.Matrix;

import android.graphics.Point;

import android.graphics.Rect;

import android.os.BatteryStats;

import android.os.Build;

import android.os.Build.VERSION_CODES;

import android.os.Bundle;

import android.os.Debug;

import android.os.Handler;

import android.os.IBinder;

import android.os.Parcel;

import android.os.ParcelFileDescriptor;

import android.os.Parcelable;

import android.os.Process;

import android.os.RemoteException;
@@ -72,6 +65,12 @@ import android.util.DisplayMetrics; 
import android.util.Singleton;

import android.util.Size;



import com.android.internal.app.procstats.ProcessStats;

import com.android.internal.os.RoSystemProperties;

import com.android.internal.os.TransferPipe;

import com.android.internal.util.FastPrintWriter;

import com.android.server.LocalServices;



import org.xmlpull.v1.XmlSerializer;



import java.io.FileDescriptor;
@@ -903,19 +902,6 @@ public class ActivityManager { 
            return stackId == HOME_STACK_ID || stackId == RECENTS_STACK_ID;

        }



        /**

         * Returns true if activities contained in this stack can request visible behind by

         * calling {@link Activity#requestVisibleBehind}.

         *

         * @deprecated This method's functionality is no longer supported as of

         * {@link android.os.Build.VERSION_CODES#O} and will be removed in a future release.

         */

        @Deprecated

        public static boolean activitiesCanRequestVisibleBehind(int stackId) {

            return stackId == FULLSCREEN_WORKSPACE_STACK_ID ||

                    stackId == ASSISTANT_STACK_ID;

        }



        /**

         * Returns true if this stack may be scaled without resizing, and windows within may need

         * to be configured as such.

core/java/android/app/ActivityThread.java

+0 −51
Original line number Diff line number Diff line
@@ -445,7 +445,6 @@ public final class ActivityThread { 
                sb.append(", startedActivity=").append(activity.mStartedActivity);

                sb.append(", temporaryPause=").append(activity.mTemporaryPause);

                sb.append(", changingConfigurations=").append(activity.mChangingConfigurations);

                sb.append(", visibleBehind=").append(activity.mVisibleBehind);

                sb.append("}");

            }

            sb.append("}");
@@ -1383,16 +1382,6 @@ public final class ActivityThread { 
            DateFormat.set24HourTimePref(timeFormatPreferenceBool);

        }



        @Override

        public void scheduleCancelVisibleBehind(IBinder token) {

            sendMessage(H.CANCEL_VISIBLE_BEHIND, token);

        }



        @Override

        public void scheduleBackgroundVisibleBehindChanged(IBinder token, boolean visible) {

            sendMessage(H.BACKGROUND_VISIBLE_BEHIND_CHANGED, token, visible ? 1 : 0);

        }



        @Override

        public void scheduleEnterAnimationComplete(IBinder token) {

            sendMessage(H.ENTER_ANIMATION_COMPLETE, token);
@@ -1509,8 +1498,6 @@ public final class ActivityThread { 
        public static final int TRANSLUCENT_CONVERSION_COMPLETE = 144;

        public static final int INSTALL_PROVIDER        = 145;

        public static final int ON_NEW_ACTIVITY_OPTIONS = 146;

        public static final int CANCEL_VISIBLE_BEHIND = 147;

        public static final int BACKGROUND_VISIBLE_BEHIND_CHANGED = 148;

        public static final int ENTER_ANIMATION_COMPLETE = 149;

        public static final int START_BINDER_TRACKING = 150;

        public static final int STOP_BINDER_TRACKING_AND_DUMP = 151;
@@ -1571,8 +1558,6 @@ public final class ActivityThread { 
                    case TRANSLUCENT_CONVERSION_COMPLETE: return "TRANSLUCENT_CONVERSION_COMPLETE";

                    case INSTALL_PROVIDER: return "INSTALL_PROVIDER";

                    case ON_NEW_ACTIVITY_OPTIONS: return "ON_NEW_ACTIVITY_OPTIONS";

                    case CANCEL_VISIBLE_BEHIND: return "CANCEL_VISIBLE_BEHIND";

                    case BACKGROUND_VISIBLE_BEHIND_CHANGED: return "BACKGROUND_VISIBLE_BEHIND_CHANGED";

                    case ENTER_ANIMATION_COMPLETE: return "ENTER_ANIMATION_COMPLETE";

                    case MULTI_WINDOW_MODE_CHANGED: return "MULTI_WINDOW_MODE_CHANGED";

                    case PICTURE_IN_PICTURE_MODE_CHANGED: return "PICTURE_IN_PICTURE_MODE_CHANGED";
@@ -1815,12 +1800,6 @@ public final class ActivityThread { 
                    Pair<IBinder, ActivityOptions> pair = (Pair<IBinder, ActivityOptions>) msg.obj;

                    onNewActivityOptions(pair.first, pair.second);

                    break;

                case CANCEL_VISIBLE_BEHIND:

                    handleCancelVisibleBehind((IBinder) msg.obj);

                    break;

                case BACKGROUND_VISIBLE_BEHIND_CHANGED:

                    handleOnBackgroundVisibleBehindChanged((IBinder) msg.obj, msg.arg1 > 0);

                    break;

                case ENTER_ANIMATION_COMPLETE:

                    handleEnterAnimationComplete((IBinder) msg.obj);

                    break;
@@ -3070,36 +3049,6 @@ public final class ActivityThread { 
        }

    }



    public void handleCancelVisibleBehind(IBinder token) {

        ActivityClientRecord r = mActivities.get(token);

        if (r != null) {

            mSomeActivitiesChanged = true;

            final Activity activity = r.activity;

            if (activity.mVisibleBehind) {

                activity.mCalled = false;

                activity.onVisibleBehindCanceled();

                // Tick, tick, tick. The activity has 500 msec to return or it will be destroyed.

                if (!activity.mCalled) {

                    throw new SuperNotCalledException("Activity " + activity.getLocalClassName() +

                            " did not call through to super.onVisibleBehindCanceled()");

                }

                activity.mVisibleBehind = false;

            }

        }

        try {

            ActivityManager.getService().backgroundResourcesReleased(token);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    public void handleOnBackgroundVisibleBehindChanged(IBinder token, boolean visible) {

        ActivityClientRecord r = mActivities.get(token);

        if (r != null) {

            r.activity.onBackgroundVisibleBehindChanged(visible);

        }

    }



    public void handleInstallProvider(ProviderInfo info) {

        final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();

        try {

core/java/android/app/IActivityManager.aidl

+0 −3
Original line number Diff line number Diff line
@@ -412,9 +412,6 @@ interface IActivityManager { 
    void stopSystemLockTaskMode();

    void finishVoiceTask(in IVoiceInteractionSession session);

    boolean isTopOfTask(in IBinder token);

    boolean requestVisibleBehind(in IBinder token, boolean visible);

    boolean isBackgroundVisibleBehind(in IBinder token);

    void backgroundResourcesReleased(in IBinder token);

    void notifyLaunchTaskBehindComplete(in IBinder token);

    int startActivityFromRecents(int taskId, in Bundle options);

    void notifyEnterAnimationComplete(in IBinder token);

core/java/android/app/IApplicationThread.aidl

+0 −2
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ oneway interface IApplicationThread { 
    void setProcessState(int state);

    void scheduleInstallProvider(in ProviderInfo provider);

    void updateTimePrefs(int timeFormatPreference);

    void scheduleCancelVisibleBehind(IBinder token);

    void scheduleBackgroundVisibleBehindChanged(IBinder token, boolean enabled);

    void scheduleEnterAnimationComplete(IBinder token);

    void notifyCleartextNetwork(in byte[] firstPacket);

    void startBinderTracking();