Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into eclair (58a51bf7) · Commits · e / os / android_frameworks_base

cmds/am/src/com/android/commands/am/Am.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,8 @@ public class Am {

		if (op.equals("start")) {
		runStart();
		} else if (op.equals("startservice")) {
		runStartService();
		} else if (op.equals("instrument")) {
		runInstrument();
		} else if (op.equals("broadcast")) {
		@@ -179,6 +181,15 @@ public class Am {
		return intent;
		}

		private void runStartService() throws Exception {
		Intent intent = makeIntent();
		System.out.println("Starting service: " + intent);
		ComponentName cn = mAm.startService(null, intent, intent.getType());
		if (cn == null) {
		System.err.println("Error: Not found; no service started.");
		}
		}

		private void runStart() throws Exception {
		Intent intent = makeIntent();
		System.out.println("Starting: " + intent);
		@@ -492,6 +503,8 @@ public class Am {
		" start an Activity: am start [-D] <INTENT>\n" +
		" -D: enable debugging\n" +
		"\n" +
		" start a Service: am startservice <INTENT>\n" +
		"\n" +
		" send a broadcast Intent: am broadcast <INTENT>\n" +
		"\n" +
		" start an Instrumentation: am instrument [flags] <COMPONENT>\n" +

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,13 +109,13 @@ public class PhoneFactory {

		int phoneType = getPhoneType(networkMode);
		if (phoneType == Phone.PHONE_TYPE_GSM) {
		Log.i(LOG_TAG, "Creating GSMPhone");
		sProxyPhone = new PhoneProxy(new GSMPhone(context,
		sCommandsInterface, sPhoneNotifier));
		Log.i(LOG_TAG, "Creating GSMPhone");
		} else if (phoneType == Phone.PHONE_TYPE_CDMA) {
		Log.i(LOG_TAG, "Creating CDMAPhone");
		sProxyPhone = new PhoneProxy(new CDMAPhone(context,
		sCommandsInterface, sPhoneNotifier));
		Log.i(LOG_TAG, "Creating CDMAPhone");
		}

		sMadeDefaults = true;