From d5a5b5a547462f3e7c6315a501909bce2418ba86 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Thu, 5 Jun 2014 17:14:39 -0700 Subject: [PATCH] Rename PrivateApi annotation to SystemApi. Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854 --- Android.mk | 2 +- .../{PrivateApi.java => SystemApi.java} | 21 ++++- .../content/pm/ContainerEncryptionParams.java | 4 +- .../android/content/pm/ManifestDigest.java | 4 +- .../android/content/pm/PackageManager.java | 82 +++++++++---------- .../NotificationListenerService.java | 6 +- .../android/telephony/TelephonyManager.java | 64 +++++++-------- 7 files changed, 98 insertions(+), 85 deletions(-) rename core/java/android/annotation/{PrivateApi.java => SystemApi.java} (51%) diff --git a/Android.mk b/Android.mk index 573f46a6dd850..a5746e479e23c 100644 --- a/Android.mk +++ b/Android.mk @@ -718,7 +718,7 @@ LOCAL_MODULE := private-api-stubs LOCAL_DROIDDOC_OPTIONS:=\ $(framework_docs_LOCAL_DROIDDOC_OPTIONS) \ -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_private_stubs_current_intermediates/src \ - -showAnnotation android.annotation.PrivateApi \ + -showAnnotation android.annotation.SystemApi \ -nodocs LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk diff --git a/core/java/android/annotation/PrivateApi.java b/core/java/android/annotation/SystemApi.java similarity index 51% rename from core/java/android/annotation/PrivateApi.java rename to core/java/android/annotation/SystemApi.java index 985eafec5d337..55028ebfa8fd0 100644 --- a/core/java/android/annotation/PrivateApi.java +++ b/core/java/android/annotation/SystemApi.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 The Android Open Source Project + * Copyright (C) 2014 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,29 @@ package android.annotation; +import static java.lang.annotation.ElementType.ANNOTATION_TYPE; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PACKAGE; +import static java.lang.annotation.ElementType.TYPE; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** - * Indicates an API is exposed for use by bundled applications. + * Indicates an API is exposed for use by bundled system applications. *

* These APIs are not guaranteed to remain consistent release-to-release, - * and are not for use by apps linking against the SDK. + * and are not for use by apps linking against the Android SDK. + *

+ * This annotation should only appear on API that is already marked 

@hide
. + *

+ * * @hide */ +@Target({TYPE, FIELD, METHOD, CONSTRUCTOR, ANNOTATION_TYPE, PACKAGE}) @Retention(RetentionPolicy.SOURCE) -public @interface PrivateApi { +public @interface SystemApi { } diff --git a/core/java/android/content/pm/ContainerEncryptionParams.java b/core/java/android/content/pm/ContainerEncryptionParams.java index dd1332bd47451..ab3aa27cfeb61 100644 --- a/core/java/android/content/pm/ContainerEncryptionParams.java +++ b/core/java/android/content/pm/ContainerEncryptionParams.java @@ -16,7 +16,7 @@ package android.content.pm; -import android.annotation.PrivateApi; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; @@ -35,7 +35,7 @@ import javax.crypto.spec.IvParameterSpec; * @deprecated encrypted containers are legacy. * @hide */ -@PrivateApi +@SystemApi @Deprecated public class ContainerEncryptionParams implements Parcelable { protected static final String TAG = "ContainerEncryptionParams"; diff --git a/core/java/android/content/pm/ManifestDigest.java b/core/java/android/content/pm/ManifestDigest.java index 943534fdec591..1fbef7a5d3c7e 100644 --- a/core/java/android/content/pm/ManifestDigest.java +++ b/core/java/android/content/pm/ManifestDigest.java @@ -16,7 +16,7 @@ package android.content.pm; -import android.annotation.PrivateApi; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; import android.util.Slog; @@ -37,7 +37,7 @@ import libcore.io.IoUtils; * * @hide */ -@PrivateApi +@SystemApi public class ManifestDigest implements Parcelable { private static final String TAG = "ManifestDigest"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index a34a1b6c2f0f9..550c1f1eb2b92 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -17,7 +17,7 @@ package android.content.pm; import android.annotation.IntDef; -import android.annotation.PrivateApi; +import android.annotation.SystemApi; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.app.PackageInstallObserver; @@ -370,7 +370,7 @@ public abstract class PackageManager { * {@link #installPackage(android.net.Uri, IPackageInstallObserver, int)} on success. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_SUCCEEDED = 1; /** @@ -379,7 +379,7 @@ public abstract class PackageManager { * already installed. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_ALREADY_EXISTS = -1; /** @@ -388,7 +388,7 @@ public abstract class PackageManager { * file is invalid. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_INVALID_APK = -2; /** @@ -397,7 +397,7 @@ public abstract class PackageManager { * is invalid. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_INVALID_URI = -3; /** @@ -406,7 +406,7 @@ public abstract class PackageManager { * service found that the device didn't have enough storage space to install the app. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_INSUFFICIENT_STORAGE = -4; /** @@ -415,7 +415,7 @@ public abstract class PackageManager { * package is already installed with the same name. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_DUPLICATE_PACKAGE = -5; /** @@ -424,7 +424,7 @@ public abstract class PackageManager { * the requested shared user does not exist. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_NO_SHARED_USER = -6; /** @@ -434,7 +434,7 @@ public abstract class PackageManager { * than the new package (and the old package's data was not removed). * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_UPDATE_INCOMPATIBLE = -7; /** @@ -444,7 +444,7 @@ public abstract class PackageManager { * device and does not have matching signature. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_SHARED_USER_INCOMPATIBLE = -8; /** @@ -453,7 +453,7 @@ public abstract class PackageManager { * the new package uses a shared library that is not available. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_MISSING_SHARED_LIBRARY = -9; /** @@ -462,7 +462,7 @@ public abstract class PackageManager { * the new package uses a shared library that is not available. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_REPLACE_COULDNT_DELETE = -10; /** @@ -472,7 +472,7 @@ public abstract class PackageManager { * either because there was not enough storage or the validation failed. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_DEXOPT = -11; /** @@ -482,7 +482,7 @@ public abstract class PackageManager { * that required by the package. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_OLDER_SDK = -12; /** @@ -492,7 +492,7 @@ public abstract class PackageManager { * same authority as a provider already installed in the system. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_CONFLICTING_PROVIDER = -13; /** @@ -502,7 +502,7 @@ public abstract class PackageManager { * that required by the package. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_NEWER_SDK = -14; /** @@ -513,7 +513,7 @@ public abstract class PackageManager { * flag. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_TEST_ONLY = -15; /** @@ -523,7 +523,7 @@ public abstract class PackageManager { * compatible with the device's CPU_ABI. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_CPU_ABI_INCOMPATIBLE = -16; /** @@ -532,7 +532,7 @@ public abstract class PackageManager { * the new package uses a feature that is not available. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_MISSING_FEATURE = -17; // ------ Errors related to sdcard @@ -542,7 +542,7 @@ public abstract class PackageManager { * a secure container mount point couldn't be accessed on external media. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_CONTAINER_ERROR = -18; /** @@ -552,7 +552,7 @@ public abstract class PackageManager { * location. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_INVALID_INSTALL_LOCATION = -19; /** @@ -562,7 +562,7 @@ public abstract class PackageManager { * location because the media is not available. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_MEDIA_UNAVAILABLE = -20; /** @@ -571,7 +571,7 @@ public abstract class PackageManager { * the new package couldn't be installed because the verification timed out. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_VERIFICATION_TIMEOUT = -21; /** @@ -580,7 +580,7 @@ public abstract class PackageManager { * the new package couldn't be installed because the verification did not succeed. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_VERIFICATION_FAILURE = -22; /** @@ -589,7 +589,7 @@ public abstract class PackageManager { * the package changed from what the calling program expected. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_PACKAGE_CHANGED = -23; /** @@ -615,7 +615,7 @@ public abstract class PackageManager { * '.apk' extension. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_NOT_APK = -100; /** @@ -624,7 +624,7 @@ public abstract class PackageManager { * if the parser was unable to retrieve the AndroidManifest.xml file. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_BAD_MANIFEST = -101; /** @@ -633,7 +633,7 @@ public abstract class PackageManager { * if the parser encountered an unexpected exception. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION = -102; /** @@ -642,7 +642,7 @@ public abstract class PackageManager { * if the parser did not find any certificates in the .apk. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_NO_CERTIFICATES = -103; /** @@ -651,7 +651,7 @@ public abstract class PackageManager { * if the parser found inconsistent certificates on the files in the .apk. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES = -104; /** @@ -661,7 +661,7 @@ public abstract class PackageManager { * files in the .apk. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_CERTIFICATE_ENCODING = -105; /** @@ -670,7 +670,7 @@ public abstract class PackageManager { * if the parser encountered a bad or missing package name in the manifest. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_BAD_PACKAGE_NAME = -106; /** @@ -679,7 +679,7 @@ public abstract class PackageManager { * if the parser encountered a bad shared user id name in the manifest. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_BAD_SHARED_USER_ID = -107; /** @@ -688,7 +688,7 @@ public abstract class PackageManager { * if the parser encountered some structural problem in the manifest. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_MANIFEST_MALFORMED = -108; /** @@ -698,7 +698,7 @@ public abstract class PackageManager { * in the manifest. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_PARSE_FAILED_MANIFEST_EMPTY = -109; /** @@ -707,7 +707,7 @@ public abstract class PackageManager { * if the system failed to install the package because of system issues. * @hide */ - @PrivateApi + @SystemApi public static final int INSTALL_FAILED_INTERNAL_ERROR = -110; /** @@ -2907,7 +2907,7 @@ public abstract class PackageManager { * instead. This method will continue to be supported but the older observer interface * will not get additional failure details. */ - // @PrivateApi + // @SystemApi public abstract void installPackage( Uri packageURI, IPackageInstallObserver observer, int flags, String installerPackageName); @@ -2942,7 +2942,7 @@ public abstract class PackageManager { * continue to be supported but the older observer interface will not get additional failure * details. */ - // @PrivateApi + // @SystemApi public abstract void installPackageWithVerification(Uri packageURI, IPackageInstallObserver observer, int flags, String installerPackageName, Uri verificationURI, ManifestDigest manifestDigest, @@ -3071,7 +3071,7 @@ public abstract class PackageManager { * on the system for other users, also install it for the calling user. * @hide */ - // @PrivateApi + // @SystemApi public abstract int installExistingPackage(String packageName) throws NameNotFoundException; @@ -3161,7 +3161,7 @@ public abstract class PackageManager { * * @hide */ - // @PrivateApi + // @SystemApi public abstract void deletePackage( String packageName, IPackageDeleteObserver observer, int flags); @@ -3230,7 +3230,7 @@ public abstract class PackageManager { * * @hide */ - // @PrivateApi + // @SystemApi public abstract void freeStorageAndNotify(long freeStorageSize, IPackageDataObserver observer); /** diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index 557f5a60b0955..fd475cd56eba0 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -16,7 +16,7 @@ package android.service.notification; -import android.annotation.PrivateApi; +import android.annotation.SystemApi; import android.annotation.SdkConstant; import android.app.INotificationManager; import android.app.Service; @@ -279,7 +279,7 @@ public abstract class NotificationListenerService extends Service { * @param currentUser the user to use as the stream filter * @hide */ - @PrivateApi + @SystemApi public void registerAsSystemService(ComponentName componentName, int currentUser) throws RemoteException { if (mWrapper == null) { @@ -297,7 +297,7 @@ public abstract class NotificationListenerService extends Service { * with (@link registerAsService). * @hide */ - @PrivateApi + @SystemApi public void unregisterAsSystemService() throws RemoteException { if (mWrapper != null) { INotificationManager noMan = getNotificationInterface(); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index ffa9a4ea42780..3f65bcaa0cd2c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -16,7 +16,7 @@ package android.telephony; -import android.annotation.PrivateApi; +import android.annotation.SystemApi; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.content.ComponentName; @@ -1961,11 +1961,11 @@ public class TelephonyManager { } /** - * Expose the rest of ITelephony to @PrivateApi + * Expose the rest of ITelephony to @SystemApi */ /** @hide */ - @PrivateApi + @SystemApi public void dial(String number) { try { getITelephony().dial(number); @@ -1975,7 +1975,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public void call(String callingPackage, String number) { try { getITelephony().call(callingPackage, number); @@ -1985,7 +1985,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean showCallScreen() { try { getTelecommService().showCallScreen(false); @@ -1997,7 +1997,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean showCallScreenWithDialpad(boolean showDialpad) { try { getTelecommService().showCallScreen(showDialpad); @@ -2009,7 +2009,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean endCall() { try { return getITelephony().endCall(); @@ -2020,7 +2020,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public void answerRingingCall() { try { getITelephony().answerRingingCall(); @@ -2030,7 +2030,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public void silenceRinger() { try { getTelecommService().silenceRinger(); @@ -2040,7 +2040,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean isOffhook() { try { return getITelephony().isOffhook(); @@ -2051,7 +2051,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean isRinging() { try { return getITelephony().isRinging(); @@ -2062,7 +2062,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean isIdle() { try { return getITelephony().isIdle(); @@ -2073,7 +2073,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean isRadioOn() { try { return getITelephony().isRadioOn(); @@ -2084,7 +2084,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean isSimPinEnabled() { try { return getITelephony().isSimPinEnabled(); @@ -2095,7 +2095,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public void cancelMissedCallsNotification() { try { getITelephony().cancelMissedCallsNotification(); @@ -2105,7 +2105,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean supplyPin(String pin) { try { return getITelephony().supplyPin(pin); @@ -2116,7 +2116,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean supplyPuk(String puk, String pin) { try { return getITelephony().supplyPuk(puk, pin); @@ -2127,7 +2127,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public int[] supplyPinReportResult(String pin) { try { return getITelephony().supplyPinReportResult(pin); @@ -2138,7 +2138,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public int[] supplyPukReportResult(String puk, String pin) { try { return getITelephony().supplyPukReportResult(puk, pin); @@ -2149,7 +2149,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean handlePinMmi(String dialString) { try { return getITelephony().handlePinMmi(dialString); @@ -2160,7 +2160,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public void toggleRadioOnOff() { try { getITelephony().toggleRadioOnOff(); @@ -2170,7 +2170,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean setRadio(boolean turnOn) { try { return getITelephony().setRadio(turnOn); @@ -2181,7 +2181,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean setRadioPower(boolean turnOn) { try { return getITelephony().setRadioPower(turnOn); @@ -2192,7 +2192,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public void updateServiceLocation() { try { getITelephony().updateServiceLocation(); @@ -2202,7 +2202,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public int enableApnType(String type) { try { return getITelephony().enableApnType(type); @@ -2213,7 +2213,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public int disableApnType(String type) { try { return getITelephony().disableApnType(type); @@ -2224,7 +2224,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean enableDataConnectivity() { try { return getITelephony().enableDataConnectivity(); @@ -2235,7 +2235,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean disableDataConnectivity() { try { return getITelephony().disableDataConnectivity(); @@ -2246,7 +2246,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean isDataConnectivityPossible() { try { return getITelephony().isDataConnectivityPossible(); @@ -2257,7 +2257,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean needsOtaServiceProvisioning() { try { return getITelephony().needsOtaServiceProvisioning(); @@ -2268,7 +2268,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public void setDataEnabled(boolean enable) { try { getITelephony().setDataEnabled(enable); @@ -2278,7 +2278,7 @@ public class TelephonyManager { } /** @hide */ - @PrivateApi + @SystemApi public boolean getDataEnabled() { try { return getITelephony().getDataEnabled();