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

Merge \\"When uninstalling, only kill the requested user.\\" into nyc-dev am: 060d5a0e0a

Browse Source 
am: eaa1c9ae42

Change-Id: Ifb9552c07ed4a055908e8c2e118eec2ff6ae4640
This commit is contained in:
Jeff Sharkey
2016-06-23 18:21:59 +00:00
committed by android-build-merger
parent b76f86c7cf eaa1c9ae42
commit 68106fc9bb
5 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1813,12 +1813,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
return true;
}
case KILL_APPLICATION_WITH_APPID_TRANSACTION: {
case KILL_APPLICATION_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
String pkg = data.readString();
int appid = data.readInt();
int appId = data.readInt();
int userId = data.readInt();
String reason = data.readString();
killApplicationWithAppId(pkg, appid, reason);
killApplication(pkg, appId, userId, reason);
reply.writeNoException();
return true;
}
@@ -5291,15 +5292,16 @@ class ActivityManagerProxy implements IActivityManager
reply.recycle();
}
public void killApplicationWithAppId(String pkg, int appid, String reason)
public void killApplication(String pkg, int appId, int userId, String reason)
throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeString(pkg);
data.writeInt(appid);
data.writeInt(appId);
data.writeInt(userId);
data.writeString(reason);
mRemote.transact(KILL_APPLICATION_WITH_APPID_TRANSACTION, data, reply, 0);
mRemote.transact(KILL_APPLICATION_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();
reply.recycle();

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

@@ -398,7 +398,7 @@ public interface IActivityManager extends IInterface {
public void addPackageDependency(String packageName) throws RemoteException;
public void killApplicationWithAppId(String pkg, int appid, String reason)
public void killApplication(String pkg, int appId, int userId, String reason)
throws RemoteException;
public void closeSystemDialogs(String reason) throws RemoteException;
@@ -852,7 +852,7 @@ public interface IActivityManager extends IInterface {
int GET_UID_FOR_INTENT_SENDER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+92;
int HANDLE_INCOMING_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+93;
int ADD_PACKAGE_DEPENDENCY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+94;
int KILL_APPLICATION_WITH_APPID_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+95;
int KILL_APPLICATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+95;
int CLOSE_SYSTEM_DIALOGS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+96;
int GET_PROCESS_MEMORY_INFO_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+97;
int KILL_APPLICATION_PROCESS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+98;