am 4d0b9aba: Merge "Fix clearApplicationUserData() to allow a null observer" into klp-dev

* commit '4d0b9abae70bdf9a083c3ff7c92088e47637c57a':
  Fix clearApplicationUserData() to allow a null observer
This commit is contained in:
Christopher Tate
2013-09-09 14:29:45 -07:00
committed by Android Git Automerger

View File

@@ -3377,7 +3377,7 @@ class ActivityManagerProxy implements IActivityManager
Parcel reply = Parcel.obtain(); Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor); data.writeInterfaceToken(IActivityManager.descriptor);
data.writeString(packageName); data.writeString(packageName);
data.writeStrongBinder(observer.asBinder()); data.writeStrongBinder((observer != null) ? observer.asBinder() : null);
data.writeInt(userId); data.writeInt(userId);
mRemote.transact(CLEAR_APP_DATA_TRANSACTION, data, reply, 0); mRemote.transact(CLEAR_APP_DATA_TRANSACTION, data, reply, 0);
reply.readException(); reply.readException();