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

Commit 1f5762e6 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

libutils clean-up 

Change-Id: I11ee943da23a66828455a9770fc3c5ceb4bbcaa9
parent 9f3e1175

cmds/system_server/library/system_init.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include <binder/IPCThreadState.h>

#include <binder/ProcessState.h>

#include <binder/IServiceManager.h>

#include <utils/TextOutput.h>

#include <binder/TextOutput.h>

#include <utils/Log.h>



#include <SurfaceFlinger.h>

core/jni/AndroidRuntime.cpp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include <utils/Log.h>

#include <utils/misc.h>

#include <binder/Parcel.h>

#include <utils/StringArray.h>

#include <utils/threads.h>

#include <cutils/properties.h>

core/jni/android_os_SystemClock.cpp

+51 −2
Original line number Diff line number Diff line
@@ -19,17 +19,66 @@ 
 * System clock functions.

 */



#ifdef HAVE_ANDROID_OS

#include <linux/ioctl.h>

#include <linux/rtc.h>

#include <utils/Atomic.h>

#include <linux/android_alarm.h>

#endif



#include <sys/time.h>

#include <limits.h>

#include <fcntl.h>

#include <errno.h>

#include <string.h>



#include "JNIHelp.h"

#include "jni.h"

#include "android_runtime/AndroidRuntime.h"



#include "utils/SystemClock.h"



#include <sys/time.h>

#include <time.h>



#include <utils/SystemClock.h>



namespace android {



/*

 * Set the current time.  This only works when running as root.

 */

static int setCurrentTimeMillis(int64_t millis)

{

    struct timeval tv;

    struct timespec ts;

    int fd;

    int res;

    int ret = 0;



    if (millis <= 0 || millis / 1000LL >= INT_MAX) {

        return -1;

    }



    tv.tv_sec = (time_t) (millis / 1000LL);

    tv.tv_usec = (suseconds_t) ((millis % 1000LL) * 1000LL);



    ALOGD("Setting time of day to sec=%d\n", (int) tv.tv_sec);



    fd = open("/dev/alarm", O_RDWR);

    if(fd < 0) {

        ALOGW("Unable to open alarm driver: %s\n", strerror(errno));

        return -1;

    }

    ts.tv_sec = tv.tv_sec;

    ts.tv_nsec = tv.tv_usec * 1000;

    res = ioctl(fd, ANDROID_ALARM_SET_RTC, &ts);

    if(res < 0) {

        ALOGW("Unable to set rtc to %ld: %s\n", tv.tv_sec, strerror(errno));

        ret = -1;

    }

    close(fd);

    return ret;

}



/*

 * native public static void setCurrentTimeMillis(long millis)

 *

core/jni/com_android_internal_content_NativeLibraryHelper.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <android_runtime/AndroidRuntime.h>



#include <utils/Log.h>

#include <utils/ZipFileRO.h>

#include <androidfw/ZipFileRO.h>

#include <ScopedUtfChars.h>



#include <zlib.h>

include/androidfw/AssetDir.h

+1 −1
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 
#ifndef __LIBS_ASSETDIR_H

#define __LIBS_ASSETDIR_H



#include <androidfw/misc.h>

#include <utils/String8.h>

#include <utils/Vector.h>

#include <utils/SortedVector.h>

#include <utils/misc.h>

#include <sys/types.h>



namespace android {