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

Commit 806c1310 authored by Neil Fuller's avatar Neil Fuller Committed by Android Git Automerger
Browse files

am e678391e: Merge "Rewriting android.text.format.Time without the native _tz... 

am e678391e: Merge "Rewriting android.text.format.Time without the native _tz functions" into lmp-dev

* commit 'e678391e0c101427057a7fa6651ab42c0202290b':
  Rewriting android.text.format.Time without the native _tz functions
parents c8deaffc 4c3ae427

core/java/android/text/format/Time.java

+562 −115

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/text/format/TimeFormatter.java

0 → 100644
+519 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/util/TimeFormatException.java

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ package android.util; 


public class TimeFormatException extends RuntimeException

{

    TimeFormatException(String s)



    /**

     * @hide

     */

    public TimeFormatException(String s)

    {

        super(s);

    }

core/jni/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES 


LOCAL_SRC_FILES:= \

	AndroidRuntime.cpp \

	Time.cpp \

	com_android_internal_content_NativeLibraryHelper.cpp \

	com_google_android_gles_jni_EGLImpl.cpp \

	com_google_android_gles_jni_GLImpl.cpp.arm \
@@ -81,7 +80,6 @@ LOCAL_SRC_FILES:= \ 
	android_net_NetUtils.cpp \

	android_net_TrafficStats.cpp \

	android_nio_utils.cpp \

	android_text_format_Time.cpp \

	android_util_AssetManager.cpp \

	android_util_Binder.cpp \

	android_util_EventLog.cpp \

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ extern int register_android_database_SQLiteConnection(JNIEnv* env); 
extern int register_android_database_SQLiteGlobal(JNIEnv* env);

extern int register_android_database_SQLiteDebug(JNIEnv* env);

extern int register_android_nio_utils(JNIEnv* env);

extern int register_android_text_format_Time(JNIEnv* env);

extern int register_android_os_Debug(JNIEnv* env);

extern int register_android_os_MessageQueue(JNIEnv* env);

extern int register_android_os_Parcel(JNIEnv* env);
@@ -1223,7 +1222,6 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_util_EventLog),

    REG_JNI(register_android_util_Log),

    REG_JNI(register_android_util_FloatMath),

    REG_JNI(register_android_text_format_Time),

    REG_JNI(register_android_content_AssetManager),

    REG_JNI(register_android_content_StringBlock),

    REG_JNI(register_android_content_XmlBlock),