summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-03-02 22:44:55 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-02 22:44:55 -0800
commit63e1cea248cde3db3e89f49e5fcc3458aa87951e (patch)
tree93080ab6905f8b614c9e49219aca7d77a87e25fb /core/java/android/app
parentef83a3d591cbeae8f87557b0857eeedffa762e2a (diff)
parent648251710162cdaf7371012a1cbb79b9bc5bc0e4 (diff)
downloadframeworks_base-63e1cea248cde3db3e89f49e5fcc3458aa87951e.zip
frameworks_base-63e1cea248cde3db3e89f49e5fcc3458aa87951e.tar.gz
frameworks_base-63e1cea248cde3db3e89f49e5fcc3458aa87951e.tar.bz2
Merge "Fix issue #3485923: Gmail crash"
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/ActivityManagerNative.java6
-rw-r--r--core/java/android/app/IActivityManager.java2
2 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index d3d3792..6426635 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -1020,7 +1020,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
data.enforceInterface(IActivityManager.descriptor);
int[] pids = data.createIntArray();
String reason = data.readString();
- boolean res = killPids(pids, reason);
+ boolean secure = data.readInt() != 0;
+ boolean res = killPids(pids, reason, secure);
reply.writeNoException();
reply.writeInt(res ? 1 : 0);
return true;
@@ -2636,12 +2637,13 @@ class ActivityManagerProxy implements IActivityManager
mRemote.transact(NOTE_WAKEUP_ALARM_TRANSACTION, data, null, 0);
data.recycle();
}
- public boolean killPids(int[] pids, String reason) throws RemoteException {
+ public boolean killPids(int[] pids, String reason, boolean secure) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeIntArray(pids);
data.writeString(reason);
+ data.writeInt(secure ? 1 : 0);
mRemote.transact(KILL_PIDS_TRANSACTION, data, reply, 0);
boolean res = reply.readInt() != 0;
data.recycle();
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index f42e8fb..61e6fc8 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -250,7 +250,7 @@ public interface IActivityManager extends IInterface {
public void noteWakeupAlarm(IIntentSender sender) throws RemoteException;
- public boolean killPids(int[] pids, String reason) throws RemoteException;
+ public boolean killPids(int[] pids, String reason, boolean secure) throws RemoteException;
// Special low-level communication with activity manager.
public void startRunning(String pkg, String cls, String action,