am 237cc15c: am 274b120f: Fix issue #2243096: Need to expose live wallpaper APIs in SDK

Merge commit '237cc15c171511e8c8ffe903c5d6f473593477b8' into eclair-mr2-plus-aosp

* commit '237cc15c171511e8c8ffe903c5d6f473593477b8':
  Fix issue #2243096: Need to expose live wallpaper APIs in SDK

core/java/android/app/WallpaperInfo.java

@@ -5,7 +5,6 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
@@ -24,7 +23,6 @@ import java.io.IOException;
 
 /**
  * This class is used to specify meta information of a wallpaper service.
- * @hide Live Wallpaper
  */
 public final class WallpaperInfo implements Parcelable {
     static final String TAG = "WallpaperInfo";

core/java/android/app/WallpaperManager.java

@@ -57,7 +57,6 @@ public class WallpaperManager {
     /**
      * Launch an activity for the user to pick the current global live
      * wallpaper.
-     * @hide Live Wallpaper
      */
     public static final String ACTION_LIVE_WALLPAPER_CHOOSER
             = "android.service.wallpaper.LIVE_WALLPAPER_CHOOSER";
@@ -395,7 +394,6 @@ public class WallpaperManager {
      * If the current wallpaper is a live wallpaper component, return the
      * information about that wallpaper.  Otherwise, if it is a static image,
      * simply return null.
-     * @hide Live Wallpaper
      */
     public WallpaperInfo getWallpaperInfo() {
         try {

core/java/android/service/wallpaper/WallpaperService.java

@@ -47,7 +47,6 @@ import android.view.WindowManagerImpl;
 /**
  * A wallpaper service is responsible for showing a live wallpaper behind
  * applications that would like to sit on top of it.
- * @hide Live Wallpaper
  */
 public abstract class WallpaperService extends Service {
     /**