diff options
| author | Diogo Ferreira <deovferreira@gmail.com> | 2012-03-10 21:05:13 +0300 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-03-10 21:05:13 +0300 |
| commit | bcab1a93e45a667eec405dec396c442f2acf16ad (patch) | |
| tree | 10e10f43a7ed6fe9054f00337f78e2efeb7c2f97 | |
| parent | 0f2b75d1963ec954bb950ddd47e2f7b556955c42 (diff) | |
| parent | 6bfebbb0c615bf6de4b3596c40c439f1d9adde1f (diff) | |
| download | frameworks_base-bcab1a93e45a667eec405dec396c442f2acf16ad.zip frameworks_base-bcab1a93e45a667eec405dec396c442f2acf16ad.tar.gz frameworks_base-bcab1a93e45a667eec405dec396c442f2acf16ad.tar.bz2 | |
Merge "Add @hide to new fields/methods" into ics
| -rw-r--r-- | core/java/android/app/Profile.java | 3 | ||||
| -rw-r--r-- | core/java/android/app/ProfileGroup.java | 3 | ||||
| -rw-r--r-- | core/java/android/app/ProfileManager.java | 8 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/core/java/android/app/Profile.java b/core/java/android/app/Profile.java index ba965d7..83367e6 100644 --- a/core/java/android/app/Profile.java +++ b/core/java/android/app/Profile.java @@ -33,6 +33,9 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; +/** + * @hide + */ public final class Profile implements Parcelable { private String mName; diff --git a/core/java/android/app/ProfileGroup.java b/core/java/android/app/ProfileGroup.java index 503b550..b3b70d6 100644 --- a/core/java/android/app/ProfileGroup.java +++ b/core/java/android/app/ProfileGroup.java @@ -31,6 +31,9 @@ import android.util.Log; import java.io.IOException; import java.util.UUID; +/** + * @hide + */ public final class ProfileGroup implements Parcelable { private static final String TAG = "ProfileGroup"; diff --git a/core/java/android/app/ProfileManager.java b/core/java/android/app/ProfileManager.java index aacd651..f9713ae 100644 --- a/core/java/android/app/ProfileManager.java +++ b/core/java/android/app/ProfileManager.java @@ -26,12 +26,14 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.util.Log; -public class ProfileManager -{ +/** + * @hide + */ +public class ProfileManager { private static IProfileManager sService; - private Context mContext; + private Context mContext; private static final String TAG = "ProfileManager"; diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 254c45d..0d0402e 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1518,6 +1518,8 @@ public abstract class Context { * * @see #getSystemService * @see android.app.ProfileManager + * + * @hide */ public static final String PROFILE_SERVICE = "profile"; |