android: making getSystemInfo compatible with older APIs

android: changing default version to 4.4.2 for new apps
rhomobile · Dec 21, 2017 · fef71de · fef71de
1 parent 9014a93
commit fef71de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java b/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
@@ -103,8 +103,6 @@
 import android.content.res.Configuration;
 import android.hardware.Camera;
 import android.net.ConnectivityManager;
-import android.net.LinkProperties;
-import android.net.Network;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.wifi.WifiInfo;
@@ -1659,10 +1657,8 @@ public static Map getSystemInfo() {
     		ret.put( "build.fingerprint", 			Build.FINGERPRINT );
     		ret.put( "build.version.release",		Build.VERSION.RELEASE );
     		ret.put( "build.version.incremental", 	Build.VERSION.INCREMENTAL );    		
-    		ret.put( "build.version.base_os",		Build.VERSION.BASE_OS );
     		ret.put( "build.version.codename",		Build.VERSION.CODENAME );
     		ret.put( "build.version.sdk",			String.valueOf(Build.VERSION.SDK_INT) );
-    		ret.put( "build.version.patch",			Build.VERSION.SECURITY_PATCH );
     		ret.put( "build.bootloader",			Build.BOOTLOADER );    		
     		ret.put( "build.device",				Build.DEVICE );
     		ret.put( "build.display",				Build.DISPLAY );
@@ -1695,7 +1691,7 @@ public static Map getSystemInfo() {
 
 			if ( pakInfo.reqFeatures != null ) {
 				for (FeatureInfo fi : pakInfo.reqFeatures ) {
-					pis.add( fi.name + ":v" + fi.version + ":gl" + fi.getGlEsVersion() );
+					pis.add( fi.name + ":flags" + fi.flags + ":gl" + fi.getGlEsVersion() );
 				}
 				ret.put( "package.features", TextUtils.join(",",pis) );
 				pis.clear();

diff --git a/res/generators/templates/application/build.yml b/res/generators/templates/application/build.yml
@@ -106,7 +106,7 @@ uwp:
 
 android:
   #manifest_template: 'AndroidManifest.erb'
-  version: 4.1.0
+  version: 4.4.2
   ## Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
   logcatFilter: APP:I StrictMode:I DEBUG:I *:E