drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7f8e3409: Merge change I816428ae into eclair

Browse Source 
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
  Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
This commit is contained in:
Swarna Kumar
2009-11-24 13:33:13 -08:00
committed by Android Git Automerger
parent 66358e24a6 7f8e34091e
commit 20342ca830
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ImfTest/tests/AndroidManifest.xml
View File

@ -18,6 +18,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.imftest.tests"> package="com.android.imftest.tests">
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<application> <application>
<uses-library android:name="android.test.runner" /> <uses-library android:name="android.test.runner" />
</application> </application>

7
tests/ImfTest/tests/src/com/android/imftest/samples/ImfBaseTestCase.java
View File

@ -17,6 +17,8 @@
package com.android.imftest.samples; package com.android.imftest.samples;
import android.app.Activity; import android.app.Activity;
import android.app.KeyguardManager;
import android.content.Context;
import android.os.SystemClock; import android.os.SystemClock;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
import android.view.KeyEvent; import android.view.KeyEvent;
@ -58,6 +60,11 @@ public abstract class ImfBaseTestCase<T extends Activity> extends Instrumentatio
mTargetActivity = launchActivity(TARGET_PACKAGE_NAME, mTargetActivityClass, null); mTargetActivity = launchActivity(TARGET_PACKAGE_NAME, mTargetActivityClass, null);
mExpectAutoPop = mTargetActivity.getResources().getBoolean(R.bool.def_expect_ime_autopop); mExpectAutoPop = mTargetActivity.getResources().getBoolean(R.bool.def_expect_ime_autopop);
mImm = InputMethodManager.getInstance(mTargetActivity); mImm = InputMethodManager.getInstance(mTargetActivity);
KeyguardManager keyguardManager =
(KeyguardManager) getInstrumentation().getContext().getSystemService(
Context.KEYGUARD_SERVICE);
keyguardManager.newKeyguardLock("imftest").disableKeyguard();
} }
// Utility test methods // Utility test methods