From 3a32213c4029a03fe39486f3d6ebd0ea18928ee1 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Tue, 24 Nov 2009 00:30:52 -0500 Subject: Remove HardwareService and move vibrator support to VibratorService. The lights support is only needed by PowerManagerService and NotificationManagerService, so we do not need a Binder API for it. Move backlight and notification light support to new LightsService class. The camera flash is now handled directly by the camera HAL, so the flash Hardware service flash support is obsolete. Change-Id: I086d681f54668e7f7de3e8b90df3de19d59833c5 Signed-off-by: Mike Lockwood --- .../tests/HardwareServicePermissionTest.java | 120 --------------------- .../tests/VibratorServicePermissionTest.java | 86 +++++++++++++++ 2 files changed, 86 insertions(+), 120 deletions(-) delete mode 100644 tests/permission/src/com/android/framework/permission/tests/HardwareServicePermissionTest.java create mode 100644 tests/permission/src/com/android/framework/permission/tests/VibratorServicePermissionTest.java (limited to 'tests/permission') diff --git a/tests/permission/src/com/android/framework/permission/tests/HardwareServicePermissionTest.java b/tests/permission/src/com/android/framework/permission/tests/HardwareServicePermissionTest.java deleted file mode 100644 index 2290c1d..0000000 --- a/tests/permission/src/com/android/framework/permission/tests/HardwareServicePermissionTest.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (C) 2009 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 com.android.framework.permission.tests; - -import junit.framework.TestCase; - -import android.os.Binder; -import android.os.IHardwareService; -import android.os.RemoteException; -import android.os.ServiceManager; -import android.test.suitebuilder.annotation.SmallTest; - -/** - * Verify that Hardware apis cannot be called without required permissions. - */ -@SmallTest -public class HardwareServicePermissionTest extends TestCase { - - private IHardwareService mHardwareService; - - @Override - protected void setUp() throws Exception { - mHardwareService = IHardwareService.Stub.asInterface( - ServiceManager.getService("hardware")); - } - - /** - * Test that calling {@link android.os.IHardwareService#vibrate(long)} requires permissions. - *

Tests permission: - * {@link android.Manifest.permission#VIBRATE} - * @throws RemoteException - */ - public void testVibrate() throws RemoteException { - try { - mHardwareService.vibrate(2000, new Binder()); - fail("vibrate did not throw SecurityException as expected"); - } catch (SecurityException e) { - // expected - } - } - - /** - * Test that calling {@link android.os.IHardwareService#vibratePattern(long[], - * int, android.os.IBinder)} requires permissions. - *

Tests permission: - * {@link android.Manifest.permission#VIBRATE} - * @throws RemoteException - */ - public void testVibratePattern() throws RemoteException { - try { - mHardwareService.vibratePattern(new long[] {0}, 0, new Binder()); - fail("vibratePattern did not throw SecurityException as expected"); - } catch (SecurityException e) { - // expected - } - } - - /** - * Test that calling {@link android.os.IHardwareService#cancelVibrate()} requires permissions. - *

Tests permission: - * {@link android.Manifest.permission#VIBRATE} - * @throws RemoteException - */ - public void testCancelVibrate() throws RemoteException { - try { - mHardwareService.cancelVibrate(new Binder()); - fail("cancelVibrate did not throw SecurityException as expected"); - } catch (SecurityException e) { - // expected - } - } - - /** - * Test that calling {@link android.os.IHardwareService#setFlashlightEnabled(boolean)} - * requires permissions. - *

Tests permissions: - * {@link android.Manifest.permission#HARDWARE_TEST} - * {@link android.Manifest.permission#FLASHLIGHT} - * @throws RemoteException - */ - public void testSetFlashlightEnabled() throws RemoteException { - try { - mHardwareService.setFlashlightEnabled(true); - fail("setFlashlightEnabled did not throw SecurityException as expected"); - } catch (SecurityException e) { - // expected - } - } - - /** - * Test that calling {@link android.os.IHardwareService#enableCameraFlash(int)} requires - * permissions. - *

Tests permission: - * {@link android.Manifest.permission#HARDWARE_TEST} - * {@link android.Manifest.permission#CAMERA} - * @throws RemoteException - */ - public void testEnableCameraFlash() throws RemoteException { - try { - mHardwareService.enableCameraFlash(100); - fail("enableCameraFlash did not throw SecurityException as expected"); - } catch (SecurityException e) { - // expected - } - } -} diff --git a/tests/permission/src/com/android/framework/permission/tests/VibratorServicePermissionTest.java b/tests/permission/src/com/android/framework/permission/tests/VibratorServicePermissionTest.java new file mode 100644 index 0000000..274ac00 --- /dev/null +++ b/tests/permission/src/com/android/framework/permission/tests/VibratorServicePermissionTest.java @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2009 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 com.android.framework.permission.tests; + +import junit.framework.TestCase; + +import android.os.Binder; +import android.os.IVibratorService; +import android.os.RemoteException; +import android.os.ServiceManager; +import android.test.suitebuilder.annotation.SmallTest; + +/** + * Verify that Hardware apis cannot be called without required permissions. + */ +@SmallTest +public class VibratorServicePermissionTest extends TestCase { + + private IVibratorService mVibratorService; + + @Override + protected void setUp() throws Exception { + mVibratorService = IVibratorService.Stub.asInterface( + ServiceManager.getService("vibrator")); + } + + /** + * Test that calling {@link android.os.IVibratorService#vibrate(long)} requires permissions. + *

Tests permission: + * {@link android.Manifest.permission#VIBRATE} + * @throws RemoteException + */ + public void testVibrate() throws RemoteException { + try { + mVibratorService.vibrate(2000, new Binder()); + fail("vibrate did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /** + * Test that calling {@link android.os.IVibratorService#vibratePattern(long[], + * int, android.os.IBinder)} requires permissions. + *

Tests permission: + * {@link android.Manifest.permission#VIBRATE} + * @throws RemoteException + */ + public void testVibratePattern() throws RemoteException { + try { + mVibratorService.vibratePattern(new long[] {0}, 0, new Binder()); + fail("vibratePattern did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } + + /** + * Test that calling {@link android.os.IVibratorService#cancelVibrate()} requires permissions. + *

Tests permission: + * {@link android.Manifest.permission#VIBRATE} + * @throws RemoteException + */ + public void testCancelVibrate() throws RemoteException { + try { + mVibratorService.cancelVibrate(new Binder()); + fail("cancelVibrate did not throw SecurityException as expected"); + } catch (SecurityException e) { + // expected + } + } +} -- cgit v1.1