Roll back changes of Bugzilla bug 443374 and Bugzilla bug 443367

Change-Id: Icf332d2e2bedeebb6d4b2766a26b09c2ad3ba58b
Signed-off-by: zyang5e4 <zyyangbj@cn.ibm.com>

Author: zyyangbj

org.eclipse.paho.android.service/org.eclipse.paho.android.service.sample/AndroidManifest.xml

@@ -12,7 +12,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
 
     <application
         android:allowBackup="true"

org.eclipse.paho.android.service/org.eclipse.paho.android.service.sample/src/org/eclipse/paho/android/service/sample/ClientConnections.java

@@ -306,9 +306,7 @@ private void connectAction(Bundle data) {
     }
     client.setCallback(new MqttCallbackHandler(this, clientHandle));
 
-    //setServiceNotificationCallback
-    client.setServiceNotificationCallback(MyMqttServiceNtfCallback.class);
-    
+   
     //set traceCallback
     client.setTraceCallback(new MqttTraceCallback());
 

org.eclipse.paho.android.service/org.eclipse.paho.android.service.sample/src/org/eclipse/paho/android/service/sample/MyMqttServiceNtfCallback.java

@@ -10,7 +10,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-	<uses-permission android:name="android.permission.GET_TASKS" />
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"

org.eclipse.paho.android.service/org.eclipse.paho.android.service.test/AndroidManifest.xml

@@ -144,7 +144,6 @@ public void onServiceDisconnected(ComponentName name) {
 	// The MqttCallback provided by the application
 	private MqttCallback callback;
 	private MqttTraceHandler traceCallback;
-	private String serviceNTFCallbackCls;
 
 	//The acknowledgment that a message has been processed by the application
 	private Ack messageAck;
@@ -417,15 +416,7 @@ private void doConnect() {
 		}
 		mqttService.setTraceEnabled(traceEnabled);
 		mqttService.setTraceCallbackId(clientHandle);
-		mqttService.setAppRunning(true);
-		//store the app package name and service notification callback class
-		if (this.serviceNTFCallbackCls!=null) {
-			ServiceNotificationCallbackStore store=mqttService.getServiceNTFCallbackStore();
-			if(store!=null) {
-				store.setAppServiceNTFCallbackClass(mqttService.getApplicationInfo().packageName, serviceNTFCallbackCls);
-			}
-		}
-
+		
 		String activityToken = storeToken(connectToken);
 		try {
 			mqttService.connect(clientHandle, connectOptions, null,
@@ -1052,16 +1043,6 @@ public void setCallback(MqttCallback callback) {
 
 	}
 
-	/**
-	 * Using this API, the end user can setup customized notification callback for MqttService
-	 * This callback is only used when the applications is dead and the service is restarted
-	 * @param callback is the Class which implements org.eclipse.paho.android.service.MqttServiceNotificationCallback
-	 */
-	public <T extends MqttServiceNotificationCallback> void setServiceNotificationCallback(Class<T> callback) {
-		this.serviceNTFCallbackCls=callback.getName();
-		Log.i("MqttAndroidClient","MqttService Notification Callback Class="+this.serviceNTFCallbackCls);
-	}
-
 	/**
 	 * identify the callback to be invoked when making tracing calls back into
 	 * the Activity

org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/DatabaseServiceNotificationCallbackStore.java

@@ -860,28 +860,14 @@ public void messageArrived(String topic, MqttMessage message)
 
 		String messageId = service.messageStore.storeArrived(clientHandle,
 				topic, message);
-
-		/**
-		 * if app is running, let's callback to activity if app is dead, let's
-		 * use service callback
-		 */
-		Log.i("MqttConnection","Get a message="+new String(message.getPayload()));
-		//only if app running, call back to Activity
-		if (service.isAppRunning()) {		
+	
 		Bundle resultBundle = messageToBundle(messageId, topic, message);
 		resultBundle.putString(MqttServiceConstants.CALLBACK_ACTION,
 				MqttServiceConstants.MESSAGE_ARRIVED_ACTION);
 		resultBundle.putString(MqttServiceConstants.CALLBACK_MESSAGE_ID,
 				messageId);
 		service.callbackToActivity(clientHandle, Status.OK, resultBundle);
-		} 
-		else {
-		//otherwise, service will callback the service NTF callback
-		Log.i("MqttConnection",
-				"Notify message=" + new String(message.getPayload()));
-		service.callbackToNotification(topic, message);
-		}
-		
+				
 	}
 
 	/**
@@ -988,7 +974,7 @@ synchronized void reconnect() {
 			return;
 		}
 
-		if (disconnected) {
+		if (disconnected && !cleanSession) {
 			// use the activityToke the same with action connect
 			service.traceDebug(TAG,"Do Real Reconnect!");
 			final Bundle resultBundle = new Bundle();