Snap for 7336869 from 646ce7eea20512d469fbd4f679fef50e1513883d to sc-release (a5d5476e) · Commits · e / os / android_frameworks_base

Android.bp

+1 −41

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ filegroup {
		name: "framework-non-updatable-sources",
		srcs: [
		// Java/AIDL sources under frameworks/base
		":framework-annotations",
		":framework-blobstore-sources",
		":framework-core-sources",
		":framework-drm-sources",
		@@ -387,47 +388,6 @@ platform_compat_config {
		src: ":framework-minus-apex",
		}

		filegroup {
		name: "framework-annotations",
		srcs: [
		"core/java/android/annotation/AnyThread.java",
		"core/java/android/annotation/AppIdInt.java",
		"core/java/android/annotation/BytesLong.java",
		"core/java/android/annotation/CallbackExecutor.java",
		"core/java/android/annotation/CallSuper.java",
		"core/java/android/annotation/CheckResult.java",
		"core/java/android/annotation/CurrentTimeMillisLong.java",
		"core/java/android/annotation/CurrentTimeSecondsLong.java",
		"core/java/android/annotation/DrawableRes.java",
		"core/java/android/annotation/DurationMillisLong.java",
		"core/java/android/annotation/Hide.java",
		"core/java/android/annotation/IntDef.java",
		"core/java/android/annotation/IntRange.java",
		"core/java/android/annotation/LongDef.java",
		"core/java/android/annotation/MainThread.java",
		"core/java/android/annotation/NonNull.java",
		"core/java/android/annotation/Nullable.java",
		"core/java/android/annotation/RequiresNoPermission.java",
		"core/java/android/annotation/RequiresPermission.java",
		"core/java/android/annotation/SdkConstant.java",
		"core/java/android/annotation/StringDef.java",
		"core/java/android/annotation/SystemApi.java",
		"core/java/android/annotation/SystemService.java",
		"core/java/android/annotation/TestApi.java",
		"core/java/android/annotation/UserIdInt.java",
		"core/java/android/annotation/WorkerThread.java",
		"core/java/com/android/internal/annotations/GuardedBy.java",
		"core/java/com/android/internal/annotations/Immutable.java",
		"core/java/com/android/internal/annotations/VisibleForTesting.java",
		],
		}

		java_library {
		name: "framework-annotations-lib",
		srcs: [":framework-annotations"],
		sdk_version: "core_current",
		}

		filegroup {
		name: "framework-ike-shared-srcs",
		visibility: ["//packages/modules/IPsec"],

core/api/current.txt

+4 −11

Original line number	Diff line number	Diff line
		@@ -586,7 +586,6 @@ package android {
		field public static final int dropDownWidth = 16843362; // 0x1010262
		field public static final int duplicateParentState = 16842985; // 0x10100e9
		field public static final int duration = 16843160; // 0x1010198
		field public static final int edgeEffectType;
		field public static final int editTextBackground = 16843602; // 0x1010352
		field public static final int editTextColor = 16843601; // 0x1010351
		field public static final int editTextPreferenceStyle = 16842898; // 0x1010092
		@@ -11921,6 +11920,7 @@ package android.content.pm {
		method public int getGwpAsanMode();
		method public int getMemtagMode();
		method public int getNativeHeapZeroInitialized();
		method public int getRequestRawExternalStorageAccess();
		method public boolean isProfileable();
		method public boolean isProfileableByShell();
		method public boolean isResourceOverlay();
		@@ -11976,6 +11976,9 @@ package android.content.pm {
		field public static final int MEMTAG_DEFAULT = -1; // 0xffffffff
		field public static final int MEMTAG_OFF = 0; // 0x0
		field public static final int MEMTAG_SYNC = 2; // 0x2
		field public static final int RAW_EXTERNAL_STORAGE_ACCESS_DEFAULT = 0; // 0x0
		field public static final int RAW_EXTERNAL_STORAGE_ACCESS_NOT_REQUESTED = 2; // 0x2
		field public static final int RAW_EXTERNAL_STORAGE_ACCESS_REQUESTED = 1; // 0x1
		field public static final int ZEROINIT_DEFAULT = -1; // 0xffffffff
		field public static final int ZEROINIT_DISABLED = 0; // 0x0
		field public static final int ZEROINIT_ENABLED = 1; // 0x1
		@@ -53791,7 +53794,6 @@ package android.widget {
		method public int getCheckedItemPosition();
		method public android.util.SparseBooleanArray getCheckedItemPositions();
		method public int getChoiceMode();
		method public int getEdgeEffectType();
		method public int getListPaddingBottom();
		method public int getListPaddingLeft();
		method public int getListPaddingRight();
		@@ -53833,7 +53835,6 @@ package android.widget {
		method public void setChoiceMode(int);
		method public void setDrawSelectorOnTop(boolean);
		method public void setEdgeEffectColor(@ColorInt int);
		method public void setEdgeEffectType(int);
		method public void setFastScrollAlwaysVisible(boolean);
		method public void setFastScrollEnabled(boolean);
		method public void setFastScrollStyle(int);
		@@ -54524,7 +54525,6 @@ package android.widget {
		method @ColorInt public int getColor();
		method public float getDistance();
		method public int getMaxHeight();
		method public int getType();
		method public boolean isFinished();
		method public void onAbsorb(int);
		method public void onPull(float);
		@@ -54534,10 +54534,7 @@ package android.widget {
		method public void setBlendMode(@Nullable android.graphics.BlendMode);
		method public void setColor(@ColorInt int);
		method public void setSize(int, int);
		method public void setType(int);
		field public static final android.graphics.BlendMode DEFAULT_BLEND_MODE;
		field public static final int TYPE_GLOW = 0; // 0x0
		field public static final int TYPE_STRETCH = 1; // 0x1
		}

		public class EditText extends android.widget.TextView {
		@@ -54842,7 +54839,6 @@ package android.widget {
		method public boolean executeKeyEvent(android.view.KeyEvent);
		method public void fling(int);
		method public boolean fullScroll(int);
		method public int getEdgeEffectType();
		method @ColorInt public int getLeftEdgeEffectColor();
		method public int getMaxScrollAmount();
		method @ColorInt public int getRightEdgeEffectColor();
		@@ -54850,7 +54846,6 @@ package android.widget {
		method public boolean isSmoothScrollingEnabled();
		method public boolean pageScroll(int);
		method public void setEdgeEffectColor(@ColorInt int);
		method public void setEdgeEffectType(int);
		method public void setFillViewport(boolean);
		method public void setLeftEdgeEffectColor(@ColorInt int);
		method public void setRightEdgeEffectColor(@ColorInt int);
		@@ -55736,7 +55731,6 @@ package android.widget {
		method public void fling(int);
		method public boolean fullScroll(int);
		method @ColorInt public int getBottomEdgeEffectColor();
		method public int getEdgeEffectType();
		method public int getMaxScrollAmount();
		method @ColorInt public int getTopEdgeEffectColor();
		method public boolean isFillViewport();
		@@ -55745,7 +55739,6 @@ package android.widget {
		method public void scrollToDescendant(@NonNull android.view.View);
		method public void setBottomEdgeEffectColor(@ColorInt int);
		method public void setEdgeEffectColor(@ColorInt int);
		method public void setEdgeEffectType(int);
		method public void setFillViewport(boolean);
		method public void setSmoothScrollingEnabled(boolean);
		method public void setTopEdgeEffectColor(@ColorInt int);

core/api/system-current.txt

+0 −1

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

		public class ApplicationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		method @Nullable public Boolean hasRequestRawExternalStorageAccess();
		method public boolean isEncryptionAware();
		method public boolean isInstantApp();
		method public boolean isOem();

core/api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -1810,6 +1810,7 @@ package android.os {

		public class VintfObject {
		method public static String[] getHalNamesAndVersions();
		method @NonNull public static String getPlatformSepolicyVersion();
		method public static String getSepolicyVersion();
		method public static Long getTargetFrameworkCompatibilityMatrixVersion();
		method public static java.util.Map<java.lang.String,java.lang.String[]> getVndkSnapshots();

core/java/Android.bp

+0 −39

Original line number	Diff line number	Diff line
		@@ -46,44 +46,6 @@ filegroup {
		"android/accounts/AccountsException.java",
		"android/accounts/AuthenticatorException.java",
		"android/accounts/OperationCanceledException.java",
		"android/annotation/AnimatorRes.java",
		"android/annotation/AnimRes.java",
		"android/annotation/AnyRes.java",
		"android/annotation/ArrayRes.java",
		"android/annotation/AttrRes.java",
		"android/annotation/BoolRes.java",
		"android/annotation/BroadcastBehavior.java",
		"android/annotation/CallbackExecutor.java",
		"android/annotation/CallSuper.java",
		"android/annotation/CheckResult.java",
		"android/annotation/ColorInt.java",
		"android/annotation/ColorRes.java",
		"android/annotation/DimenRes.java",
		"android/annotation/DrawableRes.java",
		"android/annotation/FontRes.java",
		"android/annotation/FractionRes.java",
		"android/annotation/IntDef.java",
		"android/annotation/IntegerRes.java",
		"android/annotation/IntRange.java",
		"android/annotation/LayoutRes.java",
		"android/annotation/NonNull.java",
		"android/annotation/Nullable.java",
		"android/annotation/PluralsRes.java",
		"android/annotation/RawRes.java",
		"android/annotation/RequiresNoPermission.java",
		"android/annotation/RequiresPermission.java",
		"android/annotation/SdkConstant.java",
		"android/annotation/Size.java",
		"android/annotation/StringDef.java",
		"android/annotation/StringRes.java",
		"android/annotation/StyleableRes.java",
		"android/annotation/StyleRes.java",
		"android/annotation/SuppressLint.java",
		"android/annotation/SystemApi.java",
		"android/annotation/SystemService.java",
		"android/annotation/TestApi.java",
		"android/annotation/UserIdInt.java",
		"android/annotation/XmlRes.java",
		"android/app/Application.java",
		"android/app/IApplicationThread.aidl",
		"android/app/IServiceConnection.aidl",
		@@ -124,7 +86,6 @@ filegroup {
		"android/util/AndroidException.java",
		"android/view/DisplayAdjustments.java",
		"android/view/ViewDebug.java",
		"com/android/internal/annotations/VisibleForTesting.java",
		],
		visibility: ["//frameworks/base/test-mock"],
		}