am c3ab03a9: Merge "Fix issue #8436951 JB-MR2: Compatibility: Audible,... (2cbf5fe4) · Commits · e / os / android_frameworks_base

core/res/res/values/strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -2989,6 +2989,15 @@
		<!-- If the device is getting low on internal storage, a notification is shown to the user. This is the message of that notification. -->
		<string name="low_internal_storage_view_text">Some system functions may not work</string>

		<!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
		a bad bad notification for itself. -->
		<string name="app_running_notification_title"><xliff:g id="app_name">%1$s</xliff:g>
		running</string>
		<!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
		a bad bad notification for itself. -->
		<string name="app_running_notification_text"><xliff:g id="app_name">%1$s</xliff:g>
		is currently running</string>

		<!-- Preference framework strings. -->
		<string name="ok">OK</string>
		<!-- Preference framework strings. -->

core/res/res/values/symbols.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -330,6 +330,8 @@
		<java-symbol type="string" name="addToDictionary" />
		<java-symbol type="string" name="action_bar_home_description" />
		<java-symbol type="string" name="action_bar_up_description" />
		<java-symbol type="string" name="app_running_notification_title" />
		<java-symbol type="string" name="app_running_notification_text" />
		<java-symbol type="string" name="delete" />
		<java-symbol type="string" name="deleteText" />
		<java-symbol type="string" name="ellipsis_two_dots" />

services/java/com/android/server/am/ServiceRecord.java

+41 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@

		package com.android.server.am;

		import android.app.PendingIntent;
		import android.net.Uri;
		import android.provider.Settings;
		import com.android.internal.os.BatteryStatsImpl;
		import com.android.server.NotificationManagerService;

		@@ -368,6 +371,44 @@ class ServiceRecord extends Binder {
		return;
		}
		try {
		if (foregroundNoti.icon == 0) {
		// It is not correct for the caller to supply a notification
		// icon, but this used to be able to slip through, so for
		// those dirty apps give it the app's icon.
		foregroundNoti.icon = appInfo.icon;
		if (foregroundNoti.contentView == null) {
		// In this case the app may not have specified a
		// content view... so we'll give them something to show.
		CharSequence appName = appInfo.loadLabel(
		ams.mContext.getPackageManager());
		if (appName == null) {
		appName = appInfo.packageName;
		}
		Context ctx = null;
		try {
		ctx = ams.mContext.createPackageContext(
		appInfo.packageName, 0);
		Intent runningIntent = new Intent(
		Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
		runningIntent.setData(Uri.fromParts("package",
		appInfo.packageName, null));
		PendingIntent pi = PendingIntent.getActivity(ams.mContext, 0,
		runningIntent, PendingIntent.FLAG_UPDATE_CURRENT);
		foregroundNoti.setLatestEventInfo(ctx,
		ams.mContext.getString(
		com.android.internal.R.string
		.app_running_notification_title,
		appName),
		ams.mContext.getString(
		com.android.internal.R.string
		.app_running_notification_text,
		appName),
		pi);
		} catch (PackageManager.NameNotFoundException e) {
		foregroundNoti.icon = 0;
		}
		}
		}
		if (foregroundNoti.icon == 0) {
		// Notifications whose icon is 0 are defined to not show
		// a notification, silently ignoring it. We don't want to