release-request-1f2fcfef-9736-44dc-8628-3ba96dac60db-for-git_oc-mr1-release-43... (836e0513) · Commits · e / os / android_frameworks_base

Android.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -502,9 +502,9 @@ LOCAL_SRC_FILES += \
		telecomm/java/com/android/internal/telecom/IInCallService.aidl \
		telecomm/java/com/android/internal/telecom/ITelecomService.aidl \
		telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \
		telephony/java/android/telephony/mbms/IMbmsDownloadManagerCallback.aidl \
		telephony/java/android/telephony/mbms/IMbmsStreamingManagerCallback.aidl \
		telephony/java/android/telephony/mbms/IDownloadProgressListener.aidl \
		telephony/java/android/telephony/mbms/IMbmsDownloadSessionCallback.aidl \
		telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl \
		telephony/java/android/telephony/mbms/IDownloadStateCallback.aidl \
		telephony/java/android/telephony/mbms/IStreamingServiceCallback.aidl \
		telephony/java/android/telephony/mbms/vendor/IMbmsDownloadService.aidl \
		telephony/java/android/telephony/mbms/vendor/IMbmsStreamingService.aidl \

cmds/bu/src/com/android/commands/bu/Backup.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,9 @@ public final class Backup {
		if (fd != null) {
		try {
		fd.close();
		} catch (IOException e) {}
		} catch (IOException e) {
		Log.e(TAG, "IO error closing output for backup: " + e.getMessage());
		}
		}
		}
		}

core/java/android/app/LoadedApk.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -637,7 +637,9 @@ public final class LoadedApk {
		// as unbundled.
		final String defaultSearchPaths = System.getProperty("java.library.path");
		final boolean treatVendorApkAsUnbundled = !defaultSearchPaths.contains("/vendor/lib");
		if (mApplicationInfo.getCodePath().startsWith("/vendor/") && treatVendorApkAsUnbundled) {
		if (mApplicationInfo.getCodePath() != null
		&& mApplicationInfo.getCodePath().startsWith("/vendor/")
		&& treatVendorApkAsUnbundled) {
		isBundledApp = false;
		}

core/java/android/app/Notification.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ import android.text.style.TextAppearanceSpan;
		import android.util.ArraySet;
		import android.util.Log;
		import android.util.SparseArray;
		import android.util.TypedValue;
		import android.view.Gravity;
		import android.view.NotificationHeaderView;
		import android.view.View;
		@@ -3898,6 +3899,7 @@ public class Notification implements Parcelable
		if (p.title != null) {
		contentView.setViewVisibility(R.id.title, View.VISIBLE);
		contentView.setTextViewText(R.id.title, processTextSpans(p.title));
		updateTextSizePrimary(contentView, R.id.title);
		if (!p.ambient) {
		setTextViewColorPrimary(contentView, R.id.title);
		}
		@@ -3909,6 +3911,7 @@ public class Notification implements Parcelable
		int textId = showProgress ? com.android.internal.R.id.text_line_1
		: com.android.internal.R.id.text;
		contentView.setTextViewText(textId, processTextSpans(p.text));
		updateTextSizeSecondary(contentView, textId);
		if (!p.ambient) {
		setTextViewColorSecondary(contentView, textId);
		}
		@@ -3920,6 +3923,25 @@ public class Notification implements Parcelable
		return contentView;
		}

		private void updateTextSizeSecondary(RemoteViews contentView, int textId) {
		updateTextSizeColorized(contentView, textId,
		com.android.internal.R.dimen.notification_text_size_colorized,
		com.android.internal.R.dimen.notification_text_size);
		}

		private void updateTextSizePrimary(RemoteViews contentView, int textId) {
		updateTextSizeColorized(contentView, textId,
		com.android.internal.R.dimen.notification_title_text_size_colorized,
		com.android.internal.R.dimen.notification_title_text_size);
		}

		private void updateTextSizeColorized(RemoteViews contentView, int textId,
		int colorizedDimen, int normalDimen) {
		int size = mContext.getResources().getDimensionPixelSize(isColorized()
		? colorizedDimen : normalDimen);
		contentView.setTextViewTextSize(textId, TypedValue.COMPLEX_UNIT_PX, size);
		}

		private CharSequence processTextSpans(CharSequence text) {
		if (hasForegroundColor()) {
		return NotificationColorUtil.clearColorSpans(text);
		@@ -5845,6 +5867,7 @@ public class Notification implements Parcelable
		builder.setTextViewColorSecondary(contentView, R.id.big_text);
		contentView.setViewVisibility(R.id.big_text,
		TextUtils.isEmpty(bigTextText) ? View.GONE : View.VISIBLE);
		builder.updateTextSizeSecondary(contentView, R.id.big_text);
		contentView.setBoolean(R.id.big_text, "setHasImage", builder.mN.hasLargeIcon());
		}
		}
		@@ -6178,6 +6201,7 @@ public class Notification implements Parcelable
		contentView.setViewVisibility(rowId, View.VISIBLE);
		contentView.setTextViewText(rowId, mBuilder.processTextSpans(
		makeMessageLine(m, mBuilder)));
		mBuilder.updateTextSizeSecondary(contentView, rowId);
		mBuilder.setTextViewColorSecondary(contentView, rowId);

		if (contractedMessage == m) {
		@@ -6545,6 +6569,7 @@ public class Notification implements Parcelable
		contentView.setViewVisibility(rowIds[i], View.VISIBLE);
		contentView.setTextViewText(rowIds[i],
		mBuilder.processTextSpans(mBuilder.processLegacyText(str)));
		mBuilder.updateTextSizeSecondary(contentView, rowIds[i]);
		mBuilder.setTextViewColorSecondary(contentView, rowIds[i]);
		contentView.setViewPadding(rowIds[i], 0, topPadding, 0, 0);
		handleInboxImageMargin(contentView, rowIds[i], first);

core/java/android/app/RemoteInput.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@ import java.util.Set;
		* an intent inside a {@link android.app.PendingIntent} that is sent.
		* Always use {@link RemoteInput.Builder} to create instances of this class.
		* <p class="note"> See
		* <a href="{@docRoot}wear/notifications/remote-input.html">Receiving Voice Input from
		* a Notification</a> for more information on how to use this class.
		* <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html#direct">Replying
		* to notifications</a> for more information on how to use this class.
		*
		* <p>The following example adds a {@code RemoteInput} to a {@link Notification.Action},
		* sets the result key as {@code quick_reply}, and sets the label as {@code Quick reply}.