From f532a2351b836fbfab756323a87de5e1bb5f70ea Mon Sep 17 00:00:00 2001
From: Peter_Liang <peterliang@google.com>
Date: Thu, 20 Feb 2020 10:37:52 +0800
Subject: [PATCH] Revise the parameter of public API for allow rich content.

Change "loadAnimatedImage(PackageManager)" to "loadAnimatedImage(Context)"

Bug: 142532186
Test: manual test
Change-Id: I3a6f61fbcd06e73d17cc20ea60effa6e84f0db7b
---
 api/current.txt                                                | 2 +-
 .../android/accessibilityservice/AccessibilityServiceInfo.java | 3 ++-
 .../accessibilityservice/AccessibilityShortcutInfo.java        | 3 ++-
 .../accessibilityservice/AccessibilityShortcutInfoTest.java    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index c6bb79f5bf268..137ea435ab7d9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2991,7 +2991,7 @@ package android.accessibilityservice {
     method public int getNonInteractiveUiTimeoutMillis();
     method public android.content.pm.ResolveInfo getResolveInfo();
     method public String getSettingsActivityName();
-    method @Nullable public android.graphics.drawable.Drawable loadAnimatedImage(@NonNull android.content.pm.PackageManager);
+    method @Nullable public android.graphics.drawable.Drawable loadAnimatedImage(@NonNull android.content.Context);
     method public String loadDescription(android.content.pm.PackageManager);
     method @Nullable public String loadHtmlDescription(@NonNull android.content.pm.PackageManager);
     method public CharSequence loadSummary(android.content.pm.PackageManager);
diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
index c37328454c7d4..3b0667d1e377d 100644
--- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
+++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
@@ -803,11 +803,12 @@ public class AccessibilityServiceInfo implements Parcelable {
      * @return The animated image drawable.
      */
     @Nullable
-    public Drawable loadAnimatedImage(@NonNull PackageManager packageManager)  {
+    public Drawable loadAnimatedImage(@NonNull Context context)  {
         if (mAnimatedImageRes == /* invalid */ 0) {
             return null;
         }
 
+        final PackageManager packageManager = context.getPackageManager();
         final String packageName = mComponentName.getPackageName();
         final ApplicationInfo applicationInfo = mResolveInfo.serviceInfo.applicationInfo;
 
diff --git a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java
index d537ce1253dc2..62096792d764d 100644
--- a/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java
+++ b/core/java/android/accessibilityservice/AccessibilityShortcutInfo.java
@@ -208,11 +208,12 @@ public final class AccessibilityShortcutInfo {
      * @return The animated image drawable.
      */
     @Nullable
-    public Drawable loadAnimatedImage(@NonNull PackageManager packageManager) {
+    public Drawable loadAnimatedImage(@NonNull Context context) {
         if (mAnimatedImageRes == /* invalid */ 0) {
             return null;
         }
 
+        final PackageManager packageManager = context.getPackageManager();
         final String packageName = mComponentName.getPackageName();
         final ApplicationInfo applicationInfo = mActivityInfo.applicationInfo;
 
diff --git a/core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java b/core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java
index 9f0af60f33b7b..f0e70a53b5726 100644
--- a/core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java
+++ b/core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java
@@ -92,7 +92,7 @@ public class AccessibilityShortcutInfoTest {
     @Test
     public void testLoadAnimatedImage() {
         assertNotNull("Can't find animated image",
-                mShortcutInfo.loadAnimatedImage(mPackageManager));
+                mShortcutInfo.loadAnimatedImage(mTargetContext));
     }
 
     @Test