Snap for 4807121 from 6de8729657263d0dba112573298055d9396027d6 to pi-release (e0bc0b01) · Commits · e / os / android_frameworks_base

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -232,6 +232,7 @@ package android.content {
		package android.content.pm {

		public class ActivityInfo extends android.content.pm.ComponentInfo implements android.os.Parcelable {
		method public static boolean isTranslucentOrFloating(android.content.res.TypedArray);
		field public static final int RESIZE_MODE_RESIZEABLE = 2; // 0x2
		}

cmds/requestsync/src/com/android/commands/requestsync/RequestSync.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -211,10 +211,10 @@ public class RequestSync {
		mExtras.putBoolean(key, Boolean.valueOf(value));

		} else if (opt.equals("-f") \|\| opt.equals("--foreground")) {
		mExemptionFlag = ContentResolver.SYNC_EXEMPTION_ACTIVE;
		mExemptionFlag = ContentResolver.SYNC_EXEMPTION_PROMOTE_BUCKET;

		} else if (opt.equals("-F") \|\| opt.equals("--top")) {
		mExemptionFlag = ContentResolver.SYNC_EXEMPTION_ACTIVE_WITH_TEMP;
		mExemptionFlag = ContentResolver.SYNC_EXEMPTION_PROMOTE_BUCKET_WITH_TEMP;

		} else {
		System.err.println("Error: Unknown option: " + opt);

config/hiddenapi-light-greylist.txt

+46 −0

Original line number	Diff line number	Diff line
		@@ -741,6 +741,7 @@ Landroid/app/IWallpaperManager;->getHeightHint()I
		Landroid/app/IWallpaperManager;->getWallpaper(Ljava/lang/String;Landroid/app/IWallpaperManagerCallback;ILandroid/os/Bundle;I)Landroid/os/ParcelFileDescriptor;
		Landroid/app/IWallpaperManager;->getWallpaperInfo(I)Landroid/app/WallpaperInfo;
		Landroid/app/IWallpaperManager;->getWidthHint()I
		Landroid/app/IWallpaperManager;->hasNamedWallpaper(Ljava/lang/String;)Z
		Landroid/app/IWallpaperManager;->setWallpaperComponent(Landroid/content/ComponentName;)V
		Landroid/app/IWallpaperManagerCallback$Stub;-><init>()V
		Landroid/app/IWallpaperManagerCallback;->onWallpaperChanged()V
		@@ -923,6 +924,7 @@ Landroid/app/Service;->setForeground(Z)V
		Landroid/app/ServiceConnectionLeaked;-><init>(Ljava/lang/String;)V
		Landroid/app/SharedPreferencesImpl;-><init>(Ljava/io/File;I)V
		Landroid/app/SharedPreferencesImpl;->mFile:Ljava/io/File;
		Landroid/app/SharedPreferencesImpl;->startLoadFromDisk()V
		Landroid/app/SharedPreferencesImpl;->startReloadIfChangedUnexpectedly()V
		Landroid/app/StatusBarManager;-><init>(Landroid/content/Context;)V
		Landroid/app/StatusBarManager;->collapsePanels()V
		@@ -2228,6 +2230,8 @@ Landroid/graphics/FontFamily;->abortCreation()V
		Landroid/graphics/FontFamily;->addFontFromAssetManager(Landroid/content/res/AssetManager;Ljava/lang/String;IZIII[Landroid/graphics/fonts/FontVariationAxis;)Z
		Landroid/graphics/FontFamily;->addFontFromBuffer(Ljava/nio/ByteBuffer;I[Landroid/graphics/fonts/FontVariationAxis;II)Z
		Landroid/graphics/FontFamily;->freeze()Z
		Landroid/graphics/FontFamily;->mNativePtr:J
		Landroid/graphics/FontListParser;->parse(Ljava/io/InputStream;)Landroid/text/FontConfig;
		Landroid/graphics/fonts/FontVariationAxis;->mStyleValue:F
		Landroid/graphics/fonts/FontVariationAxis;->mTag:I
		Landroid/graphics/GraphicBuffer;-><init>(IIIIJ)V
		@@ -2374,6 +2378,7 @@ Landroid/hardware/camera2/CameraCharacteristics;->DEPTH_AVAILABLE_DEPTH_STREAM_C
		Landroid/hardware/camera2/CameraCharacteristics;->LED_AVAILABLE_LEDS:Landroid/hardware/camera2/CameraCharacteristics$Key;
		Landroid/hardware/camera2/CameraCharacteristics;->LENS_INFO_SHADING_MAP_SIZE:Landroid/hardware/camera2/CameraCharacteristics$Key;
		Landroid/hardware/camera2/CameraCharacteristics;->LOGICAL_MULTI_CAMERA_PHYSICAL_IDS:Landroid/hardware/camera2/CameraCharacteristics$Key;
		Landroid/hardware/camera2/CameraCharacteristics;->mProperties:Landroid/hardware/camera2/impl/CameraMetadataNative;
		Landroid/hardware/camera2/CameraCharacteristics;->QUIRKS_USE_PARTIAL_RESULT:Landroid/hardware/camera2/CameraCharacteristics$Key;
		Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_CHARACTERISTICS_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
		Landroid/hardware/camera2/CameraCharacteristics;->REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS:Landroid/hardware/camera2/CameraCharacteristics$Key;
		@@ -2430,6 +2435,9 @@ Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_GREEN:Landroid/hardware/
		Landroid/hardware/camera2/CaptureResult;->TONEMAP_CURVE_RED:Landroid/hardware/camera2/CaptureResult$Key;
		Landroid/hardware/camera2/impl/CameraMetadataNative$Key;->getTag()I
		Landroid/hardware/camera2/impl/CameraMetadataNative;->mMetadataPtr:J
		Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeGetTagFromKeyLocal(Ljava/lang/String;)I
		Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeGetTypeFromTagLocal(I)I
		Landroid/hardware/camera2/impl/CameraMetadataNative;->nativeReadValues(I)[B
		Landroid/hardware/camera2/utils/SurfaceUtils;->getSurfaceSize(Landroid/view/Surface;)Landroid/util/Size;
		Landroid/hardware/camera2/utils/TypeReference;-><init>()V
		Landroid/hardware/camera2/utils/TypeReference;->createSpecializedTypeReference(Ljava/lang/reflect/Type;)Landroid/hardware/camera2/utils/TypeReference;
		@@ -3777,6 +3785,7 @@ Landroid/os/BatteryStats$HistoryItem;->states2:I
		Landroid/os/BatteryStats$Timer;-><init>()V
		Landroid/os/BatteryStats$Timer;->getTotalTimeLocked(JI)J
		Landroid/os/BatteryStats$Uid$Pkg$Serv;->getLaunches(I)I
		Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStarts(I)I
		Landroid/os/BatteryStats$Uid$Pkg$Serv;->getStartTime(JI)J
		Landroid/os/BatteryStats$Uid$Pkg;-><init>()V
		Landroid/os/BatteryStats$Uid$Pkg;->getServiceStats()Landroid/util/ArrayMap;
		@@ -3811,12 +3820,20 @@ Landroid/os/BatteryStats$Uid;->getWifiBatchedScanTime(IJI)J
		Landroid/os/BatteryStats$Uid;->getWifiMulticastTime(JI)J
		Landroid/os/BatteryStats$Uid;->getWifiScanTime(JI)J
		Landroid/os/BatteryStats;-><init>()V
		Landroid/os/BatteryStats;->computeBatteryRealtime(JI)J
		Landroid/os/BatteryStats;->computeBatteryTimeRemaining(J)J
		Landroid/os/BatteryStats;->computeBatteryUptime(JI)J
		Landroid/os/BatteryStats;->computeChargeTimeRemaining(J)J
		Landroid/os/BatteryStats;->getBatteryUptime(J)J
		Landroid/os/BatteryStats;->getGlobalWifiRunningTime(JI)J
		Landroid/os/BatteryStats;->getMobileRadioActiveTime(JI)J
		Landroid/os/BatteryStats;->getNetworkActivityBytes(II)J
		Landroid/os/BatteryStats;->getPhoneOnTime(JI)J
		Landroid/os/BatteryStats;->getPhoneSignalStrengthTime(IJI)J
		Landroid/os/BatteryStats;->getScreenBrightnessTime(IJI)J
		Landroid/os/BatteryStats;->getScreenOnTime(JI)J
		Landroid/os/BatteryStats;->getUidStats()Landroid/util/SparseArray;
		Landroid/os/BatteryStats;->getWifiOnTime(JI)J
		Landroid/os/BatteryStats;->NUM_DATA_CONNECTION_TYPES:I
		Landroid/os/BatteryStats;->NUM_SCREEN_BRIGHTNESS_BINS:I
		Landroid/os/BatteryStats;->startIteratingHistoryLocked()Z
		@@ -5101,6 +5118,7 @@ Landroid/service/wallpaper/IWallpaperService$Stub;->asInterface(Landroid/os/IBin
		Landroid/service/wallpaper/WallpaperService$Engine;->mPendingXOffset:F
		Landroid/service/wallpaper/WallpaperService$Engine;->setFixedSizeAllowed(Z)V
		Landroid/service/wallpaper/WallpaperService;->MSG_WINDOW_RESIZED:I
		Landroid/speech/IRecognitionListener;->onEvent(ILandroid/os/Bundle;)V
		Landroid/speech/tts/TextToSpeech;->getCurrentEngine()Ljava/lang/String;
		Landroid/speech/tts/TextToSpeech;->mConnectingServiceConnection:Landroid/speech/tts/TextToSpeech$Connection;
		Landroid/speech/tts/TextToSpeech;->mCurrentEngine:Ljava/lang/String;
		@@ -5276,6 +5294,7 @@ Landroid/telephony/PhoneNumberUtils;->isVoiceMailNumber(Landroid/content/Context
		Landroid/telephony/PhoneNumberUtils;->MIN_MATCH:I
		Landroid/telephony/PhoneNumberUtils;->ttsSpanAsPhoneNumber(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;
		Landroid/telephony/PhoneStateListener;-><init>(Landroid/os/Looper;)V
		Landroid/telephony/PhoneStateListener;->callback:Lcom/android/internal/telephony/IPhoneStateListener;
		Landroid/telephony/PhoneStateListener;->LISTEN_PRECISE_CALL_STATE:I
		Landroid/telephony/PhoneStateListener;->mSubId:Ljava/lang/Integer;
		Landroid/telephony/PhoneStateListener;->onDataConnectionRealTimeInfoChanged(Landroid/telephony/DataConnectionRealTimeInfo;)V
		@@ -5417,6 +5436,7 @@ Landroid/telephony/SmsMessage;->mWrappedSmsMessage:Lcom/android/internal/telepho
		Landroid/telephony/SmsMessage;->setSubId(I)V
		Landroid/telephony/SmsMessage;->useCdmaFormatForMoSms()Z
		Landroid/telephony/SmsMessage;->useCdmaFormatForMoSms(I)Z
		Landroid/telephony/SubscriptionInfo;->getNameSource()I
		Landroid/telephony/SubscriptionManager;-><init>(Landroid/content/Context;)V
		Landroid/telephony/SubscriptionManager;->CONTENT_URI:Landroid/net/Uri;
		Landroid/telephony/SubscriptionManager;->DEFAULT_SUBSCRIPTION_ID:I
		@@ -5453,6 +5473,8 @@ Landroid/telephony/TelephonyManager;->getDefault()Landroid/telephony/TelephonyMa
		Landroid/telephony/TelephonyManager;->getDeviceSoftwareVersion(I)Ljava/lang/String;
		Landroid/telephony/TelephonyManager;->getGroupIdLevel1(I)Ljava/lang/String;
		Landroid/telephony/TelephonyManager;->getIccAuthentication(IIILjava/lang/String;)Ljava/lang/String;
		Landroid/telephony/TelephonyManager;->getImsConfig(II)Landroid/telephony/ims/aidl/IImsConfig;
		Landroid/telephony/TelephonyManager;->getImsRegistration(II)Landroid/telephony/ims/aidl/IImsRegistration;
		Landroid/telephony/TelephonyManager;->getIsimImpi()Ljava/lang/String;
		Landroid/telephony/TelephonyManager;->getIsimImpu()[Ljava/lang/String;
		Landroid/telephony/TelephonyManager;->getIsimPcscf()[Ljava/lang/String;
		@@ -5537,6 +5559,14 @@ Landroid/text/DynamicLayout;->getIndexFirstChangedBlock()I
		Landroid/text/DynamicLayout;->getNumberOfBlocks()I
		Landroid/text/DynamicLayout;->setIndexFirstChangedBlock(I)V
		Landroid/text/DynamicLayout;->sStaticLayout:Landroid/text/StaticLayout;
		Landroid/text/FontConfig$Family;->getFonts()[Landroid/text/FontConfig$Font;
		Landroid/text/FontConfig$Family;->getName()Ljava/lang/String;
		Landroid/text/FontConfig$Family;->getVariant()I
		Landroid/text/FontConfig$Font;->getAxes()[Landroid/graphics/fonts/FontVariationAxis;
		Landroid/text/FontConfig$Font;->getTtcIndex()I
		Landroid/text/FontConfig$Font;->getWeight()I
		Landroid/text/FontConfig$Font;->isItalic()Z
		Landroid/text/FontConfig;->getFamilies()[Landroid/text/FontConfig$Family;
		Landroid/text/format/DateFormat;->getTimeFormatString(Landroid/content/Context;)Ljava/lang/String;
		Landroid/text/format/DateFormat;->getTimeFormatString(Landroid/content/Context;I)Ljava/lang/String;
		Landroid/text/format/DateFormat;->hasDesignator(Ljava/lang/CharSequence;C)Z
		@@ -7400,6 +7430,7 @@ Lcom/android/internal/app/AlertController;->setIcon(Landroid/graphics/drawable/D
		Lcom/android/internal/app/AlertController;->setMessage(Ljava/lang/CharSequence;)V
		Lcom/android/internal/app/AlertController;->setTitle(Ljava/lang/CharSequence;)V
		Lcom/android/internal/app/AlertController;->setView(Landroid/view/View;)V
		Lcom/android/internal/app/IAppOpsCallback$Stub;-><init>()V
		Lcom/android/internal/app/IAppOpsService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->checkOperation(IILjava/lang/String;)I
		Lcom/android/internal/app/IAppOpsService$Stub$Proxy;->setMode(IILjava/lang/String;I)V
		@@ -8174,6 +8205,7 @@ Lcom/android/internal/telephony/ISms$Stub;-><init>()V
		Lcom/android/internal/telephony/ISms$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISms;
		Lcom/android/internal/telephony/ISub$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Lcom/android/internal/telephony/ISub$Stub;->asInterface(Landroid/os/IBinder;)Lcom/android/internal/telephony/ISub;
		Lcom/android/internal/telephony/ISub;->getActiveSubIdList()[I
		Lcom/android/internal/telephony/ISub;->getDefaultDataSubId()I
		Lcom/android/internal/telephony/ISub;->getDefaultSubId()I
		Lcom/android/internal/telephony/ISub;->setDefaultDataSubId(I)V
		@@ -8997,6 +9029,20 @@ Lorg/apache/http/conn/ssl/SSLSocketFactory;->socketfactory:Ljavax/net/ssl/SSLSoc
		Lorg/apache/http/conn/ssl/SSLSocketFactory;->sslcontext:Ljavax/net/ssl/SSLContext;
		Lorg/ccil/cowan/tagsoup/AttributesImpl;->data:[Ljava/lang/String;
		Lorg/ccil/cowan/tagsoup/AttributesImpl;->length:I
		Lorg/ccil/cowan/tagsoup/ElementType;->theAtts:Lorg/ccil/cowan/tagsoup/AttributesImpl;
		Lorg/ccil/cowan/tagsoup/ElementType;->theFlags:I
		Lorg/ccil/cowan/tagsoup/ElementType;->theLocalName:Ljava/lang/String;
		Lorg/ccil/cowan/tagsoup/ElementType;->theMemberOf:I
		Lorg/ccil/cowan/tagsoup/ElementType;->theModel:I
		Lorg/ccil/cowan/tagsoup/ElementType;->theName:Ljava/lang/String;
		Lorg/ccil/cowan/tagsoup/ElementType;->theNamespace:Ljava/lang/String;
		Lorg/ccil/cowan/tagsoup/ElementType;->theParent:Lorg/ccil/cowan/tagsoup/ElementType;
		Lorg/ccil/cowan/tagsoup/ElementType;->theSchema:Lorg/ccil/cowan/tagsoup/Schema;
		Lorg/ccil/cowan/tagsoup/Schema;->theElementTypes:Ljava/util/HashMap;
		Lorg/ccil/cowan/tagsoup/Schema;->theEntities:Ljava/util/HashMap;
		Lorg/ccil/cowan/tagsoup/Schema;->thePrefix:Ljava/lang/String;
		Lorg/ccil/cowan/tagsoup/Schema;->theRoot:Lorg/ccil/cowan/tagsoup/ElementType;
		Lorg/ccil/cowan/tagsoup/Schema;->theURI:Ljava/lang/String;
		Lorg/json/JSONArray;->values:Ljava/util/List;
		Lorg/json/JSONArray;->writeTo(Lorg/json/JSONStringer;)V
		Lorg/json/JSONObject;->append(Ljava/lang/String;Ljava/lang/Object;)Lorg/json/JSONObject;

core/java/android/app/Notification.java

+38 −16

Original line number	Diff line number	Diff line
		@@ -6601,22 +6601,33 @@ public class Notification implements Parcelable
		* Helper class for generating large-format notifications that include multiple back-and-forth
		* messages of varying types between any number of people.
		*
		* <br>
		* <p>
		* If the platform does not provide large-format notifications, this method has no effect. The
		* user will always see the normal notification view.
		* <br>
		* This class is a "rebuilder": It attaches to a Builder object and modifies its behavior, like
		* so:
		*
		* <p>
		* If the app is targeting Android P and above, it is required to use the {@link Person}
		* class in order to get an optimal rendering of the notification and its avatars. For
		* conversations involving multiple people, the app should also make sure that it marks the
		* conversation as a group with {@link #setGroupConversation(boolean)}.
		*
		* <p>
		* This class is a "rebuilder": It attaches to a Builder object and modifies its behavior.
		* Here's an example of how this may be used:
		* <pre class="prettyprint">
		*
		* Person user = new Person.Builder().setIcon(userIcon).setName(userName).build();
		* MessagingStyle style = new MessagingStyle(user)
		* .addMessage(messages[1].getText(), messages[1].getTime(), messages[1].getPerson())
		* .addMessage(messages[2].getText(), messages[2].getTime(), messages[2].getPerson())
		* .setGroupConversation(hasMultiplePeople());
		*
		* Notification noti = new Notification.Builder()
		* .setContentTitle("2 new messages wtih " + sender.toString())
		* .setContentTitle("2 new messages with " + sender.toString())
		* .setContentText(subject)
		* .setSmallIcon(R.drawable.new_message)
		* .setLargeIcon(aBitmap)
		* .setStyle(new Notification.MessagingStyle(resources.getString(R.string.reply_name))
		* .addMessage(messages[0].getText(), messages[0].getTime(), messages[0].getSender())
		* .addMessage(messages[1].getText(), messages[1].getTime(), messages[1].getSender()))
		* .setStyle(style)
		* .build();
		* </pre>
		*/
		@@ -6826,7 +6837,9 @@ public class Notification implements Parcelable
		}

		/**
		* Sets whether this conversation notification represents a group.
		* Sets whether this conversation notification represents a group. If the app is targeting
		* Android P, this is required if the app wants to display the largeIcon set with
		* {@link Notification.Builder#setLargeIcon(Bitmap)}, otherwise it will be hidden.
		*
		* @param isGroupConversation {@code true} if the conversation represents a group,
		* {@code false} otherwise.
		@@ -7048,13 +7061,22 @@ public class Notification implements Parcelable
		CharSequence conversationTitle = !TextUtils.isEmpty(super.mBigContentTitle)
		? super.mBigContentTitle
		: mConversationTitle;
		boolean isOneToOne = TextUtils.isEmpty(conversationTitle);
		boolean atLeastP = mBuilder.mContext.getApplicationInfo().targetSdkVersion
		>= Build.VERSION_CODES.P;
		boolean isOneToOne;
		CharSequence nameReplacement = null;
		Icon avatarReplacement = null;
		if (!atLeastP) {
		isOneToOne = TextUtils.isEmpty(conversationTitle);
		avatarReplacement = mBuilder.mN.mLargeIcon;
		if (hasOnlyWhiteSpaceSenders()) {
		isOneToOne = true;
		nameReplacement = conversationTitle;
		conversationTitle = null;
		}
		} else {
		isOneToOne = !isGroupConversation();
		}
		TemplateBindResult bindResult = new TemplateBindResult();
		RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(
		mBuilder.getMessagingLayoutResource(),
		@@ -7076,8 +7098,8 @@ public class Notification implements Parcelable
		mBuilder.getSecondaryTextColor());
		contentView.setBoolean(R.id.status_bar_latest_event_content, "setDisplayImagesAtEnd",
		displayImagesAtEnd);
		contentView.setIcon(R.id.status_bar_latest_event_content, "setLargeIcon",
		mBuilder.mN.mLargeIcon);
		contentView.setIcon(R.id.status_bar_latest_event_content, "setAvatarReplacement",
		avatarReplacement);
		contentView.setCharSequence(R.id.status_bar_latest_event_content, "setNameReplacement",
		nameReplacement);
		contentView.setBoolean(R.id.status_bar_latest_event_content, "setIsOneToOne",

core/java/android/app/WallpaperColors.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -144,13 +144,6 @@ public final class WallpaperColors implements Parcelable {
		* @param bitmap Source where to extract from.
		*/
		public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap) {
		return fromBitmap(bitmap, false /* computeHints */);
		}

		/**
		* @hide
		*/
		public static WallpaperColors fromBitmap(@NonNull Bitmap bitmap, boolean computeHints) {
		if (bitmap == null) {
		throw new IllegalArgumentException("Bitmap can't be null");
		}
		@@ -200,7 +193,7 @@ public final class WallpaperColors implements Parcelable {
		}
		}

		int hints = computeHints ? calculateDarkHints(bitmap) : 0;
		int hints = calculateDarkHints(bitmap);

		if (shouldRecycle) {
		bitmap.recycle();