Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revise the parameter of public API for allow rich content.

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

Bug: 142532186
Test: manual test
Change-Id: I3a6f61fbcd06e73d17cc20ea60effa6e84f0db7b
This commit is contained in:
Peter_Liang
2020-02-20 10:37:52 +08:00
committed by PETER LIANG
parent c54b3fad76
commit f532a2351b
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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);

3
core/java/android/accessibilityservice/AccessibilityServiceInfo.java
View File

@@ -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;

3
core/java/android/accessibilityservice/AccessibilityShortcutInfo.java
View File

@@ -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;

2
core/tests/coretests/src/android/accessibilityservice/AccessibilityShortcutInfoTest.java
View File

@@ -92,7 +92,7 @@ public class AccessibilityShortcutInfoTest {
@Test
public void testLoadAnimatedImage() {
assertNotNull("Can't find animated image",
mShortcutInfo.loadAnimatedImage(mPackageManager));
mShortcutInfo.loadAnimatedImage(mTargetContext));
}
@Test