diff options
Diffstat (limited to 'core/tests')
7 files changed, 59 insertions, 59 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java index b942eb6..cad030a 100644 --- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java +++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/AccessPointParserHelper.java @@ -252,26 +252,26 @@ public class AccessPointParserHelper { if (!validateEapValue(eapValue)) { throw new SAXException(); } - if (eapValue.equals("TLS")) { - config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS); - } else if (eapValue.equals("TTLS")) { - config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TTLS); - } else if (eapValue.equals("PEAP")) { - config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.PEAP); - } + if (eapValue.equals("TLS")) { + config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TLS); + } else if (eapValue.equals("TTLS")) { + config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.TTLS); + } else if (eapValue.equals("PEAP")) { + config.enterpriseConfig.setEapMethod(WifiEnterpriseConfig.Eap.PEAP); + } eap = false; } if (phase2) { String phase2Value = new String(ch, start, length); - if (phase2Value.equals("PAP")) { + if (phase2Value.equals("PAP")) { config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.PAP); - } else if (phase2Value.equals("MSCHAP")) { + } else if (phase2Value.equals("MSCHAP")) { config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.MSCHAP); - } else if (phase2Value.equals("MSCHAPV2")) { + } else if (phase2Value.equals("MSCHAPV2")) { config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.MSCHAPV2); - } else if (phase2Value.equals("GTC")) { + } else if (phase2Value.equals("GTC")) { config.enterpriseConfig.setPhase2Method(WifiEnterpriseConfig.Phase2.GTC); - } + } phase2 = false; } if (identity) { diff --git a/core/tests/coretests/src/android/app/TranslucentFancyActivity.java b/core/tests/coretests/src/android/app/TranslucentFancyActivity.java index ec5ad7a..35abaaa 100644 --- a/core/tests/coretests/src/android/app/TranslucentFancyActivity.java +++ b/core/tests/coretests/src/android/app/TranslucentFancyActivity.java @@ -53,7 +53,7 @@ public class TranslucentFancyActivity extends Activity * describe what is to be displayed in the screen. */ @Override - protected void onCreate(Bundle icicle) + protected void onCreate(Bundle icicle) { // Be sure to call the super class. super.onCreate(icicle); diff --git a/core/tests/coretests/src/android/app/activity/AbortReceiver.java b/core/tests/coretests/src/android/app/activity/AbortReceiver.java index fef1775..8d5c022 100644 --- a/core/tests/coretests/src/android/app/activity/AbortReceiver.java +++ b/core/tests/coretests/src/android/app/activity/AbortReceiver.java @@ -32,7 +32,7 @@ public class AbortReceiver extends BroadcastReceiver public void onReceive(Context context, Intent intent) { - //Log.i("AbortReceiver", "onReceiveIntent!"); + //Log.i("AbortReceiver", "onReceiveIntent!"); try { IBinder caller = intent.getIBinderExtra("caller"); Parcel data = Parcel.obtain(); diff --git a/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java b/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java index e969d10..9f402a5 100644 --- a/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java +++ b/core/tests/coretests/src/android/app/activity/RemoteSubActivityScreen.java @@ -24,19 +24,19 @@ import android.os.Process; import android.util.Log; public class RemoteSubActivityScreen extends SubActivityScreen { - Handler mHandler = new Handler(); - boolean mFirst = false; + Handler mHandler = new Handler(); + boolean mFirst = false; public RemoteSubActivityScreen() { } @Override public void onCreate(Bundle icicle) { - // We are running in a remote process, so want to have the sub-activity - // sending the result back in the original process. + // We are running in a remote process, so want to have the sub-activity + // sending the result back in the original process. Intent intent = getIntent(); - intent.setClass(this, SubActivityScreen.class); - + intent.setClass(this, SubActivityScreen.class); + super.onCreate(icicle); boolean kill = intent.getBooleanExtra("kill", false); @@ -44,16 +44,16 @@ public class RemoteSubActivityScreen extends SubActivityScreen { // + " kill=" + kill); if (kill) { - // After finishing initialization, kill the process! But only if - // this is the first time... - if (icicle == null) { - mHandler.post(new Runnable() { - public void run() { - handleBeforeStopping(); - Process.killProcess(Process.myPid()); - } - }); - } + // After finishing initialization, kill the process! But only if + // this is the first time... + if (icicle == null) { + mHandler.post(new Runnable() { + public void run() { + handleBeforeStopping(); + Process.killProcess(Process.myPid()); + } + }); + } } } } diff --git a/core/tests/coretests/src/android/app/activity/SubActivityScreen.java b/core/tests/coretests/src/android/app/activity/SubActivityScreen.java index 919c591..3caec7a 100644 --- a/core/tests/coretests/src/android/app/activity/SubActivityScreen.java +++ b/core/tests/coretests/src/android/app/activity/SubActivityScreen.java @@ -44,24 +44,24 @@ public class SubActivityScreen extends Activity { // Move on to the next thing that will generate a result... but only // if we are being launched for the first time. if (icicle == null) { - if (mMode == PENDING_RESULT_MODE) { - PendingIntent apr = createPendingResult(1, null, - Intent.FILL_IN_ACTION); - Intent res = new Intent(); + if (mMode == PENDING_RESULT_MODE) { + PendingIntent apr = createPendingResult(1, null, + Intent.FILL_IN_ACTION); + Intent res = new Intent(); res.putExtra("tkey", "tval"); res.setAction("test"); - try { - apr.send(this, RESULT_OK, res); - } catch (PendingIntent.CanceledException e) { - } - } else if (mMode < CHILD_OFFSET) { - Intent intent = new Intent(); - intent.setClass(this, SubActivityScreen.class); - intent.putExtra("mode", CHILD_OFFSET+mMode); - //System.out.println("*** Starting from onStart: " + intent); - startActivityForResult(intent, 1); - return; - } + try { + apr.send(this, RESULT_OK, res); + } catch (PendingIntent.CanceledException e) { + } + } else if (mMode < CHILD_OFFSET) { + Intent intent = new Intent(); + intent.setClass(this, SubActivityScreen.class); + intent.putExtra("mode", CHILD_OFFSET+mMode); + //System.out.println("*** Starting from onStart: " + intent); + startActivityForResult(intent, 1); + return; + } } } @@ -77,15 +77,15 @@ public class SubActivityScreen extends Activity { //Log.i("foo", "SubActivityScreen pid=" + Process.myPid() + " onResume"); if (mMode >= CHILD_OFFSET) { - // Wait a little bit, to give our parent time to kill itself - // if that is something it is into. - try { - Thread.sleep(500); - } catch (InterruptedException e) { - setResult(RESULT_CANCELED, (new Intent()).setAction("Interrupted!")); - finish(); - return; - } + // Wait a little bit, to give our parent time to kill itself + // if that is something it is into. + try { + Thread.sleep(500); + } catch (InterruptedException e) { + setResult(RESULT_CANCELED, (new Intent()).setAction("Interrupted!")); + finish(); + return; + } //System.out.println("Resuming sub-activity: mode=" + mMode); switch (mMode-CHILD_OFFSET) { case NO_RESULT_MODE: diff --git a/core/tests/coretests/src/android/database/DatabaseCursorTest.java b/core/tests/coretests/src/android/database/DatabaseCursorTest.java index 36f0f4b..08cd027 100644 --- a/core/tests/coretests/src/android/database/DatabaseCursorTest.java +++ b/core/tests/coretests/src/android/database/DatabaseCursorTest.java @@ -51,8 +51,8 @@ public class DatabaseCursorTest extends AndroidTestCase implements PerformanceTe @Override protected void setUp() throws Exception { super.setUp(); - File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE); - mDatabaseFile = new File(dbDir, "database_test.db"); + File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE); + mDatabaseFile = new File(dbDir, "database_test.db"); if (mDatabaseFile.exists()) { mDatabaseFile.delete(); diff --git a/core/tests/coretests/src/android/database/DatabaseStatementTest.java b/core/tests/coretests/src/android/database/DatabaseStatementTest.java index 512d5cd..895d715 100644 --- a/core/tests/coretests/src/android/database/DatabaseStatementTest.java +++ b/core/tests/coretests/src/android/database/DatabaseStatementTest.java @@ -41,8 +41,8 @@ public class DatabaseStatementTest extends AndroidTestCase implements Performanc @Override protected void setUp() throws Exception { super.setUp(); - File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE); - mDatabaseFile = new File(dbDir, "database_test.db"); + File dbDir = getContext().getDir("tests", Context.MODE_PRIVATE); + mDatabaseFile = new File(dbDir, "database_test.db"); if (mDatabaseFile.exists()) { mDatabaseFile.delete(); |