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

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

Merge "Remove the package name restriction of ACTION_UNINSTALL_PACKAGE" into main

parents 83da3f00 5d82f6a6

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

+1 −2
Original line number Diff line number Diff line
@@ -443,8 +443,7 @@ 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)

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

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

        return uninstallIntent;

    }

src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java

+0 −2
Original line number Diff line number Diff line
@@ -539,8 +539,6 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
        // Create new intent to launch Uninstaller activity

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

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

        uninstallIntent.setPackage(mContext.getString(

                R.string.config_package_installer_package_name));

        uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);



        mMetricsFeatureProvider.action(mActivity, SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);

src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -642,7 +642,6 @@ public class AppInfoDashboardFragment extends DashboardFragment 
        // Create new intent to launch Uninstaller activity

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

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

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

        uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);

        mMetricsFeatureProvider.action(

                getContext(), SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);

src/com/android/settings/applications/manageapplications/CloneBackend.java

+0 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.util.Log; 


import androidx.fragment.app.FragmentActivity;



import com.android.settings.R;

import com.android.settings.Utils;



import java.util.HashSet;
@@ -79,8 +78,6 @@ public class CloneBackend { 
        // Create new intent to launch Uninstaller activity.

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

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

        uninstallIntent.setPackage(mContext.getString(

                R.string.config_package_installer_package_name));

        uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);

        uninstallIntent.putExtra(Intent.EXTRA_USER, UserHandle.of(mCloneUserId));

        // Trigger uninstall as clone user.

src/com/android/settings/spa/app/AppUtil.kt

+0 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Context 
import android.content.Intent

import android.net.Uri

import android.os.UserHandle

import com.android.settings.R



/**

 * Based on PackageManagerService design, and it looks like the suggested replacement in the
@@ -37,7 +36,6 @@ fun Context.startUninstallActivity( 
    val packageUri = Uri.parse("package:$packageName")



    val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri).apply {

        setPackage(getString(R.string.config_package_installer_package_name))

        putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, forAllUsers)

    }

    startActivityAsUser(intent, userHandle)