Merge branch 'lineage-21.0' into 'v2.9-a14' (e9800dcd) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/src/com/android/packageinstaller/UninstallerActivity.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -58,8 +58,6 @@ import com.android.packageinstaller.common.EventResultPersister;
		import com.android.packageinstaller.common.UninstallEventReceiver;
		import com.android.packageinstaller.v2.ui.UninstallLaunch;

		import java.util.List;

		/*
		* This activity presents UI to uninstall an application. Usually launched with intent
		* Intent.ACTION_UNINSTALL_PKG_COMMAND and attribute
		@@ -182,14 +180,17 @@ public class UninstallerActivity extends Activity {
		if (mDialogInfo.user == null) {
		mDialogInfo.user = Process.myUserHandle();
		} else {
		List<UserHandle> profiles = userManager.getUserProfiles();
		if (!profiles.contains(mDialogInfo.user)) {
		if (!mDialogInfo.user.equals(Process.myUserHandle())) {
		final boolean isCurrentUserProfileOwner = Process.myUserHandle().equals(
		userManager.getProfileParent(mDialogInfo.user));
		if (!isCurrentUserProfileOwner) {
		Log.e(TAG, "User " + Process.myUserHandle() + " can't request uninstall "
		+ "for user " + mDialogInfo.user);
		showUserIsNotAllowed();
		return;
		}
		}
		}

		mDialogInfo.callback = intent.getParcelableExtra(PackageInstaller.EXTRA_CALLBACK,
		PackageManager.UninstallCompleteCallback.class);

0 → 100644

+545 −0

File added.

Preview size limit exceeded, changes collapsed.

+3 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@
		<string name="accessibility_dpad_left">Cursor a la esquierda</string>
		<string name="accessibility_dpad_right">Cursor a la derecha</string>
		<string name="status_bar_firewall">Tornafuéu</string>
		<string name="screenshot_delete_label">Desaniciar</string>
		<string name="screenrecord_delete_label">Desaniciar</string>
		<string name="screenrecord_delete_description">Desanicióse la grabación de la pantalla</string>
		<string name="screenrecord_stopdot_label">Amosar el puntu de parada</string>
		<string name="screenrecord_stopdot_summary">Tenlu primíu pa movelu</string>
		@@ -79,4 +81,5 @@
		<string name="screenrecord_skip_time_summary">Quita la espera de 3 segundos</string>
		<string name="screenrecord_hevc_switch_label">Codificación HEVC</string>
		<string name="screenrecord_hevc_switch_summary">Usa un codificador HEVC más eficiente</string>
		<string name="battery_notification_channel_tv">Alvertencia de la batería</string>
		</resources>

+17 −17

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@
		<string name="quick_settings_usb_tether_label">USB இணைப்புப்பகிர்வு</string>
		<string name="quick_settings_vpn_label">VPN</string>
		<string name="quick_settings_vpn_connect_dialog_title">\u2026 உடன் இணைக்க</string>
		<string name="vpn_credentials_hint"><xliff:g id="name">%s</xliff:g> உடன் இணைக்க உங்கள் சான்றுகளை உள்ளிடுக</string>
		<string name="vpn_credentials_hint"><xliff:g id="name">%s</xliff:g> உடன் இணைக்க உங்கள் சான்றுகளை உள்ளிடவும்</string>
		<string name="vpn_credentials_username">பயனர்பெயர்</string>
		<string name="vpn_credentials_password">கடவுச்சொல்</string>
		<string name="vpn_credentials_dialog_connect">இணைக்க</string>