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

Commit d2b586c9 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "[Safer intents] Accessibility" into main

parents 1908551c d7853979

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

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ public class RTTSettingPreferenceController extends BasePreferenceController { 
        mDialerPackage = mContext.getString(R.string.config_rtt_setting_package_name);

        mPackageManager = mContext.getPackageManager();

        mCarrierConfigManager = mContext.getSystemService(CarrierConfigManager.class);

        mRTTIntent = new Intent(context.getString(R.string.config_rtt_setting_intent_action));

        mRTTIntent = new Intent(context.getString(R.string.config_rtt_setting_intent_action))

                .setPackage(mDialerPackage);

        Log.d(TAG, "init controller");

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -443,7 +443,8 @@ public class ToggleAccessibilityServicePreferenceFragment extends 
        final ApplicationInfo appInfo =

                a11yServiceInfo.getResolveInfo().serviceInfo.applicationInfo;

        final Uri packageUri = Uri.parse("package:" + appInfo.packageName);

        final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri);

        final Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri)

                .setPackage(getString(R.string.config_package_installer_package_name));

        return uninstallIntent;

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -570,6 +570,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment 
        }



        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);

        intent.setPackage(getContext().getPackageName());

        intent.setData(Uri.parse("package:" + packageName));



        final Preference appInfoPreference = new Preference(getPrefContext());