Use resizeMode integer instead of resizeable boolean.
Changes activity manager and window manager to use resizeMode
as defined by ActivityInfo#resizeMode instead of a boolean.
Bug: 26774816
Change-Id: I8cef46d9fba6bfdd21df7da63ed5d5330ad03d4b
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index cd5797e..138ff6d 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -2587,9 +2587,9 @@
case SET_TASK_RESIZEABLE_TRANSACTION: {
data.enforceInterface(IActivityManager.descriptor);
- int taskId = data.readInt();
- boolean resizeable = (data.readInt() == 1) ? true : false;
- setTaskResizeable(taskId, resizeable);
+ final int taskId = data.readInt();
+ final int resizeableMode = data.readInt();
+ setTaskResizeable(taskId, resizeableMode);
reply.writeNoException();
return true;
}
@@ -6307,12 +6307,12 @@
}
@Override
- public void setTaskResizeable(int taskId, boolean resizeable) throws RemoteException {
+ public void setTaskResizeable(int taskId, int resizeableMode) throws RemoteException {
Parcel data = Parcel.obtain();
Parcel reply = Parcel.obtain();
data.writeInterfaceToken(IActivityManager.descriptor);
data.writeInt(taskId);
- data.writeInt(resizeable ? 1 : 0);
+ data.writeInt(resizeableMode);
mRemote.transact(SET_TASK_RESIZEABLE_TRANSACTION, data, reply, 0);
reply.readException();
data.recycle();