Merge changes from topic "predicates_aosp" (76c275e7) · Commits · e / os / android_frameworks_base

Android.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -371,7 +371,9 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		-knowntags ./frameworks/base/docs/knowntags.txt \
		-knowntags ./libcore/known_oj_tags.txt \
		-manifest ./frameworks/base/core/res/AndroidManifest.xml \
		-hidePackage com.android.okhttp \
		-hidePackage com.android.org.conscrypt \
		-hidePackage com.android.server \
		-since $(SRC_API_DIR)/1.xml 1 \
		-since $(SRC_API_DIR)/2.xml 2 \
		-since $(SRC_API_DIR)/3.xml 3 \
		@@ -399,7 +401,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \
		-since $(SRC_API_DIR)/25.txt 25 \
		-since $(SRC_API_DIR)/26.txt 26 \
		-since $(SRC_API_DIR)/27.txt 27 \
		-werror -lerror -hide 111 -hide 113 -hide 121 -hide 125 -hide 126 -hide 127 -hide 128 \
		-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 \
		-overview $(LOCAL_PATH)/core/java/overview.html \

		framework_docs_LOCAL_API_CHECK_ADDITIONAL_JAVA_DIR:= \

api/current.txt

+225 −340

File changed.

Preview size limit exceeded, changes collapsed.

api/removed.txt

+48 −10

Original line number	Diff line number	Diff line
		@@ -28,7 +28,11 @@ package android.app {
		public final deprecated class PictureInPictureArgs implements android.os.Parcelable {
		method public static android.app.PictureInPictureArgs convert(android.app.PictureInPictureParams);
		method public static android.app.PictureInPictureParams convert(android.app.PictureInPictureArgs);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int CONTENTS_FILE_DESCRIPTOR = 1; // 0x1
		field public static final android.os.Parcelable.Creator<android.app.PictureInPictureArgs> CREATOR;
		field public static final int PARCELABLE_WRITE_RETURN_VALUE = 1; // 0x1
		}

		public static class PictureInPictureArgs.Builder {
		@@ -79,6 +83,11 @@ package android.content {
		method public abstract java.io.File getSharedPreferencesPath(java.lang.String);
		}

		public class ContextWrapper extends android.content.Context {
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		}

		public class Intent implements java.lang.Cloneable android.os.Parcelable {
		field public static final deprecated java.lang.String EXTRA_QUICK_VIEW_ADVANCED = "android.intent.extra.QUICK_VIEW_ADVANCED";
		}
		@@ -201,10 +210,6 @@ package android.media {

		package android.media.tv {

		public final class TvInputManager {
		method public android.media.tv.TvInputManager.Hardware acquireTvInputHardware(int, android.media.tv.TvInputManager.HardwareCallback, android.media.tv.TvInputInfo);
		}

		public class TvView extends android.view.ViewGroup {
		method public void requestUnblockContent(android.media.tv.TvContentRating);
		}
		@@ -227,8 +232,17 @@ package android.net {
		field public static final int BADGING_SD = 10; // 0xa
		}

		public abstract class PskKeyManager {
		public static abstract class NetworkBadging.Badging implements java.lang.annotation.Annotation {
		}

		public abstract class PskKeyManager implements javax.net.ssl.KeyManager {
		ctor public PskKeyManager();
		method public java.lang.String chooseClientKeyIdentity(java.lang.String, java.net.Socket);
		method public java.lang.String chooseClientKeyIdentity(java.lang.String, javax.net.ssl.SSLEngine);
		method public java.lang.String chooseServerKeyIdentityHint(java.net.Socket);
		method public java.lang.String chooseServerKeyIdentityHint(javax.net.ssl.SSLEngine);
		method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, java.net.Socket);
		method public javax.crypto.SecretKey getKey(java.lang.String, java.lang.String, javax.net.ssl.SSLEngine);
		field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
		field public static final int MAX_IDENTITY_LENGTH_BYTES = 128; // 0x80
		field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100
		@@ -319,6 +333,8 @@ package android.provider {
		field public static final java.lang.String TITLE = "title";
		field public static final java.lang.String URL = "url";
		field public static final java.lang.String VISITS = "visits";
		field public static final java.lang.String _COUNT = "_count";
		field public static final java.lang.String _ID = "_id";
		}

		public static class Browser.SearchColumns implements android.provider.BaseColumns {
		@@ -326,18 +342,24 @@ package android.provider {
		field public static final java.lang.String DATE = "date";
		field public static final java.lang.String SEARCH = "search";
		field public static final deprecated java.lang.String URL = "url";
		field public static final java.lang.String _COUNT = "_count";
		field public static final java.lang.String _ID = "_id";
		}

		public static final deprecated class ContactsContract.Contacts.StreamItems {
		public static final deprecated class ContactsContract.Contacts.StreamItems implements android.provider.ContactsContract.StreamItemsColumns {
		field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items";
		}

		public static final deprecated class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns {
		public static final deprecated class ContactsContract.RawContacts.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {
		field public static final deprecated java.lang.String CONTENT_DIRECTORY = "stream_items";
		field public static final java.lang.String _COUNT = "_count";
		field public static final java.lang.String _ID = "_id";
		}

		public static final deprecated class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns {
		public static final deprecated class ContactsContract.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {
		field public static final deprecated java.lang.String PHOTO = "photo";
		field public static final java.lang.String _COUNT = "_count";
		field public static final java.lang.String _ID = "_id";
		}

		protected static abstract deprecated interface ContactsContract.StreamItemPhotosColumns {
		@@ -351,19 +373,23 @@ package android.provider {
		field public static final deprecated java.lang.String SYNC4 = "stream_item_photo_sync4";
		}

		public static final deprecated class ContactsContract.StreamItems implements android.provider.BaseColumns {
		public static final deprecated class ContactsContract.StreamItems implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemsColumns {
		field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item";
		field public static final deprecated android.net.Uri CONTENT_LIMIT_URI;
		field public static final deprecated android.net.Uri CONTENT_PHOTO_URI;
		field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item";
		field public static final deprecated android.net.Uri CONTENT_URI;
		field public static final deprecated java.lang.String MAX_ITEMS = "max_items";
		field public static final java.lang.String _COUNT = "_count";
		field public static final java.lang.String _ID = "_id";
		}

		public static final deprecated class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns {
		public static final deprecated class ContactsContract.StreamItems.StreamItemPhotos implements android.provider.BaseColumns android.provider.ContactsContract.StreamItemPhotosColumns {
		field public static final deprecated java.lang.String CONTENT_DIRECTORY = "photo";
		field public static final deprecated java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/stream_item_photo";
		field public static final deprecated java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/stream_item_photo";
		field public static final java.lang.String _COUNT = "_count";
		field public static final java.lang.String _ID = "_id";
		}

		protected static abstract deprecated interface ContactsContract.StreamItemsColumns {
		@@ -418,9 +444,15 @@ package android.speech.tts {

		package android.test.mock {

		public class MockContext extends android.content.Context {
		method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
		method public java.io.File getSharedPreferencesPath(java.lang.String);
		}

		public deprecated class MockPackageManager extends android.content.pm.PackageManager {
		method public deprecated java.lang.String getDefaultBrowserPackageName(int);
		method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);
		method public boolean setInstantAppCookie(byte[]);
		}

		}
		@@ -450,6 +482,7 @@ package android.text.style {
		public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
		ctor public RasterizerSpan(android.graphics.Rasterizer);
		method public android.graphics.Rasterizer getRasterizer();
		method public void updateDrawState(android.text.TextPaint);
		}

		}
		@@ -504,6 +537,11 @@ package android.webkit {

		package android.widget {

		public class ListView extends android.widget.AbsListView {
		method protected <T extends android.view.View> T findViewTraversal(int);
		method protected <T extends android.view.View> T findViewWithTagTraversal(java.lang.Object);
		}

		public class TextView extends android.view.View implements android.view.ViewTreeObserver.OnPreDrawListener {
		method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int);
		method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray);

api/system-current.txt

+3513 −76138

File changed.

Preview size limit exceeded, changes collapsed.

api/system-removed.txt

+15 −471

File changed.

Preview size limit exceeded, changes collapsed.