commit 90e04479d55b5623a3949dbc9bf7fd31a90b3009
author Yang Liu <yangxliu@google.com> Thu Mar 19 10:51:58 2015 -0700
committer Yang Liu <yangxliu@google.com> Thu Mar 19 16:32:30 2015 -0700
tree 688f9eb8a9dc2b47cc8e2a6e88610add13d6da7e
parent 7cbb8b6c7fed8f49303675a78d0ef15d4736c6e6

Tel Test Script: Add support in Sl4A to get dBm value.

Change-Id: If4325e48b0be459f89895e763322e1e9d981204b

Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java b/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
index 02703d7..2fed019 100644
--- a/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/SignalStrengthFacade.java
@@ -18,7 +18,7 @@
 
 /**
  * Exposes SignalStrength functionality.
- * 
+ *
  * @author Joerg Zieren (joerg.zieren@gmail.com)
  */
 @RpcMinSdk(7)
@@ -28,9 +28,11 @@
   private final EventFacade mEventFacade;
   private final PhoneStateListener mPhoneStateListener;
   private Bundle mSignalStrengths;
+  private final int INVALID_VALUE = Integer.MIN_VALUE;
 
   public SignalStrengthFacade(FacadeManager manager) {
     super(manager);
+    mSignalStrengths = new Bundle();
     mService = manager.getService();
     mEventFacade = manager.getReceiver(EventFacade.class);
     mTelephonyManager =
@@ -41,13 +43,24 @@
         return new PhoneStateListener() {
           @Override
           public void onSignalStrengthsChanged(SignalStrength signalStrength) {
-            mSignalStrengths = new Bundle();
-            mSignalStrengths.putInt("gsm_signal_strength", signalStrength.getGsmSignalStrength());
-            mSignalStrengths.putInt("gsm_bit_error_rate", signalStrength.getGsmBitErrorRate());
-            mSignalStrengths.putInt("cdma_dbm", signalStrength.getCdmaDbm());
-            mSignalStrengths.putInt("cdma_ecio", signalStrength.getCdmaEcio());
-            mSignalStrengths.putInt("evdo_dbm", signalStrength.getEvdoDbm());
-            mSignalStrengths.putInt("evdo_ecio", signalStrength.getEvdoEcio());
+            mSignalStrengths.putInt("GsmSignalStrength", signalStrength.getGsmSignalStrength());
+            mSignalStrengths.putInt("GsmBitErrorRate", signalStrength.getGsmBitErrorRate());
+            mSignalStrengths.putInt("CdmaEcio", signalStrength.getCdmaEcio());
+            mSignalStrengths.putInt("EvdoDbm", signalStrength.getEvdoDbm());
+            mSignalStrengths.putInt("EvdoEcio", signalStrength.getEvdoEcio());
+            mSignalStrengths.putInt("LteSignalStrength", signalStrength.getLteSignalStrength());
+            mSignalStrengths.putInt("LteDbm", signalStrength.getLteDbm());
+            mSignalStrengths.putInt("LteLevel", signalStrength.getLteLevel());
+            mSignalStrengths.putInt("LteAsuLevel", signalStrength.getLteAsuLevel());
+            mSignalStrengths.putInt("Level", signalStrength.getLevel());
+            mSignalStrengths.putInt("AsuLevel", signalStrength.getAsuLevel());
+            mSignalStrengths.putInt("Dbm", signalStrength.getDbm());
+            mSignalStrengths.putInt("GsmDbm", signalStrength.getGsmDbm());
+            mSignalStrengths.putInt("GsmLevel", signalStrength.getGsmLevel());
+            mSignalStrengths.putInt("GsmAsuLevel", signalStrength.getGsmAsuLevel());
+            mSignalStrengths.putInt("CdmaLevel", signalStrength.getCdmaLevel());
+            mSignalStrengths.putInt("CdmaAsuLevel", signalStrength.getCdmaAsuLevel());
+            mSignalStrengths.putInt("CdmaDbm", signalStrength.getCdmaDbm());
             mEventFacade.postEvent("signal_strengths", mSignalStrengths.clone());
           }
         };
@@ -62,10 +75,28 @@
   }
 
   @Rpc(description = "Returns the current signal strengths.", returns = "A map of \"gsm_signal_strength\"")
-  public Bundle readSignalStrengths() {
+  public Bundle phoneGetSignalStrengthInfo() {
     return mSignalStrengths;
   }
 
+  @Rpc(description = "Returns current signal strength in dBm.")
+  public Integer phoneGetSignalStrengthDbm() {
+    Integer result = mSignalStrengths.getInt("Dbm", INVALID_VALUE);
+    return (result.equals(INVALID_VALUE)?null:result);
+  }
+
+  @Rpc(description = "Returns current signal strength in AsuLevel.")
+  public Integer phoneGetSignalStrengthAsu() {
+    Integer result = mSignalStrengths.getInt("AsuLevel", INVALID_VALUE);
+    return (result.equals(INVALID_VALUE)?null:result);
+  }
+
+  @Rpc(description = "Returns current signal strength in Level.")
+  public Integer phoneGetSignalStrengthLevel() {
+    Integer result = mSignalStrengths.getInt("Level", INVALID_VALUE);
+    return (result.equals(INVALID_VALUE)?null:result);
+  }
+
   @Rpc(description = "Stops tracking signal strength.")
   @RpcStopEvent("signal_strengths")
   public void stopTrackingSignalStrengths() {