Merge branch '3456-t-june' into 'v3.0-t' (da90064a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Utils.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,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;
		@@ -1254,4 +1255,19 @@ public final class Utils extends com.android.settingslib.Utils {
		}
		return input;
		}

		/**
		* 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

+47 −19

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;
		@@ -249,12 +250,20 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
		} else {
		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));
		@@ -303,13 +312,28 @@ 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.SPECIAL_DISABLE:
		mMetricsFeatureProvider.action(mActivity,
		@@ -317,7 +341,9 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
		uninstallPkg(mAppEntry.info.packageName, false, true);
		break;
		case ButtonActionDialogFragment.DialogType.FORCE_STOP:
		requireAuthAndExecute(() -> {
		forceStopPackage(mAppEntry.info.packageName);
		});
		break;
		}
		}
		@@ -547,6 +573,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp

		@VisibleForTesting
		void uninstallPkg(String packageName, boolean allUsers, boolean andDisable) {
		requireAuthAndExecute(() -> {
		stopListeningToPackageRemove();
		// Create new intent to launch Uninstaller activity
		Uri packageUri = Uri.parse("package:" + packageName);
		@@ -557,6 +584,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
		mActivity, SettingsEnums.ACTION_SETTINGS_UNINSTALL_APP);
		mFragment.startActivityForResult(uninstallIntent, mRequestUninstall);
		mDisableAfterUninstall = andDisable;
		});
		}

		@VisibleForTesting

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -431,7 +431,8 @@ public class AppInfoDashboardFragment extends DashboardFragment
		}
		}

		private static void showLockScreen(Context context, Runnable successRunnable) {
		/** Shows the lock screen if the keyguard is secured. */
		public static void showLockScreen(Context context, Runnable successRunnable) {
		final KeyguardManager keyguardManager = context.getSystemService(
		KeyguardManager.class);

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);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ import org.robolectric.util.ReflectionHelpers;

		import java.util.Set;

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

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

		@Test