diff options
| author | Jerome Pilliet <pilliet@univ-mlv.fr> | 2012-12-17 11:24:28 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-10 20:36:31 -0800 |
| commit | 00bd78db3608a2ef72d8c2c11206e098c60ac11c (patch) | |
| tree | 4745a1c71f3889b3550ddae97cee99c07d550e63 /src/java/com/android/internal/telephony/gsm | |
| parent | aa6c52e0d52749b22b71df98279ea758a3945a79 (diff) | |
| download | frameworks_opt_telephony-00bd78db3608a2ef72d8c2c11206e098c60ac11c.zip frameworks_opt_telephony-00bd78db3608a2ef72d8c2c11206e098c60ac11c.tar.gz frameworks_opt_telephony-00bd78db3608a2ef72d8c2c11206e098c60ac11c.tar.bz2 | |
Some changes added to compile and run with Java 6 and Java 7.
- correction of errors with Javac 7:
- creation of empty classes.
Change-Id: I339ce56273025e389bb0f1cb3cc8450eca62ee11
Diffstat (limited to 'src/java/com/android/internal/telephony/gsm')
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GSMPhone.java | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java index 393d101..7806cd2 100644 --- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -160,40 +160,42 @@ public class GSMPhone extends PhoneBase { mCM.setOnUSSD(this, EVENT_USSD, null); mCM.setOnSuppServiceNotification(this, EVENT_SSN, null); mSST.registerForNetworkAttached(this, EVENT_REGISTERED_TO_NETWORK, null); - - if (false) { - try { - //debugSocket = new LocalServerSocket("com.android.internal.telephony.debug"); - debugSocket = new ServerSocket(); - debugSocket.setReuseAddress(true); - debugSocket.bind (new InetSocketAddress("127.0.0.1", 6666)); - - debugPortThread - = new Thread( - new Runnable() { - public void run() { - for(;;) { - try { - Socket sock; - sock = debugSocket.accept(); - Log.i(LOG_TAG, "New connection; resetting radio"); - mCM.resetRadio(null); - sock.close(); - } catch (IOException ex) { - Log.w(LOG_TAG, - "Exception accepting socket", ex); - } - } - } - }, - "GSMPhone debug"); - - debugPortThread.start(); - - } catch (IOException ex) { - Log.w(LOG_TAG, "Failure to open com.android.internal.telephony.debug socket", ex); - } - } + + // problem with javac 7 (create an empty class) + + // if (false) { + // try { + // //debugSocket = new LocalServerSocket("com.android.internal.telephony.debug"); + // debugSocket = new ServerSocket(); + // debugSocket.setReuseAddress(true); + // debugSocket.bind (new InetSocketAddress("127.0.0.1", 6666)); + // + // debugPortThread + // = new Thread( + // new Runnable() { + // public void run() { + // for(;;) { + // try { + // Socket sock; + // sock = debugSocket.accept(); + // Log.i(LOG_TAG, "New connection; resetting radio"); + // mCM.resetRadio(null); + // sock.close(); + // } catch (IOException ex) { + // Log.w(LOG_TAG, + // "Exception accepting socket", ex); + // } + // } + // } + // }, + // "GSMPhone debug"); + // + // debugPortThread.start(); + // + // } catch (IOException ex) { + // Log.w(LOG_TAG, "Failure to open com.android.internal.telephony.debug socket", ex); + // } + // } //Change the system property SystemProperties.set(TelephonyProperties.CURRENT_ACTIVE_PHONE, |