Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90f780ac authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixing the crash when tapping the "Downloaded apps" in Accessibility page." into sc-dev

parents 9f7564c1 652c425a

src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java

+6 −4
Original line number Diff line number Diff line
@@ -78,10 +78,12 @@ public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeature 
        // Settings animated image.

        final int animatedImageRes = arguments.getInt(

                AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES);

        if (animatedImageRes > 0) {

            mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)

                    .authority(mComponentName.getPackageName())

                    .appendPath(String.valueOf(animatedImageRes))

                    .build();

        }



        // Settings html description.

        mHtmlDescription = arguments.getCharSequence(AccessibilitySettings.EXTRA_HTML_DESCRIPTION);

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

+6 −4
Original line number Diff line number Diff line
@@ -396,10 +396,12 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
        // Settings animated image.

        final int animatedImageRes = arguments.getInt(

                AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES);

        if (animatedImageRes > 0) {

            mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)

                    .authority(mComponentName.getPackageName())

                    .appendPath(String.valueOf(animatedImageRes))

                    .build();

        }



        // Get Accessibility service name.

        mPackageName = getAccessibilityServiceInfo().getResolveInfo().loadLabel(