commit 6a935af3789fe7f918aa3cef2b62706987552257
author Rob Carr <racarr@google.com> Fri Dec 04 21:08:54 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 04 21:08:54 2015 +0000
tree 66a080f3d8ead4310b3e33add2822d9add119c72
parent 8294f82562afee6be176c986ff24156aacd32080
parent b948014e3e64805bd196536020394a782edc36fe

Merge "Restore exception behavior of getLocationInWindow."

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index fc347ea..49b21f9 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -18574,13 +18574,13 @@
      *
      * @param location an array of two integers in which to hold the coordinates
      */
-    public void getLocationOnScreen(@Size(2) int[] location) {
-        getLocationInWindow(location);
+    public void getLocationOnScreen(@Size(2) int[] outLocation) {
+        getLocationInWindow(outLocation);
 
         final AttachInfo info = mAttachInfo;
         if (info != null) {
-            location[0] += info.mWindowLeft;
-            location[1] += info.mWindowTop;
+            outLocation[0] += info.mWindowLeft;
+            outLocation[1] += info.mWindowTop;
         }
     }
 
@@ -18591,11 +18591,15 @@
      *
      * @param outWindowSpace an array of two integers in which to hold the coordinates
      */
-    public void getLocationInWindow(@Size(2) int[] outWindowSpace) {
-        outWindowSpace[0] = 0;
-        outWindowSpace[1] = 0;
+    public void getLocationInWindow(@Size(2) int[] outLocation) {
+        if (outLocation == null || outLocation.length < 2) {
+            throw new IllegalArgumentException("outLocation must be an array of two integers");
+        }
 
-        transformFromViewToWindowSpace(outWindowSpace);
+        outLocation[0] = 0;
+        outLocation[1] = 0;
+
+        transformFromViewToWindowSpace(outLocation);
     }
 
     void transformFromViewToWindowSpace(@Size(2) int[] inOutLocation) {