From 76ee08efb5a843c269a86c9c5687b683de1a95de Mon Sep 17 00:00:00 2001
From: mincheli <mincheli@google.com>
Date: Fri, 25 Mar 2022 15:17:48 +0800
Subject: [PATCH] Updates the doc for FEATURE_WINDOW_MAGNIFICATION

If this feature is not supported,
1. Settings should hide window magnification settings.
2. Magnification mode settings should fallback to.
  full-screen settings.

Bug: 225086379
Test: none
Change-Id: I3248034d25eb88136bda1874092319d4702be455
---
 .../accessibilityservice/MagnificationConfig.java   | 13 ++++++++-----
 core/java/android/content/pm/PackageManager.java    |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/java/android/accessibilityservice/MagnificationConfig.java b/core/java/android/accessibilityservice/MagnificationConfig.java
index 74c91d6097c31..ddafb224a5cdf 100644
--- a/core/java/android/accessibilityservice/MagnificationConfig.java
+++ b/core/java/android/accessibilityservice/MagnificationConfig.java
@@ -42,9 +42,9 @@ import java.lang.annotation.RetentionPolicy;
  * </p>
  *
  * <p>
- * When the magnification config uses {@link #MAGNIFICATION_MODE_WINDOW}.
- * {@link AccessibilityService} will be able to control the activated window magnifier
- * on the display.
+ * When the magnification config uses {@link #MAGNIFICATION_MODE_WINDOW} and the platform
+ * supports {@link android.content.pm.PackageManager#FEATURE_WINDOW_MAGNIFICATION} feature.
+ * {@link AccessibilityService} will be able to control window magnifier on the display.
  * </p>
  *
  * <p>
@@ -57,9 +57,12 @@ public final class MagnificationConfig implements Parcelable {
 
     /** The controlling magnification mode. It controls the activated magnifier. */
     public static final int MAGNIFICATION_MODE_DEFAULT = 0;
-    /** The controlling magnification mode. It controls fullscreen magnifier. */
+    /** The controlling magnification mode. It controls full-screen magnifier. */
     public static final int MAGNIFICATION_MODE_FULLSCREEN = 1;
-    /** The controlling magnification mode. It controls window magnifier. */
+    /**
+     * The controlling magnification mode. It is valid if the platform supports
+     * {@link android.content.pm.PackageManager#FEATURE_WINDOW_MAGNIFICATION} feature.
+     */
     public static final int MAGNIFICATION_MODE_WINDOW = 2;
 
     /** @hide */
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 227ac1a028906..a90f6d625c514 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -4188,6 +4188,8 @@ public abstract class PackageManager {
     /**
      * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device
      * supports window magnification.
+     *
+     * @see android.accessibilityservice.MagnificationConfig#MAGNIFICATION_MODE_WINDOW
      */
     @SdkConstant(SdkConstantType.FEATURE)
     public static final String FEATURE_WINDOW_MAGNIFICATION =