Snap for 4832339 from 9b1f560ee56e0c7538f6656a9459a905416509f0 to pi-release (b96cfb97) · Commits · e / os / android_frameworks_base

Android.mk

+9 −0

Original line number	Diff line number	Diff line
		@@ -374,6 +374,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

		LOCAL_MODULE := metalava-api-stubs
		LOCAL_DROIDDOC_USE_METALAVA := true
		LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
		LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
		LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual

		LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_stubs_current_intermediates/src

		@@ -445,6 +448,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

		LOCAL_MODULE := metalava-system-api-stubs
		LOCAL_DROIDDOC_USE_METALAVA := true
		LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
		LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
		LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual

		LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_system_stubs_current_intermediates/src

		@@ -518,6 +524,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES:=$(framework_docs_LOCAL_ADDITIONAL_DEPENDENCIES)

		LOCAL_MODULE := metalava-test-api-stubs
		LOCAL_DROIDDOC_USE_METALAVA := true
		LOCAL_DROIDDOC_METALAVA_PREVIOUS_API := prebuilts/sdk/api/27.txt
		LOCAL_DROIDDOC_METALAVA_ANNOTATIONS_ENABLED := true
		LOCAL_DROIDDOC_METALAVA_MERGE_ANNOTATIONS_DIR := tools/metalava/manual

		LOCAL_DROIDDOC_STUB_OUT_DIR := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/metalava_android_test_stubs_current_intermediates/src

config/hiddenapi-light-greylist.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -904,6 +904,7 @@ Landroid/app/ResultInfo;->mResultWho:Ljava/lang/String;
		Landroid/app/SearchableInfo$ActionKeyInfo;->getQueryActionMsg()Ljava/lang/String;
		Landroid/app/SearchableInfo$ActionKeyInfo;->getSuggestActionMsg()Ljava/lang/String;
		Landroid/app/SearchableInfo$ActionKeyInfo;->getSuggestActionMsgColumn()Ljava/lang/String;
		Landroid/app/SearchableInfo;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;Landroid/content/ComponentName;)V
		Landroid/app/SearchableInfo;->findActionKey(I)Landroid/app/SearchableInfo$ActionKeyInfo;
		Landroid/app/SearchableInfo;->getActivityContext(Landroid/content/Context;)Landroid/content/Context;
		Landroid/app/SearchableInfo;->getIconId()I
		@@ -1514,6 +1515,8 @@ Landroid/content/pm/IPackageInstallObserver2$Stub;->asInterface(Landroid/os/IBin
		Landroid/content/pm/IPackageInstallObserver2;->onPackageInstalled(Ljava/lang/String;ILjava/lang/String;Landroid/os/Bundle;)V
		Landroid/content/pm/IPackageInstallObserver2;->onUserActionRequired(Landroid/content/Intent;)V
		Landroid/content/pm/IPackageManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
		Landroid/content/pm/IPackageManager$Stub$Proxy;->checkUidPermission(Ljava/lang/String;I)I
		Landroid/content/pm/IPackageManager$Stub$Proxy;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String;
		Landroid/content/pm/IPackageManager$Stub$Proxy;->getInstalledPackages(II)Landroid/content/pm/ParceledListSlice;
		Landroid/content/pm/IPackageManager$Stub$Proxy;->getInstallLocation()I
		Landroid/content/pm/IPackageManager$Stub$Proxy;->getPackageInfo(Ljava/lang/String;II)Landroid/content/pm/PackageInfo;
		@@ -1534,6 +1537,7 @@ Landroid/content/pm/IPackageManager;->currentToCanonicalPackageNames([Ljava/lang
		Landroid/content/pm/IPackageManager;->deleteApplicationCacheFiles(Ljava/lang/String;Landroid/content/pm/IPackageDataObserver;)V
		Landroid/content/pm/IPackageManager;->enterSafeMode()V
		Landroid/content/pm/IPackageManager;->getApplicationEnabledSetting(Ljava/lang/String;I)I
		Landroid/content/pm/IPackageManager;->getAppOpPermissionPackages(Ljava/lang/String;)[Ljava/lang/String;
		Landroid/content/pm/IPackageManager;->getBlockUninstallForUser(Ljava/lang/String;I)Z
		Landroid/content/pm/IPackageManager;->getComponentEnabledSetting(Landroid/content/ComponentName;I)I
		Landroid/content/pm/IPackageManager;->getFlagsForUid(I)I
		@@ -1803,6 +1807,7 @@ Landroid/content/pm/UserInfo;->serialNumber:I
		Landroid/content/pm/VerifierInfo;-><init>(Ljava/lang/String;Ljava/security/PublicKey;)V
		Landroid/content/pm/XmlSerializerAndParser;->createFromXml(Lorg/xmlpull/v1/XmlPullParser;)Ljava/lang/Object;
		Landroid/content/pm/XmlSerializerAndParser;->writeAsXml(Ljava/lang/Object;Lorg/xmlpull/v1/XmlSerializer;)V
		Landroid/content/res/ApkAssets;->getAssetPath()Ljava/lang/String;
		Landroid/content/res/AssetFileDescriptor;->mFd:Landroid/os/ParcelFileDescriptor;
		Landroid/content/res/AssetFileDescriptor;->mLength:J
		Landroid/content/res/AssetFileDescriptor;->mStartOffset:J
		@@ -1814,6 +1819,7 @@ Landroid/content/res/AssetManager;->addAssetPathAsSharedLibrary(Ljava/lang/Strin
		Landroid/content/res/AssetManager;->addOverlayPath(Ljava/lang/String;)I
		Landroid/content/res/AssetManager;->applyStyle(JIILandroid/content/res/XmlBlock$Parser;[IJJ)V
		Landroid/content/res/AssetManager;->createTheme()J
		Landroid/content/res/AssetManager;->getApkAssets()[Landroid/content/res/ApkAssets;
		Landroid/content/res/AssetManager;->getAssignedPackageIdentifiers()Landroid/util/SparseArray;
		Landroid/content/res/AssetManager;->getGlobalAssetCount()I
		Landroid/content/res/AssetManager;->getGlobalAssetManagerCount()I

core/java/android/service/autofill/TextValueSanitizer.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
		* <p>For example, to remove spaces from groups of 4-digits in a credit card:
		*
		* <pre class="prettyprint">
		* new TextValueSanitizer(Pattern.compile("^(\\d{4})\\s?(\\d{4})\\s?(\\d{4})\\s?(\\d{4})$",
		* new TextValueSanitizer(Pattern.compile("^(\\d{4})\\s?(\\d{4})\\s?(\\d{4})\\s?(\\d{4})$"),
		* "$1$2$3$4")
		* </pre>
		*/

packages/SystemUI/src/com/android/keyguard/CarrierText.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -334,8 +334,10 @@ public class CarrierText extends TextView {
		break;

		case SimPermDisabled:
		carrierText = getContext().getText(
		R.string.keyguard_permanent_disabled_sim_message_short);
		carrierText = makeCarrierStringOnEmergencyCapable(
		getContext().getText(
		R.string.keyguard_permanent_disabled_sim_message_short),
		text);
		break;

		case SimMissingLocked:

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -482,8 +482,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
		iconTransformDistance = Math.min(iconTransformDistance, fullHeight);
		if (isLastChild) {
		fullHeight = Math.min(fullHeight, row.getMinHeight() - getIntrinsicHeight());
		iconTransformDistance = Math.min(iconTransformDistance,
		row.getMinHeight() - getIntrinsicHeight() * icon.getIconScale());
		iconTransformDistance = Math.min(iconTransformDistance, row.getMinHeight()
		- getIntrinsicHeight());
		}
		float viewEnd = viewStart + fullHeight;
		if (expandingAnimated && mAmbientState.getScrollY() == 0