am eb9cbb8f
: Resurrect flashlight support in obsolete IHardwareService Binder API.
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp * commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f': Resurrect flashlight support in obsolete IHardwareService Binder API.
This commit is contained in:
@ -117,7 +117,8 @@ 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/net/INetworkManagementEventObserver.aidl \
|
core/java/android/net/INetworkManagementEventObserver.aidl \
|
||||||
core/java/android/net/IThrottleManager.aidl \
|
core/java/android/net/IThrottleManager.aidl \
|
||||||
|
core/java/android/os/IHardwareService.aidl \
|
||||||
core/java/android/os/IMessenger.aidl \
|
core/java/android/os/IMessenger.aidl \
|
||||||
core/java/android/os/storage/IMountService.aidl \
|
core/java/android/os/storage/IMountService.aidl \
|
||||||
core/java/android/os/storage/IMountServiceListener.aidl \
|
core/java/android/os/storage/IMountServiceListener.aidl \
|
||||||
|
26
core/java/android/os/IHardwareService.aidl
Executable file
26
core/java/android/os/IHardwareService.aidl
Executable file
@ -0,0 +1,26 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2007, The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package android.os;
|
||||||
|
|
||||||
|
/** {@hide} */
|
||||||
|
interface IHardwareService
|
||||||
|
{
|
||||||
|
// obsolete flashlight support
|
||||||
|
boolean getFlashlightEnabled();
|
||||||
|
void setFlashlightEnabled(boolean on);
|
||||||
|
}
|
||||||
|
|
@ -17,10 +17,17 @@
|
|||||||
package com.android.server;
|
package com.android.server;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
|
import android.os.IHardwareService;
|
||||||
|
import android.os.ServiceManager;
|
||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.util.Slog;
|
import android.util.Slog;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
|
||||||
public class LightsService {
|
public class LightsService {
|
||||||
private static final String TAG = "LightsService";
|
private static final String TAG = "LightsService";
|
||||||
|
|
||||||
@ -124,11 +131,53 @@ public class LightsService {
|
|||||||
private boolean mFlashing;
|
private boolean mFlashing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* This class implements an obsolete API that was removed after eclair and re-added during the
|
||||||
|
* final moments of the froyo release to support flashlight apps that had been using the private
|
||||||
|
* IHardwareService API. This is expected to go away in the next release.
|
||||||
|
*/
|
||||||
|
private final IHardwareService.Stub mLegacyFlashlightHack = new IHardwareService.Stub() {
|
||||||
|
|
||||||
|
private static final String FLASHLIGHT_FILE = "/sys/class/leds/spotlight/brightness";
|
||||||
|
|
||||||
|
public boolean getFlashlightEnabled() {
|
||||||
|
try {
|
||||||
|
FileInputStream fis = new FileInputStream(FLASHLIGHT_FILE);
|
||||||
|
int result = fis.read();
|
||||||
|
fis.close();
|
||||||
|
return (result != '0');
|
||||||
|
} catch (Exception e) {
|
||||||
|
Slog.e(TAG, "getFlashlightEnabled failed", e);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setFlashlightEnabled(boolean on) {
|
||||||
|
if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.FLASHLIGHT)
|
||||||
|
!= PackageManager.PERMISSION_GRANTED &&
|
||||||
|
mContext.checkCallingOrSelfPermission(android.Manifest.permission.HARDWARE_TEST)
|
||||||
|
!= PackageManager.PERMISSION_GRANTED) {
|
||||||
|
throw new SecurityException("Requires FLASHLIGHT or HARDWARE_TEST permission");
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
FileOutputStream fos = new FileOutputStream(FLASHLIGHT_FILE);
|
||||||
|
byte[] bytes = new byte[2];
|
||||||
|
bytes[0] = (byte)(on ? '1' : '0');
|
||||||
|
bytes[1] = '\n';
|
||||||
|
fos.write(bytes);
|
||||||
|
fos.close();
|
||||||
|
} catch (Exception e) {
|
||||||
|
Slog.e(TAG, "setFlashlightEnabled failed", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
LightsService(Context context) {
|
LightsService(Context context) {
|
||||||
|
|
||||||
mNativePointer = init_native();
|
mNativePointer = init_native();
|
||||||
mContext = context;
|
mContext = context;
|
||||||
|
|
||||||
|
ServiceManager.addService("hardware", mLegacyFlashlightHack);
|
||||||
|
|
||||||
for (int i = 0; i < LIGHT_ID_COUNT; i++) {
|
for (int i = 0; i < LIGHT_ID_COUNT; i++) {
|
||||||
mLights[i] = new Light(i);
|
mLights[i] = new Light(i);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user