Merge branch 'master' of git@github.com:vogella/vogella.git

vogella · vogella · commit 9d4644e44bc6 · 2013-08-01T17:33:53.000+02:00
diff --git a/de.vogella.android.ownservice.local/src/de/vogella/android/ownservice/local/MainActivity.java b/de.vogella.android.ownservice.local/src/de/vogella/android/ownservice/local/MainActivity.java
@@ -32,7 +32,7 @@ public void onCreate(Bundle savedInstanceState) {
 
 	@Override
 	protected void onResume() {
-		super.onPause();
+		super.onResume();
 		bindService(new Intent(this, LocalWordService.class), mConnection,
 				Context.BIND_AUTO_CREATE);
 	}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public void onCreate(Bundle savedInstanceState) {`
`32`	`32`
`33`	`33`	`@Override`
`34`	`34`	`protected void onResume() {`
`35`		`- super.onPause();`
	`35`	`+ super.onResume();`
`36`	`36`	`bindService(new Intent(this, LocalWordService.class), mConnection,`
`37`	`37`	`Context.BIND_AUTO_CREATE);`
`38`	`38`	`}`