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

Commit 4c42d0bd authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'froyo' into froyo-release

parents 9e5773a0 6d00151c

Android.mk

+9 −1
Original line number Diff line number Diff line
@@ -406,11 +406,19 @@ web_docs_sample_code_flags := \ 
                -samplecode $(sample_dir)/SampleSyncAdapter \

                            resources/samples/SampleSyncAdapter "Sample Sync Adapter" \

		-samplecode $(sample_dir)/SearchableDictionary \

		            resources/samples/SearchableDictionary "Searchable Dictionary" \

		            resources/samples/SearchableDictionary "Searchable Dictionary v2" \

		-samplecode $(sample_dir)/Snake \

		            resources/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            resources/samples/SoftKeyboard "Soft Keyboard" \

		-samplecode $(sample_dir)/Spinner  \

		            resources/samples/Spinner "Spinner" \

		-samplecode $(sample_dir)/SpinnerTest \

		            resources/samples/SpinnerTest "SpinnerTest" \

		-samplecode $(sample_dir)/TicTacToeLib  \

		            resources/samples/TicTacToeLib "TicTacToeLib" \

		-samplecode $(sample_dir)/TicTacToeMain \

		            resources/samples/TicTacToeMain "TicTacToeMain" \

		-samplecode $(sample_dir)/Wiktionary \

		            resources/samples/Wiktionary "Wiktionary" \

		-samplecode $(sample_dir)/WiktionarySimple \

core/java/android/os/Process.java

+18 −0
Original line number Diff line number Diff line
@@ -747,6 +747,24 @@ public class Process { 
     */

    public static final native void sendSignal(int pid, int signal);

    

    /**

     * @hide

     * Private impl for avoiding a log message...  DO NOT USE without doing

     * your own log, or the Android Illuminati will find you some night and

     * beat you up.

     */

    public static final void killProcessQuiet(int pid) {

        sendSignalQuiet(pid, SIGNAL_KILL);

    }



    /**

     * @hide

     * Private impl for avoiding a log message...  DO NOT USE without doing

     * your own log, or the Android Illuminati will find you some night and

     * beat you up.

     */

    public static final native void sendSignalQuiet(int pid, int signal);

    

    /** @hide */

    public static final native long getFreeMemory();

core/jni/android_util_Process.cpp

+9 −1
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ jboolean android_os_Process_setOomAdj(JNIEnv* env, jobject clazz, 
            sprintf(text, "%d", adj);

            write(fd, text, strlen(text));

            close(fd);

            return true;

        }

        return true;

    }

#endif

    return false;
@@ -797,6 +797,13 @@ void android_os_Process_sendSignal(JNIEnv* env, jobject clazz, jint pid, jint si 
    }

}



void android_os_Process_sendSignalQuiet(JNIEnv* env, jobject clazz, jint pid, jint sig)

{

    if (pid > 0) {

        kill(pid, sig);

    }

}



static jlong android_os_Process_getElapsedCpuTime(JNIEnv* env, jobject clazz)

{

    struct timespec ts;
@@ -854,6 +861,7 @@ static const JNINativeMethod methods[] = { 
    {"setUid", "(I)I", (void*)android_os_Process_setUid},

    {"setGid", "(I)I", (void*)android_os_Process_setGid},

    {"sendSignal", "(II)V", (void*)android_os_Process_sendSignal},

    {"sendSignalQuiet", "(II)V", (void*)android_os_Process_sendSignalQuiet},

    {"supportsProcesses", "()Z", (void*)android_os_Process_supportsProcesses},

    {"getFreeMemory", "()J", (void*)android_os_Process_getFreeMemory},

    {"readProcLines", "(Ljava/lang/String;[Ljava/lang/String;[J)V", (void*)android_os_Process_readProcLines},

core/res/res/values/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -71,6 +71,20 @@ 
        <item>@drawable/indicator_code_lock_point_area_default</item>

        <item>@drawable/indicator_code_lock_point_area_green</item>

        <item>@drawable/indicator_code_lock_point_area_red</item>

        <!-- SlidingTab drawables shared by InCallScreen and LockScreen -->

        <item>@drawable/jog_tab_bar_left_end_confirm_gray</item>

        <item>@drawable/jog_tab_bar_left_end_normal</item>

        <item>@drawable/jog_tab_bar_left_end_pressed</item>

        <item>@drawable/jog_tab_bar_right_end_confirm_gray</item>

        <item>@drawable/jog_tab_bar_right_end_normal</item>

        <item>@drawable/jog_tab_bar_right_end_pressed</item>

        <item>@drawable/jog_tab_left_confirm_gray</item>

        <item>@drawable/jog_tab_left_normal</item>

        <item>@drawable/jog_tab_left_pressed</item>

        <item>@drawable/jog_tab_right_confirm_gray</item>

        <item>@drawable/jog_tab_right_normal</item>

        <item>@drawable/jog_tab_right_pressed</item>

        <item>@drawable/jog_tab_target_gray</item>

    </array>



    <!-- Do not translate. These are all of the color state list resources that should be

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2257,7 +2257,7 @@ 


    <!-- Strings for tethered notification -->

    <!-- Shown when the device is tethered -->

    <string name="tethered_notification_title">Tethering active</string>

    <string name="tethered_notification_title">Tethering or hotspot active</string>

    <string name="tethered_notification_message">Touch to configure</string>



    <!-- Strings for throttling notification -->