Merge "Warn when running activity from deprecated app (< min supported sdk)." (a27e962a) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+5 −0

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

		<!-- 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>
		<!-- 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] -->
		<string name="deprecated_target_sdk_app_store">Check for update</string>

		<!-- Notification title shown when new SMS/MMS is received while the device is locked [CHAR LIMIT=NONE] -->
		<string name="new_sms_notification_title">You have new messages</string>
		<!-- Notification content shown when new SMS/MMS is received while the device is locked [CHAR LIMIT=NONE] -->

core/res/res/values/symbols.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -2703,6 +2703,9 @@
		<java-symbol type="string" name="work_mode_off_message" />
		<java-symbol type="string" name="work_mode_turn_on" />

		<java-symbol type="string" name="deprecated_target_sdk_message" />
		<java-symbol type="string" name="deprecated_target_sdk_app_store" />

		<!-- New SMS notification while phone is locked. -->
		<java-symbol type="string" name="new_sms_notification_title" />
		<java-symbol type="string" name="new_sms_notification_content" />

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3466,6 +3466,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		final void showAppWarningsIfNeededLocked(ActivityRecord r) {
		mAppWarnings.showUnsupportedCompileSdkDialogIfNeeded(r);
		mAppWarnings.showUnsupportedDisplaySizeDialogIfNeeded(r);
		mAppWarnings.showDeprecatedTargetDialogIfNeeded(r);
		}

		private int updateLruProcessInternalLocked(ProcessRecord app, long now, int index,

services/core/java/com/android/server/am/AppWarnings.java

+53 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ class AppWarnings {

		public static final int FLAG_HIDE_DISPLAY_SIZE = 0x01;
		public static final int FLAG_HIDE_COMPILE_SDK = 0x02;
		public static final int FLAG_HIDE_DEPRECATED_SDK = 0x04;

		private final HashMap<String, Integer> mPackageFlags = new HashMap<>();

		@@ -61,6 +62,7 @@ class AppWarnings {

		private UnsupportedDisplaySizeDialog mUnsupportedDisplaySizeDialog;
		private UnsupportedCompileSdkDialog mUnsupportedCompileSdkDialog;
		private DeprecatedTargetSdkVersionDialog mDeprecatedTargetSdkVersionDialog;

		/**
		* Creates a new warning dialog manager.
		@@ -125,6 +127,17 @@ class AppWarnings {
		}
		}

		/**
		* Shows the "deprecated target sdk" warning, if necessary.
		*
		* @param r activity record for which the warning may be displayed
		*/
		public void showDeprecatedTargetDialogIfNeeded(ActivityRecord r) {
		if (r.appInfo.targetSdkVersion < Build.VERSION.MIN_SUPPORTED_TARGET_SDK_INT) {
		mUiHandler.showDeprecatedTargetDialog(r);
		}
		}

		/**
		* Called when an activity is being started.
		*
		@@ -133,6 +146,7 @@ class AppWarnings {
		public void onStartActivity(ActivityRecord r) {
		showUnsupportedCompileSdkDialogIfNeeded(r);
		showUnsupportedDisplaySizeDialogIfNeeded(r);
		showDeprecatedTargetDialogIfNeeded(r);
		}

		/**
		@@ -236,6 +250,27 @@ class AppWarnings {
		}
		}

		/**
		* Shows the "deprecated target sdk version" warning for the given application.
		* <p>
		* <strong>Note:</strong> Must be called on the UI thread.
		*
		* @param ar record for the activity that triggered the warning
		*/
		@UiThread
		private void showDeprecatedTargetSdkDialogUiThread(ActivityRecord ar) {
		if (mDeprecatedTargetSdkVersionDialog != null) {
		mDeprecatedTargetSdkVersionDialog.dismiss();
		mDeprecatedTargetSdkVersionDialog = null;
		}
		if (ar != null && !hasPackageFlag(
		ar.packageName, FLAG_HIDE_DEPRECATED_SDK)) {
		mDeprecatedTargetSdkVersionDialog = new DeprecatedTargetSdkVersionDialog(
		AppWarnings.this, mUiContext, ar.info.applicationInfo);
		mDeprecatedTargetSdkVersionDialog.show();
		}
		}

		/**
		* Dismisses all warnings for the given package.
		* <p>
		@@ -259,6 +294,13 @@ class AppWarnings {
		mUnsupportedCompileSdkDialog.dismiss();
		mUnsupportedCompileSdkDialog = null;
		}

		// Hides the "deprecated target sdk version" dialog if necessary.
		if (mDeprecatedTargetSdkVersionDialog != null && (name == null \|\| name.equals(
		mDeprecatedTargetSdkVersionDialog.getPackageName()))) {
		mDeprecatedTargetSdkVersionDialog.dismiss();
		mDeprecatedTargetSdkVersionDialog = null;
		}
		}

		/**
		@@ -282,7 +324,7 @@ class AppWarnings {
		void setPackageFlag(String name, int flag, boolean enabled) {
		synchronized (mPackageFlags) {
		final int curFlags = getPackageFlags(name);
		final int newFlags = enabled ? (curFlags & ~flag) : (curFlags \| flag);
		final int newFlags = enabled ? (curFlags \| flag) : (curFlags & ~flag);
		if (curFlags != newFlags) {
		if (newFlags != 0) {
		mPackageFlags.put(name, newFlags);
		@@ -311,6 +353,7 @@ class AppWarnings {
		private static final int MSG_HIDE_UNSUPPORTED_DISPLAY_SIZE_DIALOG = 2;
		private static final int MSG_SHOW_UNSUPPORTED_COMPILE_SDK_DIALOG = 3;
		private static final int MSG_HIDE_DIALOGS_FOR_PACKAGE = 4;
		private static final int MSG_SHOW_DEPRECATED_TARGET_SDK_DIALOG = 5;

		public UiHandler(Looper looper) {
		super(looper, null, true);
		@@ -334,6 +377,10 @@ class AppWarnings {
		final String name = (String) msg.obj;
		hideDialogsForPackageUiThread(name);
		} break;
		case MSG_SHOW_DEPRECATED_TARGET_SDK_DIALOG: {
		final ActivityRecord ar = (ActivityRecord) msg.obj;
		showDeprecatedTargetSdkDialogUiThread(ar);
		} break;
		}
		}

		@@ -352,6 +399,11 @@ class AppWarnings {
		obtainMessage(MSG_SHOW_UNSUPPORTED_COMPILE_SDK_DIALOG, r).sendToTarget();
		}

		public void showDeprecatedTargetDialog(ActivityRecord r) {
		removeMessages(MSG_SHOW_DEPRECATED_TARGET_SDK_DIALOG);
		obtainMessage(MSG_SHOW_DEPRECATED_TARGET_SDK_DIALOG, r).sendToTarget();
		}

		public void hideDialogsForPackage(String name) {
		obtainMessage(MSG_HIDE_DIALOGS_FOR_PACKAGE, name).sendToTarget();
		}

services/core/java/com/android/server/am/DeprecatedTargetSdkVersionDialog.java

0 → 100644

+83 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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.server.am;

		import android.app.AlertDialog;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.os.Build;
		import android.os.SystemPropertiesProto;
		import android.view.Window;
		import android.view.WindowManager;
		import android.widget.CheckBox;

		import com.android.internal.R;
		import com.android.server.utils.AppInstallerUtil;

		public class DeprecatedTargetSdkVersionDialog {
		private final AlertDialog mDialog;
		private final String mPackageName;

		public DeprecatedTargetSdkVersionDialog(final AppWarnings manager, Context context,
		ApplicationInfo appInfo) {
		mPackageName = appInfo.packageName;

		final PackageManager pm = context.getPackageManager();
		final CharSequence label = appInfo.loadSafeLabel(pm);
		final CharSequence message = context.getString(R.string.deprecated_target_sdk_message);

		final AlertDialog.Builder builder = new AlertDialog.Builder(context)
		.setPositiveButton(R.string.ok, (dialog, which) ->
		manager.setPackageFlag(
		mPackageName, AppWarnings.FLAG_HIDE_DEPRECATED_SDK, true))
		.setMessage(message)
		.setTitle(label);

		// If we might be able to update the app, show a button.
		final Intent installerIntent = AppInstallerUtil.createIntent(context, appInfo.packageName);
		if (installerIntent != null) {
		builder.setNeutralButton(R.string.deprecated_target_sdk_app_store,
		(dialog, which) -> {
		context.startActivity(installerIntent);
		});
		}

		// Ensure the content view is prepared.
		mDialog = builder.create();
		mDialog.create();

		final Window window = mDialog.getWindow();
		window.setType(WindowManager.LayoutParams.TYPE_PHONE);

		// DO NOT MODIFY. Used by CTS to verify the dialog is displayed.
		window.getAttributes().setTitle("DeprecatedTargetSdkVersionDialog");
		}

		public String getPackageName() {
		return mPackageName;
		}

		public void show() {
		mDialog.show();
		}

		public void dismiss() {
		mDialog.dismiss();
		}
		}