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

Commit 04ce06bb authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Android (Google) Code Review
Browse files

Merge changes from topic "revert-16468379-CXJTAENUWN" into sc-v2-dev 

* changes:
  DO NOT MERGE Revert "[2/n] Camera Compat UI: Add interfaces for client-server..."
  DO NOT MERGE Revert "[3/n] Camera Compat UI: Add a camera compat control."
  DO NOT MERGE Revert "Log the CameraCompatControlEventReported atom."
parents 95aa9b34 7617679a

core/java/android/app/ActivityClient.java

+0 −23
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.annotation.Nullable; 
import android.content.ComponentName;

import android.content.Intent;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.IBinder;

import android.os.PersistableBundle;
@@ -499,28 +498,6 @@ public class ActivityClient { 
        }

    }



    /**

     * Shows or hides a Camera app compat toggle for stretched issues with the requested state.

     *

     * @param token The token for the window that needs a control.

     * @param showControl Whether the control should be shown or hidden.

     * @param transformationApplied Whether the treatment is already applied.

     * @param callback The callback executed when the user clicks on a control.

     */

    void requestCompatCameraControl(Resources res, IBinder token, boolean showControl,

            boolean transformationApplied, ICompatCameraControlCallback callback) {

        if (!res.getBoolean(com.android.internal.R.bool

                .config_isCameraCompatControlForStretchedIssuesEnabled)) {

            return;

        }

        try {

            getActivityClientController().requestCompatCameraControl(

                    token, showControl, transformationApplied, callback);

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

        }

    }



    public static ActivityClient getInstance() {

        return sInstance.get();

    }

core/java/android/app/ActivityThread.java

+11 −28
Original line number Diff line number Diff line
@@ -561,8 +561,8 @@ public final class ActivityThread extends ClientTransactionHandler 
        private Configuration mPendingOverrideConfig;

        // Used for consolidating configs before sending on to Activity.

        private Configuration tmpConfig = new Configuration();

        // Callback used for updating activity override config and camera compat control state.

        ViewRootImpl.ActivityConfigCallback activityConfigCallback;

        // Callback used for updating activity override config.

        ViewRootImpl.ActivityConfigCallback configCallback;

        ActivityClientRecord nextIdle;



        // Indicates whether this activity is currently the topmost resumed one in the system.
@@ -660,30 +660,13 @@ public final class ActivityThread extends ClientTransactionHandler 
            stopped = false;

            hideForNow = false;

            nextIdle = null;

            activityConfigCallback = new ViewRootImpl.ActivityConfigCallback() {

                @Override

                public void onConfigurationChanged(Configuration overrideConfig,

                        int newDisplayId) {

            configCallback = (Configuration overrideConfig, int newDisplayId) -> {

                if (activity == null) {

                    throw new IllegalStateException(

                            "Received config update for non-existing activity");

                }

                    activity.mMainThread.handleActivityConfigurationChanged(

                            ActivityClientRecord.this, overrideConfig, newDisplayId);

                }



                @Override

                public void requestCompatCameraControl(boolean showControl,

                        boolean transformationApplied, ICompatCameraControlCallback callback) {

                    if (activity == null) {

                        throw new IllegalStateException(

                                "Received camera compat control update for non-existing activity");

                    }

                    ActivityClient.getInstance().requestCompatCameraControl(

                            activity.getResources(), token, showControl, transformationApplied,

                            callback);

                }



                activity.mMainThread.handleActivityConfigurationChanged(this, overrideConfig,

                        newDisplayId);

            };

        }
@@ -3674,7 +3657,7 @@ public final class ActivityThread extends ClientTransactionHandler 
                activity.attach(appContext, this, getInstrumentation(), r.token,

                        r.ident, app, r.intent, r.activityInfo, title, r.parent,

                        r.embeddedID, r.lastNonConfigurationInstances, config,

                        r.referrer, r.voiceInteractor, window, r.activityConfigCallback,

                        r.referrer, r.voiceInteractor, window, r.configCallback,

                        r.assistToken, r.shareableActivityToken);



                if (customIntent != null) {
@@ -5522,8 +5505,8 @@ public final class ActivityThread extends ClientTransactionHandler 
                } else {

                    final ViewRootImpl viewRoot = v.getViewRootImpl();

                    if (viewRoot != null) {

                        // Clear callbacks to avoid the destroyed activity from receiving

                        // configuration or camera compat changes that are no longer effective.

                        // Clear the callback to avoid the destroyed activity from receiving

                        // configuration changes that are no longer effective.

                        viewRoot.setActivityConfigCallback(null);

                    }

                    wm.removeViewImmediate(v);

core/java/android/app/IActivityClientController.aidl

+0 −12
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.app;



import android.app.ActivityManager;

import android.app.ICompatCameraControlCallback;

import android.app.IRequestFinishCallback;

import android.app.PictureInPictureParams;

import android.content.ComponentName;
@@ -144,15 +143,4 @@ interface IActivityClientController { 


    /** Reports that the splash screen view has attached to activity.  */

    oneway void splashScreenAttached(in IBinder token);



    /**

     * Shows or hides a Camera app compat toggle for stretched issues with the requested state.

     *

     * @param token The token for the window that needs a control.

     * @param showControl Whether the control should be shown or hidden.

     * @param transformationApplied Whether the treatment is already applied.

     * @param callback The callback executed when the user clicks on a control.

     */

    oneway void requestCompatCameraControl(in IBinder token, boolean showControl,

            boolean transformationApplied, in ICompatCameraControlCallback callback);

}

core/java/android/app/ICompatCameraControlCallback.aidl

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

 * Copyright (C) 2021 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.app;



/**

 * This callback allows ActivityRecord to ask the calling View to apply the treatment for stretched

 * issues affecting camera viewfinders when the user clicks on the camera compat control.

 *

 * {@hide}

 */

oneway interface ICompatCameraControlCallback {



    void applyCameraCompatTreatment();



    void revertCameraCompatTreatment();

}

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -1259,7 +1259,7 @@ public class Instrumentation { 
                info, title, parent, id,

                (Activity.NonConfigurationInstances)lastNonConfigurationInstance,

                new Configuration(), null /* referrer */, null /* voiceInteractor */,

                null /* window */, null /* activityCallback */, null /*assistToken*/,

                null /* window */, null /* activityConfigCallback */, null /*assistToken*/,

                null /*shareableActivityToken*/);

        return activity;

    }