Merge "Reduce cost of a11y services with magnification." into nyc-dev

am: cdaaaaad90

* commit 'cdaaaaad905396e4f0f2ebd9b37240095182d1d7':
  Reduce cost of a11y services with magnification.

Change-Id: Ib93769bbbce508d0eae77cd830d361e5e686de47

core/java/android/accessibilityservice/AccessibilityService.java

@@ -949,7 +949,7 @@ public abstract class AccessibilityService extends Service {
                             mService.mConnectionId);
             if (connection != null) {
                 try {
-                    return connection.getMagnifiedRegion();
+                    return connection.getMagnificationRegion();
                 } catch (RemoteException re) {
                     Log.w(LOG_TAG, "Failed to obtain magnified region", re);
                     re.rethrowFromSystemServer();

core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl

@@ -75,7 +75,7 @@ interface IAccessibilityServiceConnection {
 
     float getMagnificationCenterY();
 
-    Region getMagnifiedRegion();
+    Region getMagnificationRegion();
 
     boolean resetMagnification(boolean animate);