commit 2c29ea4ede3152ed5aff705bdcce3c444b3c208d
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 20 20:42:57 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 20 20:42:57 2013 -0700
tree 5dd203f4c3aa08dbe3a0fee1ae1447f70c106315
parent 54619fa6721b774c04be313f325f5fd031fd0dbf
parent 4a6ad41fdb0aadc6343dbd5fce72af237581ebc2

Merge "Replace sysdev path"

fmapp/src/com/codeaurora/fmradio/FMTransmitterConfigReceiver.java

diff --git a/fmapp/src/com/codeaurora/fmradio/FMTransmitterConfigReceiver.java b/fmapp/src/com/codeaurora/fmradio/FMTransmitterConfigReceiver.java
index 2abd3ca..d64852a 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMTransmitterConfigReceiver.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMTransmitterConfigReceiver.java
@@ -36,6 +36,7 @@
 import android.util.Log;
 import android.os.SystemProperties;
 import java.io.FileReader;
+import java.io.File;
 import java.lang.String;
 
 
@@ -57,7 +58,12 @@
             if ("msm7630_surf".equals(SystemProperties.get("ro.board.platform"))) {
                 Log.d(TAG,"this is msm7630_surf");
                 try {
-                    socinfo_fd = new FileReader("/sys/devices/system/soc/soc0/build_id");
+                    File f = new File("/sys/devices/soc0/build_id");
+                    if (f.exists()) {
+                        socinfo_fd = new FileReader("/sys/devices/soc0/build_id");
+                    } else {
+                        socinfo_fd = new FileReader("/sys/devices/system/soc/soc0/build_id");
+                    }
                     socinfo_fd.read(socinfo,0,20);
                     socinfo_fd.close();
                 } catch(Exception e) {

fmapp2/src/com/caf/fmradio/FMTransmitterConfigReceiver.java

diff --git a/fmapp2/src/com/caf/fmradio/FMTransmitterConfigReceiver.java b/fmapp2/src/com/caf/fmradio/FMTransmitterConfigReceiver.java
index 4f15188..b20a57d 100644
--- a/fmapp2/src/com/caf/fmradio/FMTransmitterConfigReceiver.java
+++ b/fmapp2/src/com/caf/fmradio/FMTransmitterConfigReceiver.java
@@ -36,6 +36,7 @@
 import android.util.Log;
 import android.os.SystemProperties;
 import java.io.FileReader;
+import java.io.File;
 import java.lang.String;
 
 
@@ -57,7 +58,12 @@
             if ("msm7630_surf".equals(SystemProperties.get("ro.board.platform"))) {
                 Log.d(TAG,"this is msm7630_surf");
                 try {
-                    socinfo_fd = new FileReader("/sys/devices/system/soc/soc0/build_id");
+                    File f = new File("/sys/devices/soc0/build_id");
+                    if (f.exists()) {
+                        socinfo_fd = new FileReader("/sys/devices/soc0/build_id");
+                    } else {
+                        socinfo_fd = new FileReader("/sys/devices/system/soc/soc0/build_id");
+                    }
                     socinfo_fd.read(socinfo,0,20);
                     socinfo_fd.close();
                 } catch(Exception e) {