Merge cherrypicks of ['googleplex-android-review.googlesource.com/31348541',... (986d8762) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Utils.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ import com.android.settings.password.ChooseLockSettingsHelper;
		import com.android.settingslib.widget.ActionBarShadowController;
		import com.android.settingslib.widget.AdaptiveIcon;

		import java.util.Arrays;
		import java.util.Iterator;
		import java.util.List;
		import java.util.Locale;
		@@ -1295,4 +1296,19 @@ public final class Utils extends com.android.settingslib.Utils {
		com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser);
		return dreamsSupported && (!dreamsOnlyEnabledForDockUser \|\| canCurrentUserDream(context));
		}

		/**
		* Returns {@code true} if the supplied package is a protected package. Otherwise, returns
		* {@code false}.
		*
		* @param context the context
		* @param packageName the package name
		*/
		public static boolean isProtectedPackage(
		@NonNull Context context, @NonNull String packageName) {
		final List<String> protectedPackageNames = Arrays.asList(context.getResources()
		.getStringArray(com.android.internal.R.array
		.config_biometric_protected_package_names));
		return protectedPackageNames != null && protectedPackageNames.contains(packageName);
		}
		}

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

+45 −17

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.Utils;
		import com.android.settings.applications.ApplicationFeatureProvider;
		import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
		import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
		import com.android.settings.core.BasePreferenceController;
		import com.android.settings.core.InstrumentedPreferenceFragment;
		@@ -239,12 +240,20 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
		} else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
		if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {
		showDialogInner(ButtonActionDialogFragment.DialogType.DISABLE);
		} else if (mAppEntry.info.enabled) {
		requireAuthAndExecute(() -> {
		mMetricsFeatureProvider.action(
		mActivity,
		SettingsEnums.ACTION_SETTINGS_DISABLE_APP,
		getPackageNameForMetric());
		AsyncTask.execute(new DisableChangerRunnable(mPm,
		mAppEntry.info.packageName,
		PackageManager.COMPONENT_ENABLED_STATE_DEFAULT));
		});
		} else {
		mMetricsFeatureProvider.action(
		mActivity,
		mAppEntry.info.enabled
		? SettingsEnums.ACTION_SETTINGS_DISABLE_APP
		: SettingsEnums.ACTION_SETTINGS_ENABLE_APP,
		SettingsEnums.ACTION_SETTINGS_ENABLE_APP,
		getPackageNameForMetric());
		AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
		PackageManager.COMPONENT_ENABLED_STATE_DEFAULT));
		@@ -288,16 +297,33 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
		}
		}

		/**
		* Runs the given action with restricted lock authentication if it is a protected package.
		*
		* @param action The action to run.
		*/
		private void requireAuthAndExecute(Runnable action) {
		if (Utils.isProtectedPackage(mContext, mAppEntry.info.packageName)) {
		AppInfoDashboardFragment.showLockScreen(mContext, () -> action.run());
		} else {
		action.run();
		}
		}

		public void handleDialogClick(int id) {
		switch (id) {
		case ButtonActionDialogFragment.DialogType.DISABLE:
		requireAuthAndExecute(() -> {
		mMetricsFeatureProvider.action(mActivity,
		SettingsEnums.ACTION_SETTINGS_DISABLE_APP);
		AsyncTask.execute(new DisableChangerRunnable(mPm, mAppEntry.info.packageName,
		PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER));
		});
		break;
		case ButtonActionDialogFragment.DialogType.FORCE_STOP:
		requireAuthAndExecute(() -> {
		forceStopPackage(mAppEntry.info.packageName);
		});
		break;
		}
		}
		@@ -525,6 +551,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp

		@VisibleForTesting
		void uninstallPkg(String packageName, boolean allUsers) {
		requireAuthAndExecute(() -> {
		stopListeningToPackageRemove();
		// Create new intent to launch Uninstaller activity
		Uri packageUri = Uri.parse("package:" + packageName);
		@@ -533,6 +560,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp

		mMetricsFeatureProvider.action(mActivity, SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);
		mFragment.startActivityForResult(uninstallIntent, mRequestUninstall);
		});
		}

		@VisibleForTesting

src/com/android/settings/notification/NotificationAccessConfirmationActivity.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ public class NotificationAccessConfirmationActivity extends Activity
		NLSIntent, /* flags */ 0, mUserId);
		boolean hasNLSIntentFilter = false;
		for (ResolveInfo service : matchedServiceList) {
		if (service.serviceInfo.packageName.equals(mComponentName.getPackageName())) {
		if (service.serviceInfo.getComponentName().equals(mComponentName)) {
		if (!requiredPermission.equals(service.serviceInfo.permission)) {
		Slog.e(LOG_TAG, "Service " + mComponentName + " lacks permission "
		+ requiredPermission);

src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt

+28 −10

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import android.content.pm.PackageManager
		import android.os.UserHandle
		import android.util.Log
		import androidx.compose.runtime.Composable
		import com.android.settings.Utils
		import com.android.settings.applications.appinfo.AppInfoDashboardFragment
		import com.android.settings.overlay.FeatureFactory
		import com.android.settings.spa.app.startUninstallActivity
		import com.android.settingslib.spa.framework.compose.LocalNavController
		@@ -87,6 +89,16 @@ class PackageInfoPresenter(
		}
		}

		private fun requireAuthAndExecute(action: () -> Unit) {
		if (Utils.isProtectedPackage(context, packageName)) {
		AppInfoDashboardFragment.showLockScreen(context) {
		action()
		}
		} else {
		action()
		}
		}

		/** Enables this package. */
		fun enable() {
		logAction(SettingsEnums.ACTION_SETTINGS_ENABLE_APP)
		@@ -101,6 +113,7 @@ class PackageInfoPresenter(
		/** Disables this package. */
		fun disable() {
		logAction(SettingsEnums.ACTION_SETTINGS_DISABLE_APP)
		requireAuthAndExecute {
		coroutineScope.launch(Dispatchers.IO) {
		userPackageManager.setApplicationEnabledSetting(
		packageName, PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER, 0
		@@ -108,12 +121,15 @@ class PackageInfoPresenter(
		reloadPackageInfo()
		}
		}
		}

		/** Starts the uninstallation activity. */
		fun startUninstallActivity(forAllUsers: Boolean = false) {
		logAction(SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP)
		requireAuthAndExecute {
		context.startUninstallActivity(packageName, userHandle, forAllUsers)
		}
		}

		/** Clears this instant app. */
		fun clearInstantApp() {
		@@ -127,12 +143,14 @@ class PackageInfoPresenter(
		/** Force stops this package. */
		fun forceStop() {
		logAction(SettingsEnums.ACTION_APP_FORCE_STOP)
		requireAuthAndExecute {
		coroutineScope.launch(Dispatchers.Default) {
		Log.d(TAG, "Stopping package $packageName")
		context.activityManager.forceStopPackageAsUser(packageName, userId)
		reloadPackageInfo()
		}
		}
		}

		fun logAction(category: Int) {
		metricsFeatureProvider.action(context, category, packageName)

tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ import com.android.settings.R;
		import com.android.settings.SettingsActivity;
		import com.android.settings.core.InstrumentedPreferenceFragment;
		import com.android.settings.testutils.FakeFeatureFactory;
		import com.android.settings.testutils.shadow.ShadowUtils;
		import com.android.settingslib.applications.AppUtils;
		import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
		@@ -81,6 +82,7 @@ import org.robolectric.util.ReflectionHelpers;

		import java.util.Set;

		@Config(shadows = {ShadowUtils.class})
		@RunWith(RobolectricTestRunner.class)
		public class AppButtonsPreferenceControllerTest {

		@@ -164,6 +166,7 @@ public class AppButtonsPreferenceControllerTest {
		@After
		public void tearDown() {
		ShadowAppUtils.reset();
		ShadowUtils.reset();
		}

		@Test