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

Commit e746fb17 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (15/n)"

parents 91a8afb5 53783740

core/java/android/app/ActivityManager.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -776,7 +776,7 @@ public class ActivityManager { 
    /** @hide */

    /** @hide */

    public int getPackageScreenCompatMode(String packageName) {

    public int getPackageScreenCompatMode(String packageName) {

        try {

        try {

            return getService().getPackageScreenCompatMode(packageName);

            return getTaskService().getPackageScreenCompatMode(packageName);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }
@@ -785,7 +785,7 @@ public class ActivityManager { 
    /** @hide */

    /** @hide */

    public void setPackageScreenCompatMode(String packageName, int mode) {

    public void setPackageScreenCompatMode(String packageName, int mode) {

        try {

        try {

            getService().setPackageScreenCompatMode(packageName, mode);

            getTaskService().setPackageScreenCompatMode(packageName, mode);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }
@@ -794,7 +794,7 @@ public class ActivityManager { 
    /** @hide */

    /** @hide */

    public boolean getPackageAskScreenCompat(String packageName) {

    public boolean getPackageAskScreenCompat(String packageName) {

        try {

        try {

            return getService().getPackageAskScreenCompat(packageName);

            return getTaskService().getPackageAskScreenCompat(packageName);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }
@@ -803,7 +803,7 @@ public class ActivityManager { 
    /** @hide */

    /** @hide */

    public void setPackageAskScreenCompat(String packageName, boolean ask) {

    public void setPackageAskScreenCompat(String packageName, boolean ask) {

        try {

        try {

            getService().setPackageAskScreenCompat(packageName, ask);

            getTaskService().setPackageAskScreenCompat(packageName, ask);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowFromSystemServer();

        }

        }

core/java/android/app/ActivityManagerInternal.java

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




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.content.ComponentName;

import android.content.IIntentSender;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.ApplicationInfo;
@@ -183,12 +184,6 @@ public abstract class ActivityManagerInternal { 
    /** Trims memory usage in the system by removing/stopping unused application processes. */

    /** Trims memory usage in the system by removing/stopping unused application processes. */

    public abstract void trimApplications();

    public abstract void trimApplications();





    /** Returns the screen compatibility mode for the given application. */

    public abstract int getPackageScreenCompatMode(ApplicationInfo ai);



    /** Sets the screen compatibility mode for the given application. */

    public abstract void setPackageScreenCompatMode(ApplicationInfo ai, int mode);



    /** Closes all system dialogs. */

    /** Closes all system dialogs. */

    public abstract void closeSystemDialogs(String reason);

    public abstract void closeSystemDialogs(String reason);
@@ -201,6 +196,11 @@ public abstract class ActivityManagerInternal { 
    public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);

    public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);





    public abstract void updateOomAdj();

    public abstract void updateOomAdj();

    public abstract void updateCpuStats();

    public abstract void updateUsageStats(

            ComponentName activity, int uid, int userId, boolean resumed);

    public abstract void updateForegroundTimeIfOnBattery(

            String packageName, int uid, long cpuTimeDiff);

    public abstract void sendForegroundProfileChanged(int userId);

    public abstract void sendForegroundProfileChanged(int userId);





    /**

    /**
@@ -226,4 +226,10 @@ public abstract class ActivityManagerInternal { 




    /** Gets the task id for a given activity. */

    /** Gets the task id for a given activity. */

    public abstract int getTaskIdForActivity(@NonNull IBinder token, boolean onlyRoot);

    public abstract int getTaskIdForActivity(@NonNull IBinder token, boolean onlyRoot);



    public abstract void setBooting(boolean booting);

    public abstract boolean isBooting();

    public abstract void setBooted(boolean booted);

    public abstract boolean isBooted();

    public abstract void finishBooting();

}
 
}

core/java/android/app/IActivityManager.aidl

+0 −3
Original line number Original line Diff line number Diff line
@@ -248,10 +248,7 @@ interface IActivityManager { 
            boolean runGc, in String path, in ParcelFileDescriptor fd,

            boolean runGc, in String path, in ParcelFileDescriptor fd,

            in RemoteCallback finishCallback);

            in RemoteCallback finishCallback);

    boolean isUserRunning(int userid, int flags);

    boolean isUserRunning(int userid, int flags);

    int getPackageScreenCompatMode(in String packageName);

    void setPackageScreenCompatMode(in String packageName, int mode);

    void setPackageScreenCompatMode(in String packageName, int mode);

    boolean getPackageAskScreenCompat(in String packageName);

    void setPackageAskScreenCompat(in String packageName, boolean ask);

    boolean switchUser(int userid);

    boolean switchUser(int userid);

    boolean removeTask(int taskId);

    boolean removeTask(int taskId);

    void registerProcessObserver(in IProcessObserver observer);

    void registerProcessObserver(in IProcessObserver observer);

core/java/android/app/IActivityTaskManager.aidl

+5 −0
Original line number Original line Diff line number Diff line
@@ -422,4 +422,9 @@ interface IActivityTaskManager { 
    void resumeAppSwitches();

    void resumeAppSwitches();

    void setActivityController(in IActivityController watcher, boolean imAMonkey);

    void setActivityController(in IActivityController watcher, boolean imAMonkey);

    void setVoiceKeepAwake(in IVoiceInteractionSession session, boolean keepAwake);

    void setVoiceKeepAwake(in IVoiceInteractionSession session, boolean keepAwake);



    int getPackageScreenCompatMode(in String packageName);

    void setPackageScreenCompatMode(in String packageName, int mode);

    boolean getPackageAskScreenCompat(in String packageName);

    void setPackageAskScreenCompat(in String packageName, boolean ask);

}
 
}

services/core/java/com/android/server/am/ActiveServices.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2490,7 +2490,7 @@ public final class ActiveServices { 
                                 PackageManager.NOTIFY_PACKAGE_USE_SERVICE);

                                 PackageManager.NOTIFY_PACKAGE_USE_SERVICE);

            app.forceProcessStateUpTo(ActivityManager.PROCESS_STATE_SERVICE);

            app.forceProcessStateUpTo(ActivityManager.PROCESS_STATE_SERVICE);

            app.thread.scheduleCreateService(r, r.serviceInfo,

            app.thread.scheduleCreateService(r, r.serviceInfo,

                    mAm.compatibilityInfoForPackageLocked(r.serviceInfo.applicationInfo),

                    mAm.compatibilityInfoForPackage(r.serviceInfo.applicationInfo),

                    app.getReportedProcState());

                    app.getReportedProcState());

            r.postNotification();

            r.postNotification();

            created = true;

            created = true;