1.7.8: add ethernet check ota,and wakelock request before reboot.

AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="android.rockchip.update.service"
-      android:versionCode="34"
-      android:versionName="1.7.7">
+      android:versionCode="35"
+      android:versionName="1.7.8">
       
       <!-- Permission to show the UI for firmware update -->
     <permission android:name="android.rockchip.update.permission.SHOW_UI"

src/android/rockchip/update/service/RKUpdateReceiver.java

@@ -88,7 +88,8 @@ public class RKUpdateReceiver extends BroadcastReceiver
         	ConnectivityManager cmanger = (ConnectivityManager)context.getSystemService(context.CONNECTIVITY_SERVICE);
         	NetworkInfo netInfo = cmanger.getActiveNetworkInfo();
         	if(netInfo != null) {
-        		if(netInfo.getType() == ConnectivityManager.TYPE_WIFI && netInfo.isConnected()) {
+        		if((netInfo.getType() == ConnectivityManager.TYPE_WIFI || netInfo.getType() == ConnectivityManager.TYPE_ETHERNET)
+        				&& netInfo.isConnected()) {
 	        		serviceIntent = new Intent("android.rockchip.update.service");
 	                serviceIntent.putExtra("command", RKUpdateService.COMMAND_CHECK_REMOTE_UPDATING);
 	                serviceIntent.putExtra("delay", 5000);

src/android/rockchip/update/service/RKUpdateService.java

@@ -35,7 +35,7 @@ import android.widget.Toast;
 import android.os.SystemProperties;
 
 public class RKUpdateService extends Service {
-	public static final String VERSION = "1.7.7";
+	public static final String VERSION = "1.7.8";
 	private static final String TAG = "RKUpdateService";
     private static final boolean DEBUG = true;
 	private static final boolean mIsNotifyDialog = true;
@@ -48,14 +48,14 @@ public class RKUpdateService extends Service {
             Log.d(TAG, msg);  
         }
     }
-    
-    static {
+ 
+//    static {
         /*
          * Load the library.  If it's already loaded, this does nothing.
          */
-        System.loadLibrary("rockchip_update_jni");
-    }
-    
+//        System.loadLibrary("rockchip_update_jni");
+//    }
+
     public static String OTA_PACKAGE_FILE = "update.zip";
 	public static String RKIMAGE_FILE = "update.img";	
 	public static final int RKUPDATE_MODE = 1;
@@ -324,6 +324,7 @@ public class RKUpdateService extends Service {
             switch (msg.what) {
 
                 case COMMAND_CHECK_LOCAL_UPDATING:
+					/*
                     LOG("WorkHandler::handleMessage() : To perform 'COMMAND_CHECK_LOCAL_UPDATING'.");
 					if(mWorkHandleLocked){
 						LOG("WorkHandler::handleMessage() : locked !!!");
@@ -358,7 +359,7 @@ public class RKUpdateService extends Service {
                             return;
                         }
                     }
-                    
+                    */
                     break; 
                 case COMMAND_CHECK_REMOTE_UPDATING:
                 	if(mWorkHandleLocked){
@@ -479,9 +480,9 @@ public class RKUpdateService extends Service {
         return null;
     }
 
-    native private static String getImageVersion(String path);
+    //native private static String getImageVersion(String path);
 
-    native private static String getImageProductName(String path);
+    //native private static String getImageProductName(String path);
 
     private void startProposingActivity(String path, String imageVersion, String currentVersion) {
         Intent intent = new Intent();
@@ -494,7 +495,7 @@ public class RKUpdateService extends Service {
 
         mContext.startActivity(intent);
     }
-    
+   /* 
 	private boolean checkRKimage(String path){
 		String imageProductName = getImageProductName(path);
 		LOG("checkRKimage() : imageProductName = " + imageProductName);
@@ -508,7 +509,7 @@ public class RKUpdateService extends Service {
 			return false;
 		}	
 	} 
-
+*/
 	private String getOtaPackageFileName() {
 		String str = SystemProperties.get("ro.ota.packagename");	
 		if(str == null || str.length() == 0) {
@@ -599,6 +600,8 @@ public class RKUpdateService extends Service {
     }
     
     public static boolean getMultiUserState() {
+    	return true;
+    	/*
     	String multiUser = SystemProperties.get("ro.factory.hasUMS");
     	if(multiUser != null && multiUser.length() > 0) {
     		return !multiUser.equals("true");
@@ -609,7 +612,7 @@ public class RKUpdateService extends Service {
     		return multiUser.equals("1");
     	}
     	
-    	return false;
+    	return false;*/
     }
     
     private void startNotifyActivity() {

src/android/rockchip/update/service/UpdateAndRebootActivity.java

@@ -14,6 +14,7 @@ import java.lang.StringBuilder;
 import android.os.HandlerThread;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.PowerManager;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -35,6 +36,8 @@ public class UpdateAndRebootActivity extends Activity {
     static final String TAG = "UpdateAndRebootActivity";
     private Context mContext;
     private static final boolean DEBUG = true;
+    private static PowerManager.WakeLock mWakeLock;
+    private String WAKELOCK_KEY = "UpdateAndReboot";
 
     private static void LOG(String msg) {
         if ( DEBUG ) {
@@ -72,7 +75,11 @@ public class UpdateAndRebootActivity extends Activity {
                 android.R.drawable.ic_dialog_alert);
         setTitle(getString(R.string.updating_title));
         
-        TextView txt = (TextView)this.findViewById(R.id.notify);    
+        PowerManager powerManager = (PowerManager) this.getSystemService(this.POWER_SERVICE);
+    	mWakeLock = powerManager.newWakeLock(
+    			PowerManager.SCREEN_DIM_WAKE_LOCK|PowerManager.ACQUIRE_CAUSES_WAKEUP|PowerManager.ON_AFTER_RELEASE, WAKELOCK_KEY);
+        
+    	TextView txt = (TextView)this.findViewById(R.id.notify);    
         Button btn_ok = (Button)this.findViewById(R.id.button_ok);
 		Button btn_cancel = (Button)this.findViewById(R.id.button_cancel);
         
@@ -97,8 +104,20 @@ public class UpdateAndRebootActivity extends Activity {
         mContext.bindService(new Intent(mContext, RKUpdateService.class), mConnection, Context.BIND_AUTO_CREATE); 
     }
 
+	@Override
+	protected void onDestroy() {
+		LOG("onDestroy()");
+		if(mWakeLock != null) {
+			if(mWakeLock.isHeld()){
+				mWakeLock.release();
+			}
+		}
+		super.onDestroy();
+	}
+
 
-    @Override
+
+	@Override
     protected void onResume() {
         super.onResume();
     }
@@ -143,10 +162,13 @@ public class UpdateAndRebootActivity extends Activity {
                     	}else{
                     		//ota update mode
                     		if(!(mBinder.doesOtaPackageMatchProduct(mImageFilePath))){
+                    			mWakeLock.acquire(); //wakup to notify user.
                     			mUiHandler.sendEmptyMessage(UiHandler.COMMAND_START_CHECK_FAILD);
                     		}else{
+                    			mWakeLock.acquire(); //wakup to notify user.
                     			mBinder.updateFirmware(mImageFilePath, RKUpdateService.OTAUPDATE_MODE);
                     		}
+                    		
                     	}
                     }else {
                     	Log.d(TAG, "service have not connected!");