Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 321e7246 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 

* commit '301e1def':
  Check in "current" system API files.
parents 9331dcb9 301e1def

Android.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -821,6 +821,11 @@ LOCAL_UNINSTALLABLE_MODULE := true 




include $(BUILD_DROIDDOC)

include $(BUILD_DROIDDOC)





# $(gen), i.e. framework.aidl, is also needed while building against the current stub.

$(full_target): $(framework_built) $(gen)

$(INTERNAL_PLATFORM_SYSTEM_API_FILE): $(full_target)

$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE))



# ====  check javadoc comments but don't generate docs ========

# ====  check javadoc comments but don't generate docs ========

include $(CLEAR_VARS)

include $(CLEAR_VARS)

api/system-current.txt

0 → 100644
+61326 −0

File added.

Preview size limit exceeded, changes collapsed.

api/system-removed.txt

0 → 100644
+66 −0
Original line number Original line Diff line number Diff line 
package android.media {



  public class AudioFormat {

    ctor public AudioFormat();

  }



}



package android.os {



  public final class PowerManager {

    method public void goToSleep(long);

    method public deprecated void userActivity(long, boolean);

    method public void wakeUp(long);

  }



  public class UserManager {

    method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);

    method public android.graphics.drawable.Drawable getBadgedIconForUser(android.graphics.drawable.Drawable, android.os.UserHandle);

    method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);

  }



}



package android.text.format {



  public class DateFormat {

    field public static final deprecated char AM_PM = 97; // 0x0061 'a'

    field public static final deprecated char CAPITAL_AM_PM = 65; // 0x0041 'A'

    field public static final deprecated char DATE = 100; // 0x0064 'd'

    field public static final deprecated char DAY = 69; // 0x0045 'E'

    field public static final deprecated char HOUR = 104; // 0x0068 'h'

    field public static final deprecated char HOUR_OF_DAY = 107; // 0x006b 'k'

    field public static final deprecated char MINUTE = 109; // 0x006d 'm'

    field public static final deprecated char MONTH = 77; // 0x004d 'M'

    field public static final deprecated char QUOTE = 39; // 0x0027 '\''

    field public static final deprecated char SECONDS = 115; // 0x0073 's'

    field public static final deprecated char STANDALONE_MONTH = 76; // 0x004c 'L'

    field public static final deprecated char TIME_ZONE = 122; // 0x007a 'z'

    field public static final deprecated char YEAR = 121; // 0x0079 'y'

  }



}



package android.view {



  public class View implements android.view.accessibility.AccessibilityEventSource android.graphics.drawable.Drawable.Callback android.view.KeyEvent.Callback {

    method protected void initializeFadingEdge(android.content.res.TypedArray);

    method protected void initializeScrollbars(android.content.res.TypedArray);

  }



  public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable {

    field public static final int TYPE_KEYGUARD = 2004; // 0x7d4

  }



}



package android.widget {



  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);

  }



}