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

Commit 504ea093 authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'activity_view_v2-oc-mr1-dev' into oc-mr1-dev 

* changes:
  DO NOT MERGE VirtualDisplay wrapper with input forwarding
  DO NOT MERGE ActivityView be gone!
parents 1cdf8ff7 d313469e

Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/accounts/IAccountManagerResponse.aidl \

	core/java/android/accounts/IAccountAuthenticator.aidl \

	core/java/android/accounts/IAccountAuthenticatorResponse.aidl \

	core/java/android/app/IActivityContainer.aidl \

	core/java/android/app/IActivityContainerCallback.aidl \

	core/java/android/app/IActivityController.aidl \

	core/java/android/app/IActivityManager.aidl \

	core/java/android/app/IActivityPendingResult.aidl \
@@ -84,6 +82,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/ITaskStackListener.aidl \

	core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IEphemeralResolver.aidl \

	core/java/android/app/IInputForwarder.aidl \

	core/java/android/app/IInstantAppResolver.aidl \

	core/java/android/app/IInstrumentationWatcher.aidl \

	core/java/android/app/INotificationManager.aidl \

cmds/am/src/com/android/commands/am/Am.java

+0 −45
Original line number Diff line number Diff line
@@ -16,70 +16,25 @@ 


package com.android.commands.am;



import static android.app.ActivityManager.RESIZE_MODE_SYSTEM;

import static android.app.ActivityManager.RESIZE_MODE_USER;

import static android.app.ActivityManager.StackId.DOCKED_STACK_ID;

import static android.app.ActivityManager.StackId.INVALID_STACK_ID;



import android.app.ActivityManager;

import android.app.ActivityManager.StackInfo;

import android.app.IActivityContainer;

import android.app.IActivityController;

import android.app.IActivityManager;

import android.app.IInstrumentationWatcher;

import android.app.Instrumentation;

import android.app.IStopUserCallback;

import android.app.ProfilerInfo;

import android.app.UiAutomationConnection;

import android.app.usage.ConfigurationStats;

import android.app.usage.IUsageStatsManager;

import android.app.usage.UsageStatsManager;

import android.content.ComponentCallbacks2;

import android.content.ComponentName;

import android.content.Context;

import android.content.IIntentReceiver;

import android.content.Intent;

import android.content.pm.IPackageManager;

import android.content.pm.InstrumentationInfo;

import android.content.pm.ParceledListSlice;

import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.SELinux;

import android.os.ServiceManager;

import android.os.ShellCallback;

import android.os.ShellCommand;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.AndroidException;

import android.util.ArrayMap;

import android.util.Log;

import android.view.IWindowManager;



import com.android.internal.os.BaseCommand;

import com.android.internal.util.HexDump;

import com.android.internal.util.Preconditions;



import java.io.BufferedReader;

import java.io.File;

import java.io.FileDescriptor;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.io.InputStreamReader;

import java.io.PrintStream;

import java.io.PrintWriter;

import java.net.URISyntaxException;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;



public class Am extends BaseCommand {

core/java/android/app/ActivityView.java

+219 −401

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/IActivityManager.aidl

+1 −5
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import android.app.ActivityManager; 
import android.app.ApplicationErrorReport;

import android.app.ContentProviderHolder;

import android.app.IApplicationThread;

import android.app.IActivityContainer;

import android.app.IActivityContainerCallback;

import android.app.IActivityController;

import android.app.IAppTask;

import android.app.IInstrumentationWatcher;
@@ -355,8 +353,6 @@ interface IActivityManager { 
    void killUid(int appId, int userId, in String reason);

    void setUserIsMonkey(boolean monkey);

    void hang(in IBinder who, boolean allowRestart);

    IActivityContainer createVirtualActivityContainer(in IBinder parentActivityToken,

            in IActivityContainerCallback callback);

    void moveTaskToStack(int taskId, int stackId, boolean toTop);

    /**

     * Resizes the input stack id to the given bounds.
@@ -436,7 +432,7 @@ interface IActivityManager { 


    // Start of M transactions

    void notifyCleartextNetwork(int uid, in byte[] firstPacket);

    IActivityContainer createStackOnDisplay(int displayId);

    int createStackOnDisplay(int displayId);

    int getFocusedStackId();

    void setTaskResizeable(int taskId, int resizeableMode);

    boolean requestAssistContextExtras(int requestType, in IResultReceiver receiver,

core/java/android/app/IActivityContainerCallback.aidl→core/java/android/app/IInputForwarder.aidl

+11 −7
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2013, The Android Open Source Project

 * Copyright (c) 2017, 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.
@@ -16,10 +16,14 @@ 


package android.app;



import android.os.IBinder;

import android.view.InputEvent;



/** @hide */

interface IActivityContainerCallback {

    oneway void setVisible(IBinder container, boolean visible);

    oneway void onAllActivitiesComplete(IBinder container);

/**

 * Forwards input events into owned activity container, used in {@link android.app.ActivityView}.

 * To forward input to other apps {@link android.Manifest.permission.INJECT_EVENTS} permission is

 * required.

 * @hide

 */

interface IInputForwarder {

    boolean forwardEvent(in InputEvent event);

}
 
 No newline at end of file