StrictMode: time violations in Binder calls
Change-Id: I5796993dce98be722cf679b78acaf0c9de0ba461
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index 1fe85e6..9a55a6f 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -37,6 +37,7 @@
import android.os.IBinder;
import android.os.Parcel;
import android.os.ServiceManager;
+import android.os.StrictMode;
import android.text.TextUtils;
import android.util.Config;
import android.util.Log;
@@ -1056,8 +1057,8 @@
data.enforceInterface(IActivityManager.descriptor);
IBinder app = data.readStrongBinder();
int violationMask = data.readInt();
- ApplicationErrorReport.CrashInfo ci = new ApplicationErrorReport.CrashInfo(data);
- handleApplicationStrictModeViolation(app, violationMask, ci);
+ StrictMode.ViolationInfo info = new StrictMode.ViolationInfo(data);
+ handleApplicationStrictModeViolation(app, violationMask, info);
reply.writeNoException();
return true;
}
@@ -2571,14 +2572,14 @@
public void handleApplicationStrictModeViolation(IBinder app,
int violationMask,
- ApplicationErrorReport.CrashInfo crashInfo) throws RemoteException
+ StrictMode.ViolationInfo info) throws RemoteException
{
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeStrongBinder(app);
data.writeInt(violationMask);
- crashInfo.writeToParcel(data, 0);
+ info.writeToParcel(data, 0);
mRemote.transact(HANDLE_APPLICATION_STRICT_MODE_VIOLATION_TRANSACTION, data, reply, 0);
reply.readException();
reply.recycle();