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

Commit 30348b0d authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I086d681f into eclair-mr2 

* changes:
  Remove HardwareService and move vibrator support to VibratorService.
parents 1565d2ef 3a32213c

Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,13 +108,13 @@ LOCAL_SRC_FILES += \ 
	core/java/android/hardware/ISensorService.aidl \

	core/java/android/hardware/ISensorService.aidl \

	core/java/android/net/IConnectivityManager.aidl \

	core/java/android/net/IConnectivityManager.aidl \

	core/java/android/os/ICheckinService.aidl \

	core/java/android/os/ICheckinService.aidl \

	core/java/android/os/IHardwareService.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/IMessenger.aidl \

	core/java/android/os/IMountService.aidl \

	core/java/android/os/IMountService.aidl \

	core/java/android/os/INetStatService.aidl \

	core/java/android/os/INetStatService.aidl \

	core/java/android/os/IParentalControlCallback.aidl \

	core/java/android/os/IParentalControlCallback.aidl \

	core/java/android/os/IPermissionController.aidl \

	core/java/android/os/IPermissionController.aidl \

	core/java/android/os/IPowerManager.aidl \

	core/java/android/os/IPowerManager.aidl \

	core/java/android/os/IVibratorService.aidl \

    core/java/android/service/wallpaper/IWallpaperConnection.aidl \

    core/java/android/service/wallpaper/IWallpaperConnection.aidl \

    core/java/android/service/wallpaper/IWallpaperEngine.aidl \

    core/java/android/service/wallpaper/IWallpaperEngine.aidl \

    core/java/android/service/wallpaper/IWallpaperService.aidl \

    core/java/android/service/wallpaper/IWallpaperService.aidl \

core/java/android/os/IHardwareService.aidl→core/java/android/os/IVibratorService.aidl

+1 −10
Original line number Original line Diff line number Diff line
@@ -17,19 +17,10 @@ 
package android.os;

package android.os;





/** {@hide} */

/** {@hide} */

interface IHardwareService

interface IVibratorService

{

{

    // Vibrator support

    void vibrate(long milliseconds, IBinder token);

    void vibrate(long milliseconds, IBinder token);

    void vibratePattern(in long[] pattern, int repeat, IBinder token);

    void vibratePattern(in long[] pattern, int repeat, IBinder token);

    void cancelVibrate(IBinder token);

    void cancelVibrate(IBinder token);



    // flashlight support

    boolean getFlashlightEnabled();

    void setFlashlightEnabled(boolean on);

    void enableCameraFlash(int milliseconds);



    // for the phone

    void setAttentionLight(boolean on, int color);

}

}

core/java/android/os/Vibrator.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -23,14 +23,14 @@ package android.os; 
 */

 */

public class Vibrator

public class Vibrator

{

{

    IHardwareService mService;

    IVibratorService mService;

    private final Binder mToken = new Binder();

    private final Binder mToken = new Binder();





    /** @hide */

    /** @hide */

    public Vibrator()

    public Vibrator()

    {

    {

        mService = IHardwareService.Stub.asInterface(

        mService = IVibratorService.Stub.asInterface(

                ServiceManager.getService("hardware"));

                ServiceManager.getService("vibrator"));

    }

    }





    /**

    /**

core/jni/Android.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,6 @@ LOCAL_SRC_FILES:= \ 
	android_os_SystemClock.cpp \

	android_os_SystemClock.cpp \

	android_os_SystemProperties.cpp \

	android_os_SystemProperties.cpp \

	android_os_UEventObserver.cpp \

	android_os_UEventObserver.cpp \

	android_os_Hardware.cpp \

	android_net_LocalSocketImpl.cpp \

	android_net_LocalSocketImpl.cpp \

	android_net_NetUtils.cpp \

	android_net_NetUtils.cpp \

	android_net_wifi_Wifi.cpp \

	android_net_wifi_Wifi.cpp \

core/jni/AndroidRuntime.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -130,7 +130,6 @@ extern int register_android_os_ParcelFileDescriptor(JNIEnv *env); 
extern int register_android_os_Power(JNIEnv *env);

extern int register_android_os_Power(JNIEnv *env);

extern int register_android_os_StatFs(JNIEnv *env);

extern int register_android_os_StatFs(JNIEnv *env);

extern int register_android_os_SystemProperties(JNIEnv *env);

extern int register_android_os_SystemProperties(JNIEnv *env);

extern int register_android_os_Hardware(JNIEnv* env);

extern int register_android_os_SystemClock(JNIEnv* env);

extern int register_android_os_SystemClock(JNIEnv* env);

extern int register_android_os_FileObserver(JNIEnv *env);

extern int register_android_os_FileObserver(JNIEnv *env);

extern int register_android_os_FileUtils(JNIEnv *env);

extern int register_android_os_FileUtils(JNIEnv *env);
@@ -1166,7 +1165,6 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_text_KeyCharacterMap),

    REG_JNI(register_android_text_KeyCharacterMap),

    REG_JNI(register_android_os_Process),

    REG_JNI(register_android_os_Process),

    REG_JNI(register_android_os_Binder),

    REG_JNI(register_android_os_Binder),

    REG_JNI(register_android_os_Hardware),

    REG_JNI(register_android_view_Display),

    REG_JNI(register_android_view_Display),

    REG_JNI(register_android_nio_utils),

    REG_JNI(register_android_nio_utils),

    REG_JNI(register_android_graphics_PixelFormat),

    REG_JNI(register_android_graphics_PixelFormat),