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

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

Merge "[Safer intents] Applications" into main

parents ea5dbf68 071dfe86

res/xml/apps.xml

+3 −1
Original line number Diff line number Diff line
@@ -72,7 +72,9 @@ 
        <extra

            android:name="classname"

            android:value="com.android.settings.Settings$ClonedAppsListActivity"/>

        <intent android:action="android.settings.MANAGE_CLONED_APPS_SETTINGS"/>

        <intent

            android:action="android.settings.MANAGE_CLONED_APPS_SETTINGS"

            android:targetPackage="${applicationId}"/>

    </Preference>



    <PreferenceCategory

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

+3 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
        } else {

            Intent intent = new Intent(Intent.ACTION_QUERY_PACKAGE_RESTART,

                    Uri.fromParts("package", mAppEntry.info.packageName, null));

            intent.setPackage("android");

            intent.putExtra(Intent.EXTRA_PACKAGES, new String[]{mAppEntry.info.packageName});

            intent.putExtra(Intent.EXTRA_UID, mAppEntry.info.uid);

            intent.putExtra(Intent.EXTRA_USER_HANDLE, UserHandle.getUserId(mAppEntry.info.uid));
@@ -538,6 +539,8 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -642,6 +642,7 @@ 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/appinfo/TimeSpentInAppPreferenceController.java

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class TimeSpentInAppPreferenceController extends LiveDataController { 
    public void setPackageName(String packageName) {

        mPackageName = packageName;

        mIntent = new Intent(SEE_TIME_IN_APP_TEMPLATE)

                .setPackage(mPackageManager.getWellbeingPackageName())

                .putExtra(Intent.EXTRA_PACKAGE_NAME, mPackageName);

    }

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

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


import androidx.fragment.app.FragmentActivity;



import com.android.settings.R;

import com.android.settings.Utils;



import java.util.HashSet;
@@ -78,6 +79,8 @@ 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.