Merge "Fix self assignment bugs."
diff --git a/src/java/com/android/internal/telephony/HardwareConfig.java b/src/java/com/android/internal/telephony/HardwareConfig.java
index 0f855de..8623354 100644
--- a/src/java/com/android/internal/telephony/HardwareConfig.java
+++ b/src/java/com/android/internal/telephony/HardwareConfig.java
@@ -112,7 +112,7 @@
      * default constructor.
      */
     public HardwareConfig(int type) {
-        type = type;
+        this.type = type;
     }
 
     /**
@@ -152,7 +152,7 @@
         if (type == DEV_HARDWARE_TYPE_MODEM) {
             char[] bits = Integer.toBinaryString(ratBits).toCharArray();
             uuid = id;
-            state = state;
+            this.state = state;
             rilModel = model;
             rat = new BitSet(bits.length);
             for (int i = 0 ; i < bits.length ; i++) {
@@ -168,7 +168,7 @@
         if (type == DEV_HARDWARE_TYPE_SIM) {
             uuid = id;
             modemUuid = link;
-            state = state;
+            this.state = state;
         }
     }