Merge "Intercepting activites that could cause lock task mode violation in... (be5015b0) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7140,6 +7140,7 @@ package android.app.admin {
	field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8		field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8
	field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1		field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1
	field public static final int LEAVE_ALL_SYSTEM_APPS_ENABLED = 16; // 0x10		field public static final int LEAVE_ALL_SYSTEM_APPS_ENABLED = 16; // 0x10
			field public static final int LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK = 64; // 0x40
	field public static final int LOCK_TASK_FEATURE_GLOBAL_ACTIONS = 16; // 0x10		field public static final int LOCK_TASK_FEATURE_GLOBAL_ACTIONS = 16; // 0x10
	field public static final int LOCK_TASK_FEATURE_HOME = 4; // 0x4		field public static final int LOCK_TASK_FEATURE_HOME = 4; // 0x4
	field public static final int LOCK_TASK_FEATURE_KEYGUARD = 32; // 0x20		field public static final int LOCK_TASK_FEATURE_KEYGUARD = 32; // 0x20

core/java/android/app/admin/DevicePolicyManager.java

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2089,6 +2089,13 @@ public class DevicePolicyManager {
	*/		*/
	public static final int LOCK_TASK_FEATURE_KEYGUARD = 1 << 5;		public static final int LOCK_TASK_FEATURE_KEYGUARD = 1 << 5;

			/**
			* Enable blocking of non-whitelisted activities from being started into a locked task.
			*
			* @see #setLockTaskFeatures(ComponentName, int)
			*/
			public static final int LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK = 1 << 6;

	/**		/**
	* Flags supplied to {@link #setLockTaskFeatures(ComponentName, int)}.		* Flags supplied to {@link #setLockTaskFeatures(ComponentName, int)}.
	*		*
	@@ -2102,7 +2109,8 @@ public class DevicePolicyManager {
	LOCK_TASK_FEATURE_HOME,		LOCK_TASK_FEATURE_HOME,
	LOCK_TASK_FEATURE_OVERVIEW,		LOCK_TASK_FEATURE_OVERVIEW,
	LOCK_TASK_FEATURE_GLOBAL_ACTIONS,		LOCK_TASK_FEATURE_GLOBAL_ACTIONS,
	LOCK_TASK_FEATURE_KEYGUARD		LOCK_TASK_FEATURE_KEYGUARD,
			LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK
	})		})
	public @interface LockTaskFeature {}		public @interface LockTaskFeature {}

core/java/com/android/internal/app/BlockedAppActivity.java

0 → 100644

+86 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2020 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.internal.app;

			import android.content.Intent;
			import android.content.pm.ApplicationInfo;
			import android.content.pm.PackageManager;
			import android.os.Bundle;
			import android.text.TextUtils;
			import android.util.Slog;

			import com.android.internal.R;

			/**
			* A dialog shown to the user when they try to launch an app that is not allowed in lock task
			* mode. The intent to start this activity must be created with the static factory method provided
			* below.
			*/
			public class BlockedAppActivity extends AlertActivity {

			private static final String TAG = "BlockedAppActivity";
			private static final String PACKAGE_NAME = "com.android.internal.app";
			private static final String EXTRA_BLOCKED_PACKAGE = PACKAGE_NAME + ".extra.BLOCKED_PACKAGE";

			@Override
			protected void onCreate(Bundle savedInstanceState) {
			super.onCreate(savedInstanceState);

			Intent intent = getIntent();
			int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, /* defaultValue= */ -1);
			if (userId < 0) {
			Slog.wtf(TAG, "Invalid user: " + userId);
			finish();
			return;
			}

			String packageName = intent.getStringExtra(EXTRA_BLOCKED_PACKAGE);
			if (TextUtils.isEmpty(packageName)) {
			Slog.wtf(TAG, "Invalid package: " + packageName);
			finish();
			return;
			}

			CharSequence appLabel = getAppLabel(userId, packageName);

			mAlertParams.mTitle = getString(R.string.app_blocked_title);
			mAlertParams.mMessage = getString(R.string.app_blocked_message, appLabel);
			mAlertParams.mPositiveButtonText = getString(android.R.string.ok);
			setupAlert();
			}

			private CharSequence getAppLabel(int userId, String packageName) {
			PackageManager pm = getPackageManager();
			try {
			ApplicationInfo aInfo =
			pm.getApplicationInfoAsUser(packageName, /* flags= */ 0, userId);
			return aInfo.loadLabel(pm);
			} catch (PackageManager.NameNotFoundException ne) {
			Slog.e(TAG, "Package " + packageName + " not found", ne);
			}
			return packageName;
			}


			/** Creates an intent that launches {@link BlockedAppActivity}. */
			public static Intent createIntent(int userId, String packageName) {
			return new Intent()
			.setClassName("android", BlockedAppActivity.class.getName())
			.putExtra(Intent.EXTRA_USER_ID, userId)
			.putExtra(EXTRA_BLOCKED_PACKAGE, packageName);
			}
			}

core/res/AndroidManifest.xml

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5075,6 +5075,12 @@
	android:process=":ui">		android:process=":ui">
	</activity>		</activity>

			<activity android:name="com.android.internal.app.BlockedAppActivity"
			android:theme="@style/Theme.Dialog.Confirmation"
			android:excludeFromRecents="true"
			android:process=":ui">
			</activity>

	<activity android:name="com.android.settings.notification.NotificationAccessConfirmationActivity"		<activity android:name="com.android.settings.notification.NotificationAccessConfirmationActivity"
	android:theme="@style/Theme.Dialog.Confirmation"		android:theme="@style/Theme.Dialog.Confirmation"
	android:excludeFromRecents="true">		android:excludeFromRecents="true">

core/res/res/values/strings.xml

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4936,6 +4936,13 @@
	<!-- Title for button to turn on work profile. [CHAR LIMIT=NONE] -->		<!-- Title for button to turn on work profile. [CHAR LIMIT=NONE] -->
	<string name="work_mode_turn_on">Turn on</string>		<string name="work_mode_turn_on">Turn on</string>

			<!-- Title of the dialog that is shown when the user tries to launch a blocked application [CHAR LIMIT=50] -->
			<string name="app_blocked_title">App is not available</string>
			<!-- Default message shown in the dialog that is shown when the user tries to launch a blocked application [CHAR LIMIT=NONE] -->
			<string name="app_blocked_message">
			<xliff:g id="app_name" example="Gmail">%1$s</xliff:g> is not available right now.
			</string>

	<!-- Message displayed in dialog when app is too old to run on this verison of android. [CHAR LIMIT=NONE] -->		<!-- Message displayed in dialog when app is too old to run on this verison of android. [CHAR LIMIT=NONE] -->
	<string name="deprecated_target_sdk_message">This app was built for an older version of Android and may not work properly. Try checking for updates, or contact the developer.</string>		<string name="deprecated_target_sdk_message">This app was built for an older version of Android and may not work properly. Try checking for updates, or contact the developer.</string>
	<!-- Title for button to see application detail in app store which it came from - it may allow user to update to newer version. [CHAR LIMIT=50] -->		<!-- Title for button to see application detail in app store which it came from - it may allow user to update to newer version. [CHAR LIMIT=50] -->