Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 00032442: am a3590bff: am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev

Browse Source 
* commit '000324423f16362cd14b805af801a4ea3dfd8cd0':
  Adding am send-trim-memory command
This commit is contained in:
Stefan Kuhne
2015-06-06 00:15:56 +00:00
committed by Android Git Automerger
parent 1e555b5a9b 000324423f
commit dd335a119f
5 changed files with 224 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
core/java/android/app/ActivityManager.java
View File

@@ -462,7 +462,7 @@ public class ActivityManager {
public int getMemoryClass() {
return staticGetMemoryClass();
}
/** @hide */
static public int staticGetMemoryClass() {
// Really brain dead right now -- just take this from the configured
@@ -473,7 +473,7 @@ public class ActivityManager {
}
return staticGetLargeMemoryClass();
}
/**
* Return the approximate per-application memory class of the current
* device when an application is running with a large heap. This is the
@@ -490,7 +490,7 @@ public class ActivityManager {
public int getLargeMemoryClass() {
return staticGetLargeMemoryClass();
}
/** @hide */
static public int staticGetLargeMemoryClass() {
// Really brain dead right now -- just take this from the configured
@@ -809,7 +809,7 @@ public class ActivityManager {
* The true identifier of this task, valid even if it is not running.
*/
public int persistentId;
/**
* The original Intent used to launch the task. You can use this
* Intent to re-launch the task (if it is no longer running) or bring
@@ -1014,7 +1014,7 @@ public class ActivityManager {
* user has started and the maximum number the system can remember.
* @param flags Information about what to return. May be any combination
* of {@link #RECENT_WITH_EXCLUDED} and {@link #RECENT_IGNORE_UNAVAILABLE}.
*
*
* @return Returns a list of RecentTaskInfo records describing each of
* the recent tasks.
*/
@@ -1146,7 +1146,7 @@ public class ActivityManager {
numActivities = source.readInt();
numRunning = source.readInt();
}
public static final Creator<RunningTaskInfo> CREATOR = new Creator<RunningTaskInfo>() {
public RunningTaskInfo createFromParcel(Parcel source) {
return new RunningTaskInfo(source);
@@ -1469,100 +1469,100 @@ public class ActivityManager {
* If non-zero, this is the process the service is running in.
*/
public int pid;
/**
* The UID that owns this service.
*/
public int uid;
/**
* The name of the process this service runs in.
*/
public String process;
/**
* Set to true if the service has asked to run as a foreground process.
*/
public boolean foreground;
/**
* The time when the service was first made active, either by someone
* starting or binding to it. This
* is in units of {@link android.os.SystemClock#elapsedRealtime()}.
*/
public long activeSince;
/**
* Set to true if this service has been explicitly started.
*/
public boolean started;
/**
* Number of clients connected to the service.
*/
public int clientCount;
/**
* Number of times the service's process has crashed while the service
* is running.
*/
public int crashCount;
/**
* The time when there was last activity in the service (either
* explicit requests to start it or clients binding to it). This
* is in units of {@link android.os.SystemClock#uptimeMillis()}.
*/
public long lastActivityTime;
/**
* If non-zero, this service is not currently running, but scheduled to
* restart at the given time.
*/
public long restarting;
/**
* Bit for {@link #flags}: set if this service has been
* explicitly started.
*/
public static final int FLAG_STARTED = 1<<0;
/**
* Bit for {@link #flags}: set if the service has asked to
* run as a foreground process.
*/
public static final int FLAG_FOREGROUND = 1<<1;
/**
* Bit for {@link #flags): set if the service is running in a
* core system process.
*/
public static final int FLAG_SYSTEM_PROCESS = 1<<2;
/**
* Bit for {@link #flags): set if the service is running in a
* persistent process.
*/
public static final int FLAG_PERSISTENT_PROCESS = 1<<3;
/**
* Running flags.
*/
public int flags;
/**
* For special services that are bound to by system code, this is
* the package that holds the binding.
*/
public String clientPackage;
/**
* For special services that are bound to by system code, this is
* a string resource providing a user-visible label for who the
* client is.
*/
public int clientLabel;
public RunningServiceInfo() {
}
@@ -1603,7 +1603,7 @@ public class ActivityManager {
clientPackage = source.readString();
clientLabel = source.readInt();
}
public static final Creator<RunningServiceInfo> CREATOR = new Creator<RunningServiceInfo>() {
public RunningServiceInfo createFromParcel(Parcel source) {
return new RunningServiceInfo(source);
@@ -1627,7 +1627,7 @@ public class ActivityManager {
* @param maxNum The maximum number of entries to return in the list. The
* actual number returned may be smaller, depending on how many services
* are running.
*
*
* @return Returns a list of RunningServiceInfo records describing each of
* the running tasks.
*/
@@ -1641,7 +1641,7 @@ public class ActivityManager {
return null;
}
}
/**
* Returns a PendingIntent you can start to show a control panel for the
* given running service. If the service does not have a control panel,
@@ -1657,7 +1657,7 @@ public class ActivityManager {
return null;
}
}
/**
* Information you can retrieve about the available memory through
* {@link ActivityManager#getMemoryInfo}.
@@ -1684,7 +1684,7 @@ public class ActivityManager {
* processes.
*/
public long threshold;
/**
* Set to true if the system considers itself to currently be in a low
* memory situation.
@@ -1717,7 +1717,7 @@ public class ActivityManager {
dest.writeLong(visibleAppThreshold);
dest.writeLong(foregroundAppThreshold);
}
public void readFromParcel(Parcel source) {
availMem = source.readLong();
totalMem = source.readLong();
@@ -1841,7 +1841,7 @@ public class ActivityManager {
*/
public boolean clearApplicationUserData(String packageName, IPackageDataObserver observer) {
try {
return ActivityManagerNative.getDefault().clearApplicationUserData(packageName,
return ActivityManagerNative.getDefault().clearApplicationUserData(packageName,
observer, UserHandle.myUserId());
} catch (RemoteException e) {
return false;
@@ -1882,7 +1882,7 @@ public class ActivityManager {
* The process name in which the crash or error occurred.
*/
public String processName;
/**
* The pid of this process; 0 if none
*/
@@ -1894,7 +1894,7 @@ public class ActivityManager {
* the same uid).
*/
public int uid;
/**
* The activity name associated with the error, if known. May be null.
*/
@@ -1950,8 +1950,8 @@ public class ActivityManager {
longMsg = source.readString();
stackTrace = source.readString();
}
public static final Creator<ProcessErrorStateInfo> CREATOR =
public static final Creator<ProcessErrorStateInfo> CREATOR =
new Creator<ProcessErrorStateInfo>() {
public ProcessErrorStateInfo createFromParcel(Parcel source) {
return new ProcessErrorStateInfo(source);
@@ -1965,11 +1965,11 @@ public class ActivityManager {
readFromParcel(source);
}
}
/**
* Returns a list of any processes that are currently in an error condition. The result
* Returns a list of any processes that are currently in an error condition. The result
* will be null if all processes are running properly at this time.
*
*
* @return Returns a list of ProcessErrorStateInfo records, or null if there are no
* current error conditions (it will not return an empty list). This list ordering is not
* specified.
@@ -1985,7 +1985,7 @@ public class ActivityManager {
/**
* Information you can retrieve about a running process.
*/
public static class RunningAppProcessInfo implements Parcelable {
public static class RunningAppProcessInfo implements Parcelable {
/**
* The name of the process that this object is associated with
*/
@@ -1995,17 +1995,17 @@ public class ActivityManager {
* The pid of this process; 0 if none
*/
public int pid;
/**
* The user id of this process.
*/
public int uid;
/**
* All packages that have been loaded into the process.
*/
public String pkgList[];
/**
* Constant for {@link #flags}: this is an app that is unable to
* correctly save its state when going to the background,
@@ -2013,7 +2013,7 @@ public class ActivityManager {
* @hide
*/
public static final int FLAG_CANT_SAVE_STATE = 1<<0;
/**
* Constant for {@link #flags}: this process is associated with a
* persistent system app.
@@ -2048,7 +2048,7 @@ public class ActivityManager {
* that the user is interacting with.
*/
public static final int IMPORTANCE_FOREGROUND = 100;
/**
* Constant for {@link #importance}: This process is running a foreground
* service, for example to perform music playback even while the user is
@@ -2075,13 +2075,13 @@ public class ActivityManager {
* other services under the system's control that it inconsiders important.
*/
public static final int IMPORTANCE_VISIBLE = 200;
/**
* Constant for {@link #importance}: This process is not something the user
* is directly aware of, but is otherwise perceptable to them to some degree.
*/
public static final int IMPORTANCE_PERCEPTIBLE = 130;
/**
* Constant for {@link #importance}: This process is running an
* application that can not save its state, and thus can't be killed
@@ -2089,7 +2089,7 @@ public class ActivityManager {
* @hide
*/
public static final int IMPORTANCE_CANT_SAVE_STATE = 170;
/**
* Constant for {@link #importance}: This process is contains services
* that should remain running. These are background services apps have
@@ -2098,13 +2098,13 @@ public class ActivityManager {
* stay running as long as they want to).
*/
public static final int IMPORTANCE_SERVICE = 300;
/**
* Constant for {@link #importance}: This process process contains
* background code that is expendable.
*/
public static final int IMPORTANCE_BACKGROUND = 400;
/**
* Constant for {@link #importance}: This process is empty of any
* actively running code.
@@ -2148,7 +2148,7 @@ public class ActivityManager {
* smaller than "less important" values.
*/
public int importance;
/**
* An additional ordering within a particular {@link #importance}
* category, providing finer-grained information about the relative
@@ -2165,7 +2165,7 @@ public class ActivityManager {
* been specified for the reason for this level.
*/
public static final int REASON_UNKNOWN = 0;
/**
* Constant for {@link #importanceReasonCode}: one of the application's
* content providers is being used by another process. The pid of
@@ -2174,7 +2174,7 @@ public class ActivityManager {
* {@link #importanceReasonComponent}.
*/
public static final int REASON_PROVIDER_IN_USE = 1;
/**
* Constant for {@link #importanceReasonCode}: one of the application's
* content providers is being used by another process. The pid of
@@ -2183,25 +2183,25 @@ public class ActivityManager {
* {@link #importanceReasonComponent}.
*/
public static final int REASON_SERVICE_IN_USE = 2;
/**
* The reason for {@link #importance}, if any.
*/
public int importanceReasonCode;
/**
* For the specified values of {@link #importanceReasonCode}, this
* is the process ID of the other process that is a client of this
* process. This will be 0 if no other process is using this one.
*/
public int importanceReasonPid;
/**
* For the specified values of {@link #importanceReasonCode}, this
* is the name of the component that is being used in this process.
*/
public ComponentName importanceReasonComponent;
/**
* When {@link #importanceReasonPid} is non-0, this is the importance
* of the other pid. @hide
@@ -2219,7 +2219,7 @@ public class ActivityManager {
importanceReasonCode = REASON_UNKNOWN;
processState = PROCESS_STATE_IMPORTANT_FOREGROUND;
}
public RunningAppProcessInfo(String pProcessName, int pPid, String pArr[]) {
processName = pProcessName;
pid = pPid;
@@ -2262,7 +2262,7 @@ public class ActivityManager {
processState = source.readInt();
}
public static final Creator<RunningAppProcessInfo> CREATOR =
public static final Creator<RunningAppProcessInfo> CREATOR =
new Creator<RunningAppProcessInfo>() {
public RunningAppProcessInfo createFromParcel(Parcel source) {
return new RunningAppProcessInfo(source);
@@ -2276,7 +2276,7 @@ public class ActivityManager {
readFromParcel(source);
}
}
/**
* Returns a list of application processes installed on external media
* that are running on the device.
@@ -2296,6 +2296,23 @@ public class ActivityManager {
}
}
/**
* Sets the memory trim mode for a process and schedules a memory trim operation.
*
* <p><b>Note: this method is only intended for testing framework.</b></p>
*
* @return Returns true if successful.
* @hide
*/
public boolean setProcessMemoryTrimLevel(String process, int userId, int level) {
try {
return ActivityManagerNative.getDefault().setProcessMemoryTrimLevel(process, userId,
level);
} catch (RemoteException e) {
return false;
}
}
/**
* Returns a list of application processes that are running on the device.
*
@@ -2368,7 +2385,7 @@ public class ActivityManager {
return null;
}
}
/**
* @deprecated This is now just a wrapper for
* {@link #killBackgroundProcesses(String)}; the previous behavior here
@@ -2380,17 +2397,17 @@ public class ActivityManager {
public void restartPackage(String packageName) {
killBackgroundProcesses(packageName);
}
/**
* Have the system immediately kill all background processes associated
* with the given package. This is the same as the kernel killing those
* processes to reclaim memory; the system will take care of restarting
* these processes in the future as needed.
*
*
* <p>You must hold the permission
* {@link android.Manifest.permission#KILL_BACKGROUND_PROCESSES} to be able to
* call this method.
*
*
* @param packageName The name of the package whose processes are to
* be killed.
*/
@@ -2426,14 +2443,14 @@ public class ActivityManager {
* removed, etc. In addition, a {@link Intent#ACTION_PACKAGE_RESTARTED}
* broadcast will be sent, so that any of its registered alarms can
* be stopped, notifications removed, etc.
*
*
* <p>You must hold the permission
* {@link android.Manifest.permission#FORCE_STOP_PACKAGES} to be able to
* call this method.
*
*
* @param packageName The name of the package to be stopped.
* @param userId The user for which the running package is to be stopped.
*
*
* @hide This is not available to third party applications due to
* it allowing them to break other applications by stopping their
* services, removing their alarms, etc.
@@ -2697,7 +2714,7 @@ public class ActivityManager {
}
/**
* @param userid the user's id. Zero indicates the default user
* @param userid the user's id. Zero indicates the default user.
* @hide
*/
public boolean switchUser(int userid) {

70
core/java/android/app/ActivityManagerNative.java
View File

@@ -1548,21 +1548,21 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeInt(res ? 1 : 0);
return true;
}
case STOP_APP_SWITCHES_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
stopAppSwitches();
reply.writeNoException();
return true;
}
case RESUME_APP_SWITCHES_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
resumeAppSwitches();
reply.writeNoException();
return true;
}
case PEEK_SERVICE_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
Intent service = Intent.CREATOR.createFromParcel(data);
@@ -1572,7 +1572,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeStrongBinder(binder);
return true;
}
case START_BACKUP_AGENT_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
ApplicationInfo info = ApplicationInfo.CREATOR.createFromParcel(data);
@@ -1625,7 +1625,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeNoException();
return true;
}
case GET_PROCESS_MEMORY_INFO_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
int[] pids = data.createIntArray();
@@ -1643,7 +1643,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeNoException();
return true;
}
case OVERRIDE_PENDING_TRANSITION_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
IBinder token = data.readStrongBinder();
@@ -1654,7 +1654,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeNoException();
return true;
}
case IS_USER_A_MONKEY_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
boolean areThey = isUserAMonkey();
@@ -1662,7 +1662,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeInt(areThey ? 1 : 0);
return true;
}
case SET_USER_IS_MONKEY_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
final boolean monkey = (data.readInt() == 1);
@@ -1738,7 +1738,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeNoException();
return true;
}
case IS_TOP_ACTIVITY_IMMERSIVE_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
boolean isit = isTopActivityImmersive();
@@ -1890,7 +1890,7 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeNoException();
return true;
}
case SWITCH_USER_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
int userid = data.readInt();
@@ -2550,6 +2550,17 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
reply.writeInt(res);
return true;
}
case SET_PROCESS_MEMORY_TRIM_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
String process = data.readString();
int userId = data.readInt();
int level = data.readInt();
boolean res = setProcessMemoryTrimLevel(process, userId, level);
reply.writeNoException();
reply.writeInt(res ? 1 : 0);
return true;
}
}
return super.onTransact(code, data, reply, flags);
@@ -3621,7 +3632,7 @@ class ActivityManagerProxy implements IActivityManager
reply.recycle();
return res;
}
public ComponentName startService(IApplicationThread caller, Intent service,
String resolvedType, int userId) throws RemoteException
{
@@ -3724,7 +3735,7 @@ class ActivityManagerProxy implements IActivityManager
reply.recycle();
return res;
}
public void publishService(IBinder token,
Intent intent, IBinder service) throws RemoteException {
Parcel data = Parcel.obtain();
@@ -3767,7 +3778,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
reply.recycle();
}
public IBinder peekService(Intent service, String resolvedType) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -4457,7 +4468,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
reply.recycle();
}
public void getMyMemoryState(ActivityManager.RunningAppProcessInfo outInfo)
throws RemoteException
{
@@ -4521,7 +4532,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
return res;
}
public void stopAppSwitches() throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -4531,7 +4542,7 @@ class ActivityManagerProxy implements IActivityManager
reply.recycle();
data.recycle();
}
public void resumeAppSwitches() throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -4566,7 +4577,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
reply.recycle();
}
public void closeSystemDialogs(String reason) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -4577,7 +4588,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
reply.recycle();
}
public Debug.MemoryInfo[] getProcessMemoryInfo(int[] pids)
throws RemoteException {
Parcel data = Parcel.obtain();
@@ -4603,7 +4614,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
reply.recycle();
}
public void overridePendingTransition(IBinder token, String packageName,
int enterAnim, int exitAnim) throws RemoteException {
Parcel data = Parcel.obtain();
@@ -4618,7 +4629,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
reply.recycle();
}
public boolean isUserAMonkey() throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
@@ -4874,7 +4885,7 @@ class ActivityManagerProxy implements IActivityManager
data.recycle();
return res;
}
public int startActivities(IApplicationThread caller, String callingPackage,
Intent[] intents, String[] resolvedTypes, IBinder resultTo,
Bundle options, int userId) throws RemoteException {
@@ -5882,5 +5893,22 @@ class ActivityManagerProxy implements IActivityManager
return res;
}
@Override
public boolean setProcessMemoryTrimLevel(String process, int userId, int level)
throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeString(process);
data.writeInt(userId);
data.writeInt(level);
mRemote.transact(SET_PROCESS_MEMORY_TRIM_TRANSACTION, data, reply, 0);
reply.readException();
int res = reply.readInt();
data.recycle();
reply.recycle();
return res != 0;
}
private IBinder mRemote;
}

16
core/java/android/app/IActivityManager.java
View File

@@ -242,14 +242,14 @@ public interface IActivityManager extends IInterface {
public void showWaitingForDebugger(IApplicationThread who, boolean waiting)
throws RemoteException;
public void getMemoryInfo(ActivityManager.MemoryInfo outInfo) throws RemoteException;
public void killBackgroundProcesses(final String packageName, int userId)
throws RemoteException;
public void killAllBackgroundProcesses() throws RemoteException;
public void forceStopPackage(final String packageName, int userId) throws RemoteException;
// Note: probably don't want to allow applications access to these.
public void setLockScreenShown(boolean shown) throws RemoteException;
@@ -263,7 +263,7 @@ public interface IActivityManager extends IInterface {
throws RemoteException;
public void enterSafeMode() throws RemoteException;
public void noteWakeupAlarm(IIntentSender sender, int sourceUid, String sourcePkg, String tag)
throws RemoteException;
public void noteAlarmStart(IIntentSender sender, int sourceUid, String tag)
@@ -318,9 +318,9 @@ public interface IActivityManager extends IInterface {
public void killApplicationWithAppId(String pkg, int appid, String reason)
throws RemoteException;
public void closeSystemDialogs(String reason) throws RemoteException;
public Debug.MemoryInfo[] getProcessMemoryInfo(int[] pids)
throws RemoteException;
@@ -507,6 +507,9 @@ public interface IActivityManager extends IInterface {
public int getPackageProcessState(String packageName) throws RemoteException;
public boolean setProcessMemoryTrimLevel(String process, int uid, int level)
throws RemoteException;
/*
* Private non-Binder interfaces
*/
@@ -792,6 +795,7 @@ public interface IActivityManager extends IInterface {
// Available
int GET_ACTIVITY_DISPLAY_ID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+184;
int DELETE_ACTIVITY_CONTAINER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+185;
int SET_PROCESS_MEMORY_TRIM_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+186;
// Start of L transactions