LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 21988 into donut

Browse Source 
* changes:
  Add OS version to ping service (win/mac only)
This commit is contained in:
Android (Google) Code Review
2009-08-19 16:20:22 -07:00
parent d271d9a503 1f49fa9b7c
commit a457ef41e8
1 changed files with 41 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/sdkstats/src/com/android/sdkstats/SdkStatsService.java
View File

@@ -44,6 +44,8 @@ import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.util.Random;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** Utility class to send "ping" usage reports to the server. */
public class SdkStatsService {
@@ -239,8 +241,16 @@ public class SdkStatsService {
String os = System.getProperty("os.name"); // $NON-NLS-1$
if (os.startsWith("Mac OS")) { // $NON-NLS-1$
os = "mac"; // $NON-NLS-1$
String osVers = getVersion();
if (osVers != null) {
os = os + "-" + osVers; // $NON-NLS-1$
}
} else if (os.startsWith("Windows")) { // $NON-NLS-1$
os = "win"; // $NON-NLS-1$
String osVers = getVersion();
if (osVers != null) {
os = os + "-" + osVers; // $NON-NLS-1$
}
} else if (os.startsWith("Linux")) { // $NON-NLS-1$
os = "linux"; // $NON-NLS-1$
} else {
@@ -271,6 +281,24 @@ public class SdkStatsService {
}
}
/**
* Returns the version of the os if it is defined as X.Y, or null otherwise.
* <p/>
* Example of returned versions can be found at http://lopica.sourceforge.net/os.html
* <p/>
* This method removes any exiting micro versions.
*/
private static String getVersion() {
Pattern p = Pattern.compile("(\\d+)\\.(\\d+).*"); // $NON-NLS-1$
String osVers = System.getProperty("os.version"); // $NON-NLS-1$
Matcher m = p.matcher(osVers);
if (m.matches()) {
return m.group(1) + "." + m.group(2); // $NON-NLS-1$
}
return null;
}
/**
* Prompt the user for whether they want to opt out of reporting.
* @return whether the user allows reporting (they do not opt out).