summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorGarfield Tan <xutan@google.com>2020-09-22 21:53:55 +0000
committerGarfield Tan <xutan@google.com>2020-09-22 21:53:55 +0000
commite97ad446cb24e4724ebaa34ff829ad5ae2b372bc (patch)
treed83a46e8ee27eecc7492600c3b8241965dbbc4b6 /core/java/android
parentc27066ac9f8981ef1fe39870e635205b1ebdfc05 (diff)
Revert "Reland "Use new create/removeInputChannel().""
Revert "Reland "Let InputFlinger create the server InputChannel"" Revert submission 12655292-hide-server-input-channel Reason for revert: b/169173706 Reverted Changes: Iefbfd9313:Reland "Let InputFlinger create the server InputCh... I14837d545:Reland "Use new create/removeInputChannel()." Change-Id: I2e002829ad2f077e1f118d0b09d274002b71afa9
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/InputChannel.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/view/InputChannel.java b/core/java/android/view/InputChannel.java
index f2d3f5ad08bf..e1b042160062 100644
--- a/core/java/android/view/InputChannel.java
+++ b/core/java/android/view/InputChannel.java
@@ -83,7 +83,7 @@ public final class InputChannel implements Parcelable {
*
* @hide
*/
- private void setNativeInputChannel(long nativeChannel) {
+ public void setNativeInputChannel(long nativeChannel) {
if (nativeChannel == 0) {
throw new IllegalArgumentException("Attempting to set native input channel to null.");
}
@@ -148,11 +148,12 @@ public final class InputChannel implements Parcelable {
}
/**
- * Creates a copy of this instance to the outParameter. This is used to pass an input channel
+ * Transfers ownership of the internal state of the input channel to another
+ * instance and invalidates this instance. This is used to pass an input channel
* as an out parameter in a binder call.
* @param other The other input channel instance.
*/
- public void copyTo(InputChannel outParameter) {
+ public void transferTo(InputChannel outParameter) {
if (outParameter == null) {
throw new IllegalArgumentException("outParameter must not be null");
}