diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2017-08-10 15:18:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-10 15:18:58 +0000 |
| commit | 5cb2d64b9b83bfce8f8f4f3dacbd434ab9e09f7e (patch) | |
| tree | 06ff1ce747af90793ffc0b3cd766d610c612e504 /core/java | |
| parent | af706b40de30a8623e18a585dfac35cc8b8a4be8 (diff) | |
| parent | f52db085e2e2e6279c83de9a3aeb774decd18513 (diff) | |
Merge "Fix handling of @removed APIs." into oc-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/SharedLibraryInfo.java | 3 | ||||
| -rw-r--r-- | core/java/android/provider/ContactsContract.java | 7 |
3 files changed, 0 insertions, 11 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 17648b244c81..adc6467e8ade 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3795,7 +3795,6 @@ public abstract class PackageManager { /** * @removed - * @hide */ public abstract boolean setInstantAppCookie(@Nullable byte[] cookie); diff --git a/core/java/android/content/pm/SharedLibraryInfo.java b/core/java/android/content/pm/SharedLibraryInfo.java index 5032e6a59a8b..7d301a3154f0 100644 --- a/core/java/android/content/pm/SharedLibraryInfo.java +++ b/core/java/android/content/pm/SharedLibraryInfo.java @@ -136,7 +136,6 @@ public final class SharedLibraryInfo implements Parcelable { } /** - * @hide * @removed */ public boolean isBuiltin() { @@ -144,7 +143,6 @@ public final class SharedLibraryInfo implements Parcelable { } /** - * @hide * @removed */ public boolean isDynamic() { @@ -152,7 +150,6 @@ public final class SharedLibraryInfo implements Parcelable { } /** - * @hide * @removed */ public boolean isStatic() { diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 70ef0355af8c..cc1c0677441e 100644 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -1878,7 +1878,6 @@ public final class ContactsContract { * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. * - * @hide * @removed */ @Deprecated @@ -2975,7 +2974,6 @@ public final class ContactsContract { * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. * - * @hide * @removed */ @Deprecated @@ -3414,7 +3412,6 @@ public final class ContactsContract { * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. * - * @hide * @removed */ @Deprecated @@ -3515,7 +3512,6 @@ public final class ContactsContract { * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. * - * @hide * @removed */ @Deprecated @@ -3568,7 +3564,6 @@ public final class ContactsContract { * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. * - * @hide * @removed */ @Deprecated @@ -3961,7 +3956,6 @@ public final class ContactsContract { * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. * - * @hide * @removed */ @Deprecated @@ -4002,7 +3996,6 @@ public final class ContactsContract { * @deprecated - Do not use. This will not be supported in the future. In the future, * cursors returned from related queries will be empty. * - * @hide * @removed */ @Deprecated |