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

Commit fc46e9b6 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Move IActivityManager to aidl. 

Bug: 30977067
Test: Existing tests are passing, dump commands still working.
Change-Id: I9cf81c4d381ebce14a6c701e409cbb269f2ff1fb
parent 37ea9a1f

Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ LOCAL_SRC_FILES += \ 
	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 \

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

	core/java/android/app/IAlarmListener.aidl \
@@ -615,6 +616,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/os/DropBoxManager.aidl \

	frameworks/base/core/java/android/os/Bundle.aidl \

	frameworks/base/core/java/android/os/Debug.aidl \

	frameworks/base/core/java/android/os/StrictMode.aidl \

	frameworks/base/core/java/android/accessibilityservice/AccessibilityServiceInfo.aidl \

	frameworks/base/core/java/android/net/Network.aidl \

	frameworks/base/core/java/android/net/RouteInfo.aidl \
@@ -695,6 +697,7 @@ aidl_files := \ 
	frameworks/base/core/java/android/content/pm/ApplicationInfo.aidl \

	frameworks/base/core/java/android/content/pm/PermissionInfo.aidl \

	frameworks/base/core/java/android/content/pm/ActivityInfo.aidl \

	frameworks/base/core/java/android/content/pm/ConfigurationInfo.aidl \

	frameworks/base/core/java/android/content/pm/PackageInfo.aidl \

	frameworks/base/core/java/android/content/pm/ResolveInfo.aidl \

	frameworks/base/core/java/android/content/pm/ProviderInfo.aidl \

cmds/content/src/com/android/commands/content/Content.java

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.commands.content;



import android.app.ActivityManagerNative;

import android.app.ContentProviderHolder;

import android.app.IActivityManager;

import android.app.IActivityManager.ContentProviderHolder;

import android.content.ContentValues;

import android.content.IContentProvider;

import android.database.Cursor;

cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/ShellUiAutomatorBridge.java

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package com.android.uiautomator.core;



import android.app.ActivityManagerNative;

import android.app.ContentProviderHolder;

import android.app.IActivityManager;

import android.app.IActivityManager.ContentProviderHolder;

import android.app.UiAutomation;

import android.content.Context;

import android.content.IContentProvider;

compiled-classes-phone

+5 −3
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ android.app.BackStackRecord$TransitionState 
android.app.BackStackState

android.app.BackStackState$1

android.app.BroadcastOptions

android.app.ContentProviderHolder

android.app.ContentProviderHolder$1

android.app.ContextImpl

android.app.ContextImpl$1

android.app.ContextImpl$ApplicationContentResolver
@@ -298,9 +300,8 @@ android.app.IActivityContainer$Stub 
android.app.IActivityContainerCallback

android.app.IActivityController

android.app.IActivityManager

android.app.IActivityManager$ContentProviderHolder

android.app.IActivityManager$ContentProviderHolder$1

android.app.IActivityManager$WaitResult

android.app.IActivityManager$Stub

android.app.IActivityManager$Stub$Proxy

android.app.IAlarmCompleteListener

android.app.IAlarmCompleteListener$Stub

android.app.IAlarmListener
@@ -521,6 +522,7 @@ android.app.TaskStackBuilder 
android.app.TimePickerDialog

android.app.TimePickerDialog$OnTimeSetListener

android.app.UiModeManager

android.app.WaitResult;

android.app.WallpaperInfo

android.app.WallpaperManager

android.app.WallpaperManager$Globals

core/java/android/app/Activity.java

+5 −4
Original line number Diff line number Diff line
@@ -6047,8 +6047,8 @@ public class Activity extends ContextThemeWrapper 
        boolean drawComplete;

        try {

            mTranslucentCallback = callback;

            mChangeCanvasToTranslucent =

                    ActivityManagerNative.getDefault().convertToTranslucent(mToken, options);

            mChangeCanvasToTranslucent = ActivityManagerNative.getDefault().convertToTranslucent(

                    mToken, options == null ? null : options.toBundle());

            WindowManagerGlobal.getInstance().changeCanvasOpacity(mToken, false);

            drawComplete = true;

        } catch (RemoteException e) {
@@ -6092,7 +6092,8 @@ public class Activity extends ContextThemeWrapper 
     */

    ActivityOptions getActivityOptions() {

        try {

            return ActivityManagerNative.getDefault().getActivityOptions(mToken);

            return ActivityOptions.fromBundle(

                    ActivityManagerNative.getDefault().getActivityOptions(mToken));

        } catch (RemoteException e) {

        }

        return null;
@@ -6988,7 +6989,7 @@ public class Activity extends ContextThemeWrapper 
     */

    public void startLockTask() {

        try {

            ActivityManagerNative.getDefault().startLockTaskMode(mToken);

            ActivityManagerNative.getDefault().startLockTaskModeByToken(mToken);

        } catch (RemoteException e) {

        }

    }