commit 6ac9a8d601c051915829de49bb7e754f8b8b4e23
author Shishir Agrawal <shishir@google.com> Fri Sep 05 17:17:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 05 17:17:58 2014 +0000
tree 5789f1d5792d3f9403196805fc9900fa4c547801
parent d8dd59afd8d1f1280cd15f8dc91d9b9436a9fe72
parent 42ccab8c0c87c6a78d77a0b031ae75d9ff9401a4

am bd026736: am f6b053a5: am e90b1315: Merge "IccOpenLogicalChannelResponse: Adding final to fa few constants." into lmp-dev

* commit 'bd026736b81ec9236d421f8d7702e84d2df4dc74':
  IccOpenLogicalChannelResponse: Adding final to fa few constants.

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index bd626a7..b7a02c6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28966,11 +28966,11 @@
     method public int getStatus();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator CREATOR;
-    field public static int INVALID_CHANNEL;
-    field public static int STATUS_MISSING_RESOURCE;
-    field public static int STATUS_NO_ERROR;
-    field public static int STATUS_NO_SUCH_ELEMENT;
-    field public static int STATUS_UNKNOWN_ERROR;
+    field public static final int INVALID_CHANNEL = -1; // 0xffffffff
+    field public static final int STATUS_MISSING_RESOURCE = 2; // 0x2
+    field public static final int STATUS_NO_ERROR = 1; // 0x1
+    field public static final int STATUS_NO_SUCH_ELEMENT = 3; // 0x3
+    field public static final int STATUS_UNKNOWN_ERROR = 4; // 0x4
   }
 
   public class NeighboringCellInfo implements android.os.Parcelable {

telephony/java/android/telephony/IccOpenLogicalChannelResponse.java

diff --git a/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java b/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java
index dbe38ea..4621f91 100644
--- a/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java
+++ b/telephony/java/android/telephony/IccOpenLogicalChannelResponse.java
@@ -27,7 +27,7 @@
     /**
      * Indicates an invalid channel.
      */
-    public static int INVALID_CHANNEL = -1;
+    public static final int INVALID_CHANNEL = -1;
 
     /**
      * Possible status values returned by open channel command.
@@ -37,10 +37,10 @@
      * STATUS_NO_SUCH_ELEMENT: AID not found on UICC.
      * STATUS_UNKNOWN_ERROR: Unknown error in open channel command.
      */
-    public static int STATUS_NO_ERROR = 1;
-    public static int STATUS_MISSING_RESOURCE = 2;
-    public static int STATUS_NO_SUCH_ELEMENT = 3;
-    public static int STATUS_UNKNOWN_ERROR = 4;
+    public static final int STATUS_NO_ERROR = 1;
+    public static final int STATUS_MISSING_RESOURCE = 2;
+    public static final int STATUS_NO_SUCH_ELEMENT = 3;
+    public static final int STATUS_UNKNOWN_ERROR = 4;
 
     private final int mChannel;
     private final int mStatus;