OSDN Git Service

cleanup mock-ril.
authorWink Saville <wink@google.com>
Wed, 4 Aug 2010 13:49:23 +0000 (06:49 -0700)
committerWink Saville <wink@google.com>
Wed, 4 Aug 2010 13:49:23 +0000 (06:49 -0700)
Remove old generated code and change Android.mk to not use
the old generated code.

Make enum RADIO_STATE_XXX more consistent with other enum
naming and name it RADIOSTATE_XXX.

Add the ril.h command numbers to the comments in ril.proto.

Change Request in mock_ril.js to use this instead of making a new object.

Regenerate the proto output files.

Change-Id: I077cd8c7168cf779ab76d9eef1fdf46beca898bc

15 files changed:
mock-ril/Android.mk
mock-ril/src/cpp/ctrl.pb.cpp [deleted file]
mock-ril/src/cpp/ctrl.pb.h [deleted file]
mock-ril/src/cpp/ril.pb.cpp [deleted file]
mock-ril/src/cpp/ril.pb.h [deleted file]
mock-ril/src/generated/cpp/ril.pb.cpp
mock-ril/src/generated/cpp/ril.pb.h
mock-ril/src/generated/desc/ctrl.desc
mock-ril/src/generated/desc/ril.desc
mock-ril/src/generated/java/com/android/internal/telephony/ril_proto/RilCmds.java
mock-ril/src/generated/java/com/android/internal/telephony/ril_proto/RilCtrlCmds.java
mock-ril/src/generated/python/ril_pb2.py
mock-ril/src/js/mock_ril.js
mock-ril/src/proto/ril.proto
mock-ril/src/python/tcs.py

index e8cc58c..ca66b30 100644 (file)
@@ -52,8 +52,8 @@ LOCAL_STATIC_LIBRARIES := \
 LOCAL_CFLAGS := -D_GNU_SOURCE -UNDEBUG -DGOOGLE_PROTOBUF_NO_RTTI -DRIL_SHLIB
 
 LOCAL_C_INCLUDES := \
 LOCAL_CFLAGS := -D_GNU_SOURCE -UNDEBUG -DGOOGLE_PROTOBUF_NO_RTTI -DRIL_SHLIB
 
 LOCAL_C_INCLUDES := \
-    $(src_cpp) \
-    $(gen_src_cpp) \
+    $(LOCAL_PATH)/$(src_cpp) \
+    $(LOCAL_PATH)/$(gen_src_cpp) \
     external/protobuf/src \
     external/v8/include \
     bionic \
     external/protobuf/src \
     external/v8/include \
     bionic \
diff --git a/mock-ril/src/cpp/ctrl.pb.cpp b/mock-ril/src/cpp/ctrl.pb.cpp
deleted file mode 100644 (file)
index bdd0a50..0000000
+++ /dev/null
@@ -1,348 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "ctrl.pb.h"
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace ril_proto {
-
-namespace {
-
-const ::google::protobuf::Descriptor* CtrlRspRadioState_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  CtrlRspRadioState_reflection_ = NULL;
-const ::google::protobuf::EnumDescriptor* CtrlCmd_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* CtrlStatus_descriptor_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_ctrl_2eproto() {
-  protobuf_AddDesc_ctrl_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "ctrl.proto");
-  GOOGLE_CHECK(file != NULL);
-  CtrlRspRadioState_descriptor_ = file->message_type(0);
-  static const int CtrlRspRadioState_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CtrlRspRadioState, state_),
-  };
-  CtrlRspRadioState_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      CtrlRspRadioState_descriptor_,
-      CtrlRspRadioState::default_instance_,
-      CtrlRspRadioState_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CtrlRspRadioState, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CtrlRspRadioState, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(CtrlRspRadioState));
-  CtrlCmd_descriptor_ = file->enum_type(0);
-  CtrlStatus_descriptor_ = file->enum_type(1);
-}
-
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
-inline void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_ctrl_2eproto);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    CtrlRspRadioState_descriptor_, &CtrlRspRadioState::default_instance());
-}
-
-}  // namespace
-
-void protobuf_ShutdownFile_ctrl_2eproto() {
-  delete CtrlRspRadioState::default_instance_;
-  delete CtrlRspRadioState_reflection_;
-}
-
-void protobuf_AddDesc_ctrl_2eproto() {
-  static bool already_here = false;
-  if (already_here) return;
-  already_here = true;
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::ril_proto::protobuf_AddDesc_ril_2eproto();
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\nctrl.proto\022\tril_proto\032\tril.proto\"9\n\021Ct"
-    "rlRspRadioState\022$\n\005state\030\001 \002(\0162\025.ril_pro"
-    "to.RadioState*:\n\007CtrlCmd\022\021\n\rCTRL_CMD_ECH"
-    "O\020\000\022\034\n\030CTRL_CMD_GET_RADIO_STATE\020\001*5\n\nCtr"
-    "lStatus\022\022\n\016CTRL_STATUS_OK\020\000\022\023\n\017CTRL_STAT"
-    "US_ERR\020\001B7\n(com.android.internal.telepho"
-    "ny.ril_protoB\013RilCtrlCmds", 265);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "ctrl.proto", &protobuf_RegisterTypes);
-  CtrlRspRadioState::default_instance_ = new CtrlRspRadioState();
-  CtrlRspRadioState::default_instance_->InitAsDefaultInstance();
-  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_ctrl_2eproto);
-}
-
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer_ctrl_2eproto {
-  StaticDescriptorInitializer_ctrl_2eproto() {
-    protobuf_AddDesc_ctrl_2eproto();
-  }
-} static_descriptor_initializer_ctrl_2eproto_;
-
-const ::google::protobuf::EnumDescriptor* CtrlCmd_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return CtrlCmd_descriptor_;
-}
-bool CtrlCmd_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* CtrlStatus_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return CtrlStatus_descriptor_;
-}
-bool CtrlStatus_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int CtrlRspRadioState::kStateFieldNumber;
-#endif  // !_MSC_VER
-
-CtrlRspRadioState::CtrlRspRadioState()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void CtrlRspRadioState::InitAsDefaultInstance() {
-}
-
-CtrlRspRadioState::CtrlRspRadioState(const CtrlRspRadioState& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void CtrlRspRadioState::SharedCtor() {
-  _cached_size_ = 0;
-  state_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-CtrlRspRadioState::~CtrlRspRadioState() {
-  SharedDtor();
-}
-
-void CtrlRspRadioState::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void CtrlRspRadioState::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* CtrlRspRadioState::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return CtrlRspRadioState_descriptor_;
-}
-
-const CtrlRspRadioState& CtrlRspRadioState::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ctrl_2eproto();  return *default_instance_;
-}
-
-CtrlRspRadioState* CtrlRspRadioState::default_instance_ = NULL;
-
-CtrlRspRadioState* CtrlRspRadioState::New() const {
-  return new CtrlRspRadioState;
-}
-
-void CtrlRspRadioState::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    state_ = 0;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool CtrlRspRadioState::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .ril_proto.RadioState state = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RadioState_IsValid(value)) {
-            set_state(static_cast< ril_proto::RadioState >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void CtrlRspRadioState::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .ril_proto.RadioState state = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->state(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* CtrlRspRadioState::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .ril_proto.RadioState state = 1;
-  if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->state(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int CtrlRspRadioState::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .ril_proto.RadioState state = 1;
-    if (has_state()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->state());
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void CtrlRspRadioState::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const CtrlRspRadioState* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CtrlRspRadioState*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void CtrlRspRadioState::MergeFrom(const CtrlRspRadioState& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_state(from.state());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void CtrlRspRadioState::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void CtrlRspRadioState::CopyFrom(const CtrlRspRadioState& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool CtrlRspRadioState::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
-  return true;
-}
-
-void CtrlRspRadioState::Swap(CtrlRspRadioState* other) {
-  if (other != this) {
-    std::swap(state_, other->state_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata CtrlRspRadioState::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CtrlRspRadioState_descriptor_;
-  metadata.reflection = CtrlRspRadioState_reflection_;
-  return metadata;
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace ril_proto
-
-// @@protoc_insertion_point(global_scope)
diff --git a/mock-ril/src/cpp/ctrl.pb.h b/mock-ril/src/cpp/ctrl.pb.h
deleted file mode 100644 (file)
index 97cd0bd..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ctrl.proto
-
-#ifndef PROTOBUF_ctrl_2eproto__INCLUDED
-#define PROTOBUF_ctrl_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 2003000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 2003000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include "ril.pb.h"
-// @@protoc_insertion_point(includes)
-
-namespace ril_proto {
-
-// Internal implementation detail -- do not call these.
-void  protobuf_AddDesc_ctrl_2eproto();
-void protobuf_AssignDesc_ctrl_2eproto();
-void protobuf_ShutdownFile_ctrl_2eproto();
-
-class CtrlRspRadioState;
-
-enum CtrlCmd {
-  CTRL_CMD_ECHO = 0,
-  CTRL_CMD_GET_RADIO_STATE = 1
-};
-bool CtrlCmd_IsValid(int value);
-const CtrlCmd CtrlCmd_MIN = CTRL_CMD_ECHO;
-const CtrlCmd CtrlCmd_MAX = CTRL_CMD_GET_RADIO_STATE;
-const int CtrlCmd_ARRAYSIZE = CtrlCmd_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* CtrlCmd_descriptor();
-inline const ::std::string& CtrlCmd_Name(CtrlCmd value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    CtrlCmd_descriptor(), value);
-}
-inline bool CtrlCmd_Parse(
-    const ::std::string& name, CtrlCmd* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<CtrlCmd>(
-    CtrlCmd_descriptor(), name, value);
-}
-enum CtrlStatus {
-  CTRL_STATUS_OK = 0,
-  CTRL_STATUS_ERR = 1
-};
-bool CtrlStatus_IsValid(int value);
-const CtrlStatus CtrlStatus_MIN = CTRL_STATUS_OK;
-const CtrlStatus CtrlStatus_MAX = CTRL_STATUS_ERR;
-const int CtrlStatus_ARRAYSIZE = CtrlStatus_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* CtrlStatus_descriptor();
-inline const ::std::string& CtrlStatus_Name(CtrlStatus value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    CtrlStatus_descriptor(), value);
-}
-inline bool CtrlStatus_Parse(
-    const ::std::string& name, CtrlStatus* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<CtrlStatus>(
-    CtrlStatus_descriptor(), name, value);
-}
-// ===================================================================
-
-class CtrlRspRadioState : public ::google::protobuf::Message {
- public:
-  CtrlRspRadioState();
-  virtual ~CtrlRspRadioState();
-  
-  CtrlRspRadioState(const CtrlRspRadioState& from);
-  
-  inline CtrlRspRadioState& operator=(const CtrlRspRadioState& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const CtrlRspRadioState& default_instance();
-  
-  void Swap(CtrlRspRadioState* other);
-  
-  // implements Message ----------------------------------------------
-  
-  CtrlRspRadioState* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CtrlRspRadioState& from);
-  void MergeFrom(const CtrlRspRadioState& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // required .ril_proto.RadioState state = 1;
-  inline bool has_state() const;
-  inline void clear_state();
-  static const int kStateFieldNumber = 1;
-  inline ril_proto::RadioState state() const;
-  inline void set_state(ril_proto::RadioState value);
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.CtrlRspRadioState)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  int state_;
-  friend void  protobuf_AddDesc_ctrl_2eproto();
-  friend void protobuf_AssignDesc_ctrl_2eproto();
-  friend void protobuf_ShutdownFile_ctrl_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static CtrlRspRadioState* default_instance_;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-// CtrlRspRadioState
-
-// required .ril_proto.RadioState state = 1;
-inline bool CtrlRspRadioState::has_state() const {
-  return _has_bit(0);
-}
-inline void CtrlRspRadioState::clear_state() {
-  state_ = 0;
-  _clear_bit(0);
-}
-inline ril_proto::RadioState CtrlRspRadioState::state() const {
-  return static_cast< ril_proto::RadioState >(state_);
-}
-inline void CtrlRspRadioState::set_state(ril_proto::RadioState value) {
-  GOOGLE_DCHECK(ril_proto::RadioState_IsValid(value));
-  _set_bit(0);
-  state_ = value;
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace ril_proto
-
-#ifndef SWIG
-namespace google {
-namespace protobuf {
-
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::CtrlCmd>() {
-  return ril_proto::CtrlCmd_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::CtrlStatus>() {
-  return ril_proto::CtrlStatus_descriptor();
-}
-
-}  // namespace google
-}  // namespace protobuf
-#endif  // SWIG
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_ctrl_2eproto__INCLUDED
diff --git a/mock-ril/src/cpp/ril.pb.cpp b/mock-ril/src/cpp/ril.pb.cpp
deleted file mode 100644 (file)
index bf1ccf2..0000000
+++ /dev/null
@@ -1,3523 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "ril.pb.h"
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace ril_proto {
-
-namespace {
-
-const ::google::protobuf::Descriptor* RilAppStatus_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RilAppStatus_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RilCardStatus_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RilCardStatus_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RspStrings_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RspStrings_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RspIntegers_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RspIntegers_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ReqGetSimStatus_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ReqGetSimStatus_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RspGetSimStatus_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RspGetSimStatus_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ReqEnterSimPin_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ReqEnterSimPin_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RspEnterSimPin_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RspEnterSimPin_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ReqHangUp_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ReqHangUp_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ReqScreenState_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ReqScreenState_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RspOperator_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RspOperator_reflection_ = NULL;
-const ::google::protobuf::EnumDescriptor* RilCommand_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* RadioState_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* RilCardState_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* RilPersoSubstate_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* RilAppState_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* RilPinState_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* RilAppType_descriptor_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_ril_2eproto() {
-  protobuf_AddDesc_ril_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "ril.proto");
-  GOOGLE_CHECK(file != NULL);
-  RilAppStatus_descriptor_ = file->message_type(0);
-  static const int RilAppStatus_offsets_[8] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, app_type_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, app_state_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, perso_substate_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, aid_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, app_label_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, pin1_replaced_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, pin1_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, pin2_),
-  };
-  RilAppStatus_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RilAppStatus_descriptor_,
-      RilAppStatus::default_instance_,
-      RilAppStatus_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilAppStatus, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RilAppStatus));
-  RilCardStatus_descriptor_ = file->message_type(1);
-  static const int RilCardStatus_offsets_[6] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, card_state_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, universal_pin_state_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, gsm_umts_subscription_app_index_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, cdma_subscription_app_index_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, num_applications_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, applications_),
-  };
-  RilCardStatus_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RilCardStatus_descriptor_,
-      RilCardStatus::default_instance_,
-      RilCardStatus_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RilCardStatus, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RilCardStatus));
-  RspStrings_descriptor_ = file->message_type(2);
-  static const int RspStrings_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspStrings, strings_),
-  };
-  RspStrings_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RspStrings_descriptor_,
-      RspStrings::default_instance_,
-      RspStrings_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspStrings, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspStrings, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RspStrings));
-  RspIntegers_descriptor_ = file->message_type(3);
-  static const int RspIntegers_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspIntegers, integers_),
-  };
-  RspIntegers_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RspIntegers_descriptor_,
-      RspIntegers::default_instance_,
-      RspIntegers_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspIntegers, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspIntegers, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RspIntegers));
-  ReqGetSimStatus_descriptor_ = file->message_type(4);
-  static const int ReqGetSimStatus_offsets_[1] = {
-  };
-  ReqGetSimStatus_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ReqGetSimStatus_descriptor_,
-      ReqGetSimStatus::default_instance_,
-      ReqGetSimStatus_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqGetSimStatus, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqGetSimStatus, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ReqGetSimStatus));
-  RspGetSimStatus_descriptor_ = file->message_type(5);
-  static const int RspGetSimStatus_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspGetSimStatus, card_status_),
-  };
-  RspGetSimStatus_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RspGetSimStatus_descriptor_,
-      RspGetSimStatus::default_instance_,
-      RspGetSimStatus_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspGetSimStatus, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspGetSimStatus, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RspGetSimStatus));
-  ReqEnterSimPin_descriptor_ = file->message_type(6);
-  static const int ReqEnterSimPin_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqEnterSimPin, pin_),
-  };
-  ReqEnterSimPin_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ReqEnterSimPin_descriptor_,
-      ReqEnterSimPin::default_instance_,
-      ReqEnterSimPin_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqEnterSimPin, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqEnterSimPin, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ReqEnterSimPin));
-  RspEnterSimPin_descriptor_ = file->message_type(7);
-  static const int RspEnterSimPin_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspEnterSimPin, retries_remaining_),
-  };
-  RspEnterSimPin_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RspEnterSimPin_descriptor_,
-      RspEnterSimPin::default_instance_,
-      RspEnterSimPin_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspEnterSimPin, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspEnterSimPin, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RspEnterSimPin));
-  ReqHangUp_descriptor_ = file->message_type(8);
-  static const int ReqHangUp_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqHangUp, connection_index_),
-  };
-  ReqHangUp_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ReqHangUp_descriptor_,
-      ReqHangUp::default_instance_,
-      ReqHangUp_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqHangUp, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqHangUp, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ReqHangUp));
-  ReqScreenState_descriptor_ = file->message_type(9);
-  static const int ReqScreenState_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, state_),
-  };
-  ReqScreenState_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ReqScreenState_descriptor_,
-      ReqScreenState::default_instance_,
-      ReqScreenState_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ReqScreenState));
-  RspOperator_descriptor_ = file->message_type(10);
-  static const int RspOperator_offsets_[3] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, long_alpha_ons_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, short_alpha_ons_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, mcc_mnc_),
-  };
-  RspOperator_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RspOperator_descriptor_,
-      RspOperator::default_instance_,
-      RspOperator_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RspOperator));
-  RilCommand_descriptor_ = file->enum_type(0);
-  RadioState_descriptor_ = file->enum_type(1);
-  RilCardState_descriptor_ = file->enum_type(2);
-  RilPersoSubstate_descriptor_ = file->enum_type(3);
-  RilAppState_descriptor_ = file->enum_type(4);
-  RilPinState_descriptor_ = file->enum_type(5);
-  RilAppType_descriptor_ = file->enum_type(6);
-}
-
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
-inline void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_ril_2eproto);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RilAppStatus_descriptor_, &RilAppStatus::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RilCardStatus_descriptor_, &RilCardStatus::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RspStrings_descriptor_, &RspStrings::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RspIntegers_descriptor_, &RspIntegers::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ReqGetSimStatus_descriptor_, &ReqGetSimStatus::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RspGetSimStatus_descriptor_, &RspGetSimStatus::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ReqEnterSimPin_descriptor_, &ReqEnterSimPin::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RspEnterSimPin_descriptor_, &RspEnterSimPin::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ReqHangUp_descriptor_, &ReqHangUp::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ReqScreenState_descriptor_, &ReqScreenState::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RspOperator_descriptor_, &RspOperator::default_instance());
-}
-
-}  // namespace
-
-void protobuf_ShutdownFile_ril_2eproto() {
-  delete RilAppStatus::default_instance_;
-  delete RilAppStatus_reflection_;
-  delete RilCardStatus::default_instance_;
-  delete RilCardStatus_reflection_;
-  delete RspStrings::default_instance_;
-  delete RspStrings_reflection_;
-  delete RspIntegers::default_instance_;
-  delete RspIntegers_reflection_;
-  delete ReqGetSimStatus::default_instance_;
-  delete ReqGetSimStatus_reflection_;
-  delete RspGetSimStatus::default_instance_;
-  delete RspGetSimStatus_reflection_;
-  delete ReqEnterSimPin::default_instance_;
-  delete ReqEnterSimPin_reflection_;
-  delete RspEnterSimPin::default_instance_;
-  delete RspEnterSimPin_reflection_;
-  delete ReqHangUp::default_instance_;
-  delete ReqHangUp_reflection_;
-  delete ReqScreenState::default_instance_;
-  delete ReqScreenState_reflection_;
-  delete RspOperator::default_instance_;
-  delete RspOperator_reflection_;
-}
-
-void protobuf_AddDesc_ril_2eproto() {
-  static bool already_here = false;
-  if (already_here) return;
-  already_here = true;
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\tril.proto\022\tril_proto\"\232\002\n\014RilAppStatus\022"
-    "\'\n\010app_type\030\001 \001(\0162\025.ril_proto.RilAppType"
-    "\022)\n\tapp_state\030\002 \001(\0162\026.ril_proto.RilAppSt"
-    "ate\0223\n\016perso_substate\030\003 \001(\0162\033.ril_proto."
-    "RilPersoSubstate\022\013\n\003aid\030\004 \001(\t\022\021\n\tapp_lab"
-    "el\030\005 \001(\t\022\025\n\rpin1_replaced\030\006 \001(\005\022$\n\004pin1\030"
-    "\007 \001(\0162\026.ril_proto.RilPinState\022$\n\004pin2\030\010 "
-    "\001(\0162\026.ril_proto.RilPinState\"\210\002\n\rRilCardS"
-    "tatus\022+\n\ncard_state\030\001 \001(\0162\027.ril_proto.Ri"
-    "lCardState\0223\n\023universal_pin_state\030\002 \001(\0162"
-    "\026.ril_proto.RilPinState\022\'\n\037gsm_umts_subs"
-    "cription_app_index\030\003 \001(\005\022#\n\033cdma_subscri"
-    "ption_app_index\030\004 \001(\005\022\030\n\020num_application"
-    "s\030\005 \001(\005\022-\n\014applications\030\006 \003(\0132\027.ril_prot"
-    "o.RilAppStatus\"\035\n\nRspStrings\022\017\n\007strings\030"
-    "\001 \003(\t\"\037\n\013RspIntegers\022\020\n\010integers\030\001 \003(\005\"\021"
-    "\n\017ReqGetSimStatus\"@\n\017RspGetSimStatus\022-\n\013"
-    "card_status\030\001 \002(\0132\030.ril_proto.RilCardSta"
-    "tus\"\035\n\016ReqEnterSimPin\022\013\n\003pin\030\001 \002(\t\"+\n\016Rs"
-    "pEnterSimPin\022\031\n\021retries_remaining\030\001 \002(\005\""
-    "%\n\tReqHangUp\022\030\n\020connection_index\030\001 \002(\005\"\037"
-    "\n\016ReqScreenState\022\r\n\005state\030\001 \002(\010\"O\n\013RspOp"
-    "erator\022\026\n\016long_alpha_ons\030\001 \001(\t\022\027\n\017short_"
-    "alpha_ons\030\002 \001(\t\022\017\n\007mcc_mnc\030\003 \001(\t*a\n\nRilC"
-    "ommand\022\026\n\022CMD_GET_SIM_STATUS\020\001\022\025\n\021CMD_EN"
-    "TER_SIM_PIN\020\002\022\016\n\nCMD_HANGUP\020\014\022\024\n\020CMD_SCR"
-    "EEN_STATE\020=*\271\002\n\nRadioState\022\023\n\017RADIO_STAT"
-    "E_OFF\020\000\022\033\n\027RADIO_STATE_UNAVAILABLE\020\001\022\035\n\031"
-    "RADIO_STATE_SIM_NOT_READY\020\002\022$\n RADIO_STA"
-    "TE_SIM_LOCKED_OR_ABSENT\020\003\022\031\n\025RADIO_STATE"
-    "_SIM_READY\020\004\022\036\n\032RADIO_STATE_RUIM_NOT_REA"
-    "DY\020\005\022\032\n\026RADIO_STATE_RUIM_READY\020\006\022%\n!RADI"
-    "O_STATE_RUIM_LOCKED_OR_ABSENT\020\007\022\034\n\030RADIO"
-    "_STATE_NV_NOT_READY\020\010\022\030\n\024RADIO_STATE_NV_"
-    "READY\020\t*P\n\014RilCardState\022\024\n\020CARDSTATE_ABS"
-    "ENT\020\000\022\025\n\021CARDSTATE_PRESENT\020\001\022\023\n\017CARDSTAT"
-    "E_ERROR\020\002*\361\006\n\020RilPersoSubstate\022\031\n\025PERSOS"
-    "UBSTATE_UNKNOWN\020\000\022\035\n\031PERSOSUBSTATE_IN_PR"
-    "OGRESS\020\001\022\027\n\023PERSOSUBSTATE_READY\020\002\022\035\n\031PER"
-    "SOSUBSTATE_SIM_NETWORK\020\003\022$\n PERSOSUBSTAT"
-    "E_SIM_NETWORK_SUBSET\020\004\022\037\n\033PERSOSUBSTATE_"
-    "SIM_CORPORATE\020\005\022&\n\"PERSOSUBSTATE_SIM_SER"
-    "VICE_PROVIDER\020\006\022\031\n\025PERSOSUBSTATE_SIM_SIM"
-    "\020\007\022!\n\035PERSOSUBSTATE_SIM_NETWORK_PUK\020\010\022(\n"
-    "$PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK\020\t\022"
-    "#\n\037PERSOSUBSTATE_SIM_CORPORATE_PUK\020\n\022*\n&"
-    "PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK\020\013"
-    "\022\035\n\031PERSOSUBSTATE_SIM_SIM_PUK\020\014\022\037\n\033PERSO"
-    "SUBSTATE_RUIM_NETWORK1\020\r\022\037\n\033PERSOSUBSTAT"
-    "E_RUIM_NETWORK2\020\016\022\033\n\027PERSOSUBSTATE_RUIM_"
-    "HRPD\020\017\022 \n\034PERSOSUBSTATE_RUIM_CORPORATE\020\020"
-    "\022\'\n#PERSOSUBSTATE_RUIM_SERVICE_PROVIDER\020"
-    "\021\022\033\n\027PERSOSUBSTATE_RUIM_RUIM\020\022\022#\n\037PERSOS"
-    "UBSTATE_RUIM_NETWORK1_PUK\020\023\022#\n\037PERSOSUBS"
-    "TATE_RUIM_NETWORK2_PUK\020\024\022\037\n\033PERSOSUBSTAT"
-    "E_RUIM_HRPD_PUK\020\025\022$\n PERSOSUBSTATE_RUIM_"
-    "CORPORATE_PUK\020\026\022+\n\'PERSOSUBSTATE_RUIM_SE"
-    "RVICE_PROVIDER_PUK\020\027\022\037\n\033PERSOSUBSTATE_RU"
-    "IM_RUIM_PUK\020\030*\223\001\n\013RilAppState\022\024\n\020APPSTAT"
-    "E_UNKNOWN\020\000\022\025\n\021APPSTATE_DETECTED\020\001\022\020\n\014AP"
-    "PSTATE_PIN\020\002\022\020\n\014APPSTATE_PUK\020\003\022\037\n\033APPSTA"
-    "TE_SUBSCRIPTION_PERSO\020\004\022\022\n\016APPSTATE_READ"
-    "Y\020\005*\275\001\n\013RilPinState\022\024\n\020PINSTATE_UNKNOWN\020"
-    "\000\022!\n\035PINSTATE_ENABLED_NOT_VERIFIED\020\001\022\035\n\031"
-    "PINSTATE_ENABLED_VERIFIED\020\002\022\025\n\021PINSTATE_"
-    "DISABLED\020\003\022\034\n\030PINSTATE_ENABLED_BLOCKED\020\004"
-    "\022!\n\035PINSTATE_ENABLED_PERM_BLOCKED\020\005*h\n\nR"
-    "ilAppType\022\023\n\017APPTYPE_UNKNOWN\020\000\022\017\n\013APPTYP"
-    "E_SIM\020\001\022\020\n\014APPTYPE_USIM\020\002\022\020\n\014APPTYPE_RUI"
-    "M\020\003\022\020\n\014APPTYPE_CSIM\020\004B3\n(com.android.int"
-    "ernal.telephony.ril_protoB\007RilCmds", 2834);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "ril.proto", &protobuf_RegisterTypes);
-  RilAppStatus::default_instance_ = new RilAppStatus();
-  RilCardStatus::default_instance_ = new RilCardStatus();
-  RspStrings::default_instance_ = new RspStrings();
-  RspIntegers::default_instance_ = new RspIntegers();
-  ReqGetSimStatus::default_instance_ = new ReqGetSimStatus();
-  RspGetSimStatus::default_instance_ = new RspGetSimStatus();
-  ReqEnterSimPin::default_instance_ = new ReqEnterSimPin();
-  RspEnterSimPin::default_instance_ = new RspEnterSimPin();
-  ReqHangUp::default_instance_ = new ReqHangUp();
-  ReqScreenState::default_instance_ = new ReqScreenState();
-  RspOperator::default_instance_ = new RspOperator();
-  RilAppStatus::default_instance_->InitAsDefaultInstance();
-  RilCardStatus::default_instance_->InitAsDefaultInstance();
-  RspStrings::default_instance_->InitAsDefaultInstance();
-  RspIntegers::default_instance_->InitAsDefaultInstance();
-  ReqGetSimStatus::default_instance_->InitAsDefaultInstance();
-  RspGetSimStatus::default_instance_->InitAsDefaultInstance();
-  ReqEnterSimPin::default_instance_->InitAsDefaultInstance();
-  RspEnterSimPin::default_instance_->InitAsDefaultInstance();
-  ReqHangUp::default_instance_->InitAsDefaultInstance();
-  ReqScreenState::default_instance_->InitAsDefaultInstance();
-  RspOperator::default_instance_->InitAsDefaultInstance();
-  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_ril_2eproto);
-}
-
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer_ril_2eproto {
-  StaticDescriptorInitializer_ril_2eproto() {
-    protobuf_AddDesc_ril_2eproto();
-  }
-} static_descriptor_initializer_ril_2eproto_;
-
-const ::google::protobuf::EnumDescriptor* RilCommand_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilCommand_descriptor_;
-}
-bool RilCommand_IsValid(int value) {
-  switch(value) {
-    case 1:
-    case 2:
-    case 12:
-    case 61:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* RadioState_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RadioState_descriptor_;
-}
-bool RadioState_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* RilCardState_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilCardState_descriptor_;
-}
-bool RilCardState_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* RilPersoSubstate_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilPersoSubstate_descriptor_;
-}
-bool RilPersoSubstate_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-    case 17:
-    case 18:
-    case 19:
-    case 20:
-    case 21:
-    case 22:
-    case 23:
-    case 24:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* RilAppState_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilAppState_descriptor_;
-}
-bool RilAppState_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* RilPinState_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilPinState_descriptor_;
-}
-bool RilPinState_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const ::google::protobuf::EnumDescriptor* RilAppType_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilAppType_descriptor_;
-}
-bool RilAppType_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// ===================================================================
-
-const ::std::string RilAppStatus::_default_aid_;
-const ::std::string RilAppStatus::_default_app_label_;
-#ifndef _MSC_VER
-const int RilAppStatus::kAppTypeFieldNumber;
-const int RilAppStatus::kAppStateFieldNumber;
-const int RilAppStatus::kPersoSubstateFieldNumber;
-const int RilAppStatus::kAidFieldNumber;
-const int RilAppStatus::kAppLabelFieldNumber;
-const int RilAppStatus::kPin1ReplacedFieldNumber;
-const int RilAppStatus::kPin1FieldNumber;
-const int RilAppStatus::kPin2FieldNumber;
-#endif  // !_MSC_VER
-
-RilAppStatus::RilAppStatus()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RilAppStatus::InitAsDefaultInstance() {
-}
-
-RilAppStatus::RilAppStatus(const RilAppStatus& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RilAppStatus::SharedCtor() {
-  _cached_size_ = 0;
-  app_type_ = 0;
-  app_state_ = 0;
-  perso_substate_ = 0;
-  aid_ = const_cast< ::std::string*>(&_default_aid_);
-  app_label_ = const_cast< ::std::string*>(&_default_app_label_);
-  pin1_replaced_ = 0;
-  pin1_ = 0;
-  pin2_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RilAppStatus::~RilAppStatus() {
-  SharedDtor();
-}
-
-void RilAppStatus::SharedDtor() {
-  if (aid_ != &_default_aid_) {
-    delete aid_;
-  }
-  if (app_label_ != &_default_app_label_) {
-    delete app_label_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void RilAppStatus::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RilAppStatus::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilAppStatus_descriptor_;
-}
-
-const RilAppStatus& RilAppStatus::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-RilAppStatus* RilAppStatus::default_instance_ = NULL;
-
-RilAppStatus* RilAppStatus::New() const {
-  return new RilAppStatus;
-}
-
-void RilAppStatus::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    app_type_ = 0;
-    app_state_ = 0;
-    perso_substate_ = 0;
-    if (_has_bit(3)) {
-      if (aid_ != &_default_aid_) {
-        aid_->clear();
-      }
-    }
-    if (_has_bit(4)) {
-      if (app_label_ != &_default_app_label_) {
-        app_label_->clear();
-      }
-    }
-    pin1_replaced_ = 0;
-    pin1_ = 0;
-    pin2_ = 0;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RilAppStatus::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .ril_proto.RilAppType app_type = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RilAppType_IsValid(value)) {
-            set_app_type(static_cast< ril_proto::RilAppType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(16)) goto parse_app_state;
-        break;
-      }
-      
-      // optional .ril_proto.RilAppState app_state = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_app_state:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RilAppState_IsValid(value)) {
-            set_app_state(static_cast< ril_proto::RilAppState >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_perso_substate;
-        break;
-      }
-      
-      // optional .ril_proto.RilPersoSubstate perso_substate = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_perso_substate:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RilPersoSubstate_IsValid(value)) {
-            set_perso_substate(static_cast< ril_proto::RilPersoSubstate >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(3, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_aid;
-        break;
-      }
-      
-      // optional string aid = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_aid:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_aid()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->aid().data(), this->aid().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_app_label;
-        break;
-      }
-      
-      // optional string app_label = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_app_label:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_app_label()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->app_label().data(), this->app_label().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(48)) goto parse_pin1_replaced;
-        break;
-      }
-      
-      // optional int32 pin1_replaced = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_pin1_replaced:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &pin1_replaced_)));
-          _set_bit(5);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(56)) goto parse_pin1;
-        break;
-      }
-      
-      // optional .ril_proto.RilPinState pin1 = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_pin1:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RilPinState_IsValid(value)) {
-            set_pin1(static_cast< ril_proto::RilPinState >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(7, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(64)) goto parse_pin2;
-        break;
-      }
-      
-      // optional .ril_proto.RilPinState pin2 = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_pin2:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RilPinState_IsValid(value)) {
-            set_pin2(static_cast< ril_proto::RilPinState >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(8, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void RilAppStatus::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .ril_proto.RilAppType app_type = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->app_type(), output);
-  }
-  
-  // optional .ril_proto.RilAppState app_state = 2;
-  if (_has_bit(1)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->app_state(), output);
-  }
-  
-  // optional .ril_proto.RilPersoSubstate perso_substate = 3;
-  if (_has_bit(2)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      3, this->perso_substate(), output);
-  }
-  
-  // optional string aid = 4;
-  if (_has_bit(3)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->aid().data(), this->aid().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->aid(), output);
-  }
-  
-  // optional string app_label = 5;
-  if (_has_bit(4)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->app_label().data(), this->app_label().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      5, this->app_label(), output);
-  }
-  
-  // optional int32 pin1_replaced = 6;
-  if (_has_bit(5)) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(6, this->pin1_replaced(), output);
-  }
-  
-  // optional .ril_proto.RilPinState pin1 = 7;
-  if (_has_bit(6)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      7, this->pin1(), output);
-  }
-  
-  // optional .ril_proto.RilPinState pin2 = 8;
-  if (_has_bit(7)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      8, this->pin2(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RilAppStatus::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional .ril_proto.RilAppType app_type = 1;
-  if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->app_type(), target);
-  }
-  
-  // optional .ril_proto.RilAppState app_state = 2;
-  if (_has_bit(1)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->app_state(), target);
-  }
-  
-  // optional .ril_proto.RilPersoSubstate perso_substate = 3;
-  if (_has_bit(2)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      3, this->perso_substate(), target);
-  }
-  
-  // optional string aid = 4;
-  if (_has_bit(3)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->aid().data(), this->aid().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        4, this->aid(), target);
-  }
-  
-  // optional string app_label = 5;
-  if (_has_bit(4)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->app_label().data(), this->app_label().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        5, this->app_label(), target);
-  }
-  
-  // optional int32 pin1_replaced = 6;
-  if (_has_bit(5)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(6, this->pin1_replaced(), target);
-  }
-  
-  // optional .ril_proto.RilPinState pin1 = 7;
-  if (_has_bit(6)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      7, this->pin1(), target);
-  }
-  
-  // optional .ril_proto.RilPinState pin2 = 8;
-  if (_has_bit(7)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      8, this->pin2(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RilAppStatus::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .ril_proto.RilAppType app_type = 1;
-    if (has_app_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->app_type());
-    }
-    
-    // optional .ril_proto.RilAppState app_state = 2;
-    if (has_app_state()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->app_state());
-    }
-    
-    // optional .ril_proto.RilPersoSubstate perso_substate = 3;
-    if (has_perso_substate()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->perso_substate());
-    }
-    
-    // optional string aid = 4;
-    if (has_aid()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->aid());
-    }
-    
-    // optional string app_label = 5;
-    if (has_app_label()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->app_label());
-    }
-    
-    // optional int32 pin1_replaced = 6;
-    if (has_pin1_replaced()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->pin1_replaced());
-    }
-    
-    // optional .ril_proto.RilPinState pin1 = 7;
-    if (has_pin1()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->pin1());
-    }
-    
-    // optional .ril_proto.RilPinState pin2 = 8;
-    if (has_pin2()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->pin2());
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void RilAppStatus::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RilAppStatus* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RilAppStatus*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RilAppStatus::MergeFrom(const RilAppStatus& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_app_type(from.app_type());
-    }
-    if (from._has_bit(1)) {
-      set_app_state(from.app_state());
-    }
-    if (from._has_bit(2)) {
-      set_perso_substate(from.perso_substate());
-    }
-    if (from._has_bit(3)) {
-      set_aid(from.aid());
-    }
-    if (from._has_bit(4)) {
-      set_app_label(from.app_label());
-    }
-    if (from._has_bit(5)) {
-      set_pin1_replaced(from.pin1_replaced());
-    }
-    if (from._has_bit(6)) {
-      set_pin1(from.pin1());
-    }
-    if (from._has_bit(7)) {
-      set_pin2(from.pin2());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RilAppStatus::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RilAppStatus::CopyFrom(const RilAppStatus& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RilAppStatus::IsInitialized() const {
-  
-  return true;
-}
-
-void RilAppStatus::Swap(RilAppStatus* other) {
-  if (other != this) {
-    std::swap(app_type_, other->app_type_);
-    std::swap(app_state_, other->app_state_);
-    std::swap(perso_substate_, other->perso_substate_);
-    std::swap(aid_, other->aid_);
-    std::swap(app_label_, other->app_label_);
-    std::swap(pin1_replaced_, other->pin1_replaced_);
-    std::swap(pin1_, other->pin1_);
-    std::swap(pin2_, other->pin2_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata RilAppStatus::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RilAppStatus_descriptor_;
-  metadata.reflection = RilAppStatus_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int RilCardStatus::kCardStateFieldNumber;
-const int RilCardStatus::kUniversalPinStateFieldNumber;
-const int RilCardStatus::kGsmUmtsSubscriptionAppIndexFieldNumber;
-const int RilCardStatus::kCdmaSubscriptionAppIndexFieldNumber;
-const int RilCardStatus::kNumApplicationsFieldNumber;
-const int RilCardStatus::kApplicationsFieldNumber;
-#endif  // !_MSC_VER
-
-RilCardStatus::RilCardStatus()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RilCardStatus::InitAsDefaultInstance() {
-}
-
-RilCardStatus::RilCardStatus(const RilCardStatus& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RilCardStatus::SharedCtor() {
-  _cached_size_ = 0;
-  card_state_ = 0;
-  universal_pin_state_ = 0;
-  gsm_umts_subscription_app_index_ = 0;
-  cdma_subscription_app_index_ = 0;
-  num_applications_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RilCardStatus::~RilCardStatus() {
-  SharedDtor();
-}
-
-void RilCardStatus::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void RilCardStatus::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RilCardStatus::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilCardStatus_descriptor_;
-}
-
-const RilCardStatus& RilCardStatus::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-RilCardStatus* RilCardStatus::default_instance_ = NULL;
-
-RilCardStatus* RilCardStatus::New() const {
-  return new RilCardStatus;
-}
-
-void RilCardStatus::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    card_state_ = 0;
-    universal_pin_state_ = 0;
-    gsm_umts_subscription_app_index_ = 0;
-    cdma_subscription_app_index_ = 0;
-    num_applications_ = 0;
-  }
-  applications_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RilCardStatus::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .ril_proto.RilCardState card_state = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RilCardState_IsValid(value)) {
-            set_card_state(static_cast< ril_proto::RilCardState >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(16)) goto parse_universal_pin_state;
-        break;
-      }
-      
-      // optional .ril_proto.RilPinState universal_pin_state = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_universal_pin_state:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (ril_proto::RilPinState_IsValid(value)) {
-            set_universal_pin_state(static_cast< ril_proto::RilPinState >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_gsm_umts_subscription_app_index;
-        break;
-      }
-      
-      // optional int32 gsm_umts_subscription_app_index = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_gsm_umts_subscription_app_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &gsm_umts_subscription_app_index_)));
-          _set_bit(2);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_cdma_subscription_app_index;
-        break;
-      }
-      
-      // optional int32 cdma_subscription_app_index = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_cdma_subscription_app_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &cdma_subscription_app_index_)));
-          _set_bit(3);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_num_applications;
-        break;
-      }
-      
-      // optional int32 num_applications = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_num_applications:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &num_applications_)));
-          _set_bit(4);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_applications;
-        break;
-      }
-      
-      // repeated .ril_proto.RilAppStatus applications = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_applications:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_applications()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_applications;
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void RilCardStatus::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .ril_proto.RilCardState card_state = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->card_state(), output);
-  }
-  
-  // optional .ril_proto.RilPinState universal_pin_state = 2;
-  if (_has_bit(1)) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->universal_pin_state(), output);
-  }
-  
-  // optional int32 gsm_umts_subscription_app_index = 3;
-  if (_has_bit(2)) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->gsm_umts_subscription_app_index(), output);
-  }
-  
-  // optional int32 cdma_subscription_app_index = 4;
-  if (_has_bit(3)) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->cdma_subscription_app_index(), output);
-  }
-  
-  // optional int32 num_applications = 5;
-  if (_has_bit(4)) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->num_applications(), output);
-  }
-  
-  // repeated .ril_proto.RilAppStatus applications = 6;
-  for (int i = 0; i < this->applications_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->applications(i), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RilCardStatus::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional .ril_proto.RilCardState card_state = 1;
-  if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->card_state(), target);
-  }
-  
-  // optional .ril_proto.RilPinState universal_pin_state = 2;
-  if (_has_bit(1)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->universal_pin_state(), target);
-  }
-  
-  // optional int32 gsm_umts_subscription_app_index = 3;
-  if (_has_bit(2)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->gsm_umts_subscription_app_index(), target);
-  }
-  
-  // optional int32 cdma_subscription_app_index = 4;
-  if (_has_bit(3)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->cdma_subscription_app_index(), target);
-  }
-  
-  // optional int32 num_applications = 5;
-  if (_has_bit(4)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->num_applications(), target);
-  }
-  
-  // repeated .ril_proto.RilAppStatus applications = 6;
-  for (int i = 0; i < this->applications_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->applications(i), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RilCardStatus::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .ril_proto.RilCardState card_state = 1;
-    if (has_card_state()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->card_state());
-    }
-    
-    // optional .ril_proto.RilPinState universal_pin_state = 2;
-    if (has_universal_pin_state()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->universal_pin_state());
-    }
-    
-    // optional int32 gsm_umts_subscription_app_index = 3;
-    if (has_gsm_umts_subscription_app_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->gsm_umts_subscription_app_index());
-    }
-    
-    // optional int32 cdma_subscription_app_index = 4;
-    if (has_cdma_subscription_app_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->cdma_subscription_app_index());
-    }
-    
-    // optional int32 num_applications = 5;
-    if (has_num_applications()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->num_applications());
-    }
-    
-  }
-  // repeated .ril_proto.RilAppStatus applications = 6;
-  total_size += 1 * this->applications_size();
-  for (int i = 0; i < this->applications_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->applications(i));
-  }
-  
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void RilCardStatus::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RilCardStatus* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RilCardStatus*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RilCardStatus::MergeFrom(const RilCardStatus& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  applications_.MergeFrom(from.applications_);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_card_state(from.card_state());
-    }
-    if (from._has_bit(1)) {
-      set_universal_pin_state(from.universal_pin_state());
-    }
-    if (from._has_bit(2)) {
-      set_gsm_umts_subscription_app_index(from.gsm_umts_subscription_app_index());
-    }
-    if (from._has_bit(3)) {
-      set_cdma_subscription_app_index(from.cdma_subscription_app_index());
-    }
-    if (from._has_bit(4)) {
-      set_num_applications(from.num_applications());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RilCardStatus::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RilCardStatus::CopyFrom(const RilCardStatus& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RilCardStatus::IsInitialized() const {
-  
-  return true;
-}
-
-void RilCardStatus::Swap(RilCardStatus* other) {
-  if (other != this) {
-    std::swap(card_state_, other->card_state_);
-    std::swap(universal_pin_state_, other->universal_pin_state_);
-    std::swap(gsm_umts_subscription_app_index_, other->gsm_umts_subscription_app_index_);
-    std::swap(cdma_subscription_app_index_, other->cdma_subscription_app_index_);
-    std::swap(num_applications_, other->num_applications_);
-    applications_.Swap(&other->applications_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata RilCardStatus::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RilCardStatus_descriptor_;
-  metadata.reflection = RilCardStatus_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int RspStrings::kStringsFieldNumber;
-#endif  // !_MSC_VER
-
-RspStrings::RspStrings()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RspStrings::InitAsDefaultInstance() {
-}
-
-RspStrings::RspStrings(const RspStrings& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RspStrings::SharedCtor() {
-  _cached_size_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RspStrings::~RspStrings() {
-  SharedDtor();
-}
-
-void RspStrings::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void RspStrings::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RspStrings::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RspStrings_descriptor_;
-}
-
-const RspStrings& RspStrings::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-RspStrings* RspStrings::default_instance_ = NULL;
-
-RspStrings* RspStrings::New() const {
-  return new RspStrings;
-}
-
-void RspStrings::Clear() {
-  strings_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RspStrings::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated string strings = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_strings:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_strings()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->strings(0).data(), this->strings(0).length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(10)) goto parse_strings;
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void RspStrings::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated string strings = 1;
-  for (int i = 0; i < this->strings_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->strings(i).data(), this->strings(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      1, this->strings(i), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RspStrings::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // repeated string strings = 1;
-  for (int i = 0; i < this->strings_size(); i++) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->strings(i).data(), this->strings(i).length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(1, this->strings(i), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RspStrings::ByteSize() const {
-  int total_size = 0;
-  
-  // repeated string strings = 1;
-  total_size += 1 * this->strings_size();
-  for (int i = 0; i < this->strings_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->strings(i));
-  }
-  
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void RspStrings::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RspStrings* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RspStrings*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RspStrings::MergeFrom(const RspStrings& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  strings_.MergeFrom(from.strings_);
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RspStrings::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RspStrings::CopyFrom(const RspStrings& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RspStrings::IsInitialized() const {
-  
-  return true;
-}
-
-void RspStrings::Swap(RspStrings* other) {
-  if (other != this) {
-    strings_.Swap(&other->strings_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata RspStrings::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RspStrings_descriptor_;
-  metadata.reflection = RspStrings_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int RspIntegers::kIntegersFieldNumber;
-#endif  // !_MSC_VER
-
-RspIntegers::RspIntegers()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RspIntegers::InitAsDefaultInstance() {
-}
-
-RspIntegers::RspIntegers(const RspIntegers& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RspIntegers::SharedCtor() {
-  _cached_size_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RspIntegers::~RspIntegers() {
-  SharedDtor();
-}
-
-void RspIntegers::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void RspIntegers::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RspIntegers::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RspIntegers_descriptor_;
-}
-
-const RspIntegers& RspIntegers::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-RspIntegers* RspIntegers::default_instance_ = NULL;
-
-RspIntegers* RspIntegers::New() const {
-  return new RspIntegers;
-}
-
-void RspIntegers::Clear() {
-  integers_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RspIntegers::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated int32 integers = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_integers:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 1, 8, input, this->mutable_integers())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_LENGTH_DELIMITED) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, this->mutable_integers())));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(8)) goto parse_integers;
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void RspIntegers::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated int32 integers = 1;
-  for (int i = 0; i < this->integers_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(
-      1, this->integers(i), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RspIntegers::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // repeated int32 integers = 1;
-  for (int i = 0; i < this->integers_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteInt32ToArray(1, this->integers(i), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RspIntegers::ByteSize() const {
-  int total_size = 0;
-  
-  // repeated int32 integers = 1;
-  {
-    int data_size = 0;
-    for (int i = 0; i < this->integers_size(); i++) {
-      data_size += ::google::protobuf::internal::WireFormatLite::
-        Int32Size(this->integers(i));
-    }
-    total_size += 1 * this->integers_size() + data_size;
-  }
-  
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void RspIntegers::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RspIntegers* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RspIntegers*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RspIntegers::MergeFrom(const RspIntegers& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  integers_.MergeFrom(from.integers_);
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RspIntegers::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RspIntegers::CopyFrom(const RspIntegers& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RspIntegers::IsInitialized() const {
-  
-  return true;
-}
-
-void RspIntegers::Swap(RspIntegers* other) {
-  if (other != this) {
-    integers_.Swap(&other->integers_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata RspIntegers::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RspIntegers_descriptor_;
-  metadata.reflection = RspIntegers_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-#endif  // !_MSC_VER
-
-ReqGetSimStatus::ReqGetSimStatus()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void ReqGetSimStatus::InitAsDefaultInstance() {
-}
-
-ReqGetSimStatus::ReqGetSimStatus(const ReqGetSimStatus& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void ReqGetSimStatus::SharedCtor() {
-  _cached_size_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-ReqGetSimStatus::~ReqGetSimStatus() {
-  SharedDtor();
-}
-
-void ReqGetSimStatus::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void ReqGetSimStatus::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ReqGetSimStatus::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return ReqGetSimStatus_descriptor_;
-}
-
-const ReqGetSimStatus& ReqGetSimStatus::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-ReqGetSimStatus* ReqGetSimStatus::default_instance_ = NULL;
-
-ReqGetSimStatus* ReqGetSimStatus::New() const {
-  return new ReqGetSimStatus;
-}
-
-void ReqGetSimStatus::Clear() {
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ReqGetSimStatus::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-        ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-      return true;
-    }
-    DO_(::google::protobuf::internal::WireFormat::SkipField(
-          input, tag, mutable_unknown_fields()));
-  }
-  return true;
-#undef DO_
-}
-
-void ReqGetSimStatus::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* ReqGetSimStatus::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int ReqGetSimStatus::ByteSize() const {
-  int total_size = 0;
-  
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ReqGetSimStatus::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ReqGetSimStatus* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ReqGetSimStatus*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ReqGetSimStatus::MergeFrom(const ReqGetSimStatus& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ReqGetSimStatus::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ReqGetSimStatus::CopyFrom(const ReqGetSimStatus& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ReqGetSimStatus::IsInitialized() const {
-  
-  return true;
-}
-
-void ReqGetSimStatus::Swap(ReqGetSimStatus* other) {
-  if (other != this) {
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata ReqGetSimStatus::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ReqGetSimStatus_descriptor_;
-  metadata.reflection = ReqGetSimStatus_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int RspGetSimStatus::kCardStatusFieldNumber;
-#endif  // !_MSC_VER
-
-RspGetSimStatus::RspGetSimStatus()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RspGetSimStatus::InitAsDefaultInstance() {
-  card_status_ = const_cast< ::ril_proto::RilCardStatus*>(&::ril_proto::RilCardStatus::default_instance());
-}
-
-RspGetSimStatus::RspGetSimStatus(const RspGetSimStatus& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RspGetSimStatus::SharedCtor() {
-  _cached_size_ = 0;
-  card_status_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RspGetSimStatus::~RspGetSimStatus() {
-  SharedDtor();
-}
-
-void RspGetSimStatus::SharedDtor() {
-  if (this != default_instance_) {
-    delete card_status_;
-  }
-}
-
-void RspGetSimStatus::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RspGetSimStatus::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RspGetSimStatus_descriptor_;
-}
-
-const RspGetSimStatus& RspGetSimStatus::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-RspGetSimStatus* RspGetSimStatus::default_instance_ = NULL;
-
-RspGetSimStatus* RspGetSimStatus::New() const {
-  return new RspGetSimStatus;
-}
-
-void RspGetSimStatus::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (_has_bit(0)) {
-      if (card_status_ != NULL) card_status_->::ril_proto::RilCardStatus::Clear();
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RspGetSimStatus::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .ril_proto.RilCardStatus card_status = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_card_status()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void RspGetSimStatus::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .ril_proto.RilCardStatus card_status = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->card_status(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RspGetSimStatus::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .ril_proto.RilCardStatus card_status = 1;
-  if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->card_status(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RspGetSimStatus::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .ril_proto.RilCardStatus card_status = 1;
-    if (has_card_status()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->card_status());
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void RspGetSimStatus::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RspGetSimStatus* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RspGetSimStatus*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RspGetSimStatus::MergeFrom(const RspGetSimStatus& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      mutable_card_status()->::ril_proto::RilCardStatus::MergeFrom(from.card_status());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RspGetSimStatus::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RspGetSimStatus::CopyFrom(const RspGetSimStatus& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RspGetSimStatus::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
-  return true;
-}
-
-void RspGetSimStatus::Swap(RspGetSimStatus* other) {
-  if (other != this) {
-    std::swap(card_status_, other->card_status_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata RspGetSimStatus::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RspGetSimStatus_descriptor_;
-  metadata.reflection = RspGetSimStatus_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-const ::std::string ReqEnterSimPin::_default_pin_;
-#ifndef _MSC_VER
-const int ReqEnterSimPin::kPinFieldNumber;
-#endif  // !_MSC_VER
-
-ReqEnterSimPin::ReqEnterSimPin()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void ReqEnterSimPin::InitAsDefaultInstance() {
-}
-
-ReqEnterSimPin::ReqEnterSimPin(const ReqEnterSimPin& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void ReqEnterSimPin::SharedCtor() {
-  _cached_size_ = 0;
-  pin_ = const_cast< ::std::string*>(&_default_pin_);
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-ReqEnterSimPin::~ReqEnterSimPin() {
-  SharedDtor();
-}
-
-void ReqEnterSimPin::SharedDtor() {
-  if (pin_ != &_default_pin_) {
-    delete pin_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void ReqEnterSimPin::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ReqEnterSimPin::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return ReqEnterSimPin_descriptor_;
-}
-
-const ReqEnterSimPin& ReqEnterSimPin::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-ReqEnterSimPin* ReqEnterSimPin::default_instance_ = NULL;
-
-ReqEnterSimPin* ReqEnterSimPin::New() const {
-  return new ReqEnterSimPin;
-}
-
-void ReqEnterSimPin::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (_has_bit(0)) {
-      if (pin_ != &_default_pin_) {
-        pin_->clear();
-      }
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ReqEnterSimPin::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required string pin = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_pin()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->pin().data(), this->pin().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void ReqEnterSimPin::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required string pin = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->pin().data(), this->pin().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      1, this->pin(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* ReqEnterSimPin::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required string pin = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->pin().data(), this->pin().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->pin(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int ReqEnterSimPin::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required string pin = 1;
-    if (has_pin()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->pin());
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ReqEnterSimPin::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ReqEnterSimPin* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ReqEnterSimPin*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ReqEnterSimPin::MergeFrom(const ReqEnterSimPin& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_pin(from.pin());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ReqEnterSimPin::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ReqEnterSimPin::CopyFrom(const ReqEnterSimPin& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ReqEnterSimPin::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
-  return true;
-}
-
-void ReqEnterSimPin::Swap(ReqEnterSimPin* other) {
-  if (other != this) {
-    std::swap(pin_, other->pin_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata ReqEnterSimPin::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ReqEnterSimPin_descriptor_;
-  metadata.reflection = ReqEnterSimPin_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int RspEnterSimPin::kRetriesRemainingFieldNumber;
-#endif  // !_MSC_VER
-
-RspEnterSimPin::RspEnterSimPin()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RspEnterSimPin::InitAsDefaultInstance() {
-}
-
-RspEnterSimPin::RspEnterSimPin(const RspEnterSimPin& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RspEnterSimPin::SharedCtor() {
-  _cached_size_ = 0;
-  retries_remaining_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RspEnterSimPin::~RspEnterSimPin() {
-  SharedDtor();
-}
-
-void RspEnterSimPin::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void RspEnterSimPin::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RspEnterSimPin::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RspEnterSimPin_descriptor_;
-}
-
-const RspEnterSimPin& RspEnterSimPin::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-RspEnterSimPin* RspEnterSimPin::default_instance_ = NULL;
-
-RspEnterSimPin* RspEnterSimPin::New() const {
-  return new RspEnterSimPin;
-}
-
-void RspEnterSimPin::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    retries_remaining_ = 0;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RspEnterSimPin::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required int32 retries_remaining = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &retries_remaining_)));
-          _set_bit(0);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void RspEnterSimPin::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required int32 retries_remaining = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->retries_remaining(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RspEnterSimPin::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required int32 retries_remaining = 1;
-  if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->retries_remaining(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RspEnterSimPin::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required int32 retries_remaining = 1;
-    if (has_retries_remaining()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->retries_remaining());
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void RspEnterSimPin::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RspEnterSimPin* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RspEnterSimPin*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RspEnterSimPin::MergeFrom(const RspEnterSimPin& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_retries_remaining(from.retries_remaining());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RspEnterSimPin::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RspEnterSimPin::CopyFrom(const RspEnterSimPin& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RspEnterSimPin::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
-  return true;
-}
-
-void RspEnterSimPin::Swap(RspEnterSimPin* other) {
-  if (other != this) {
-    std::swap(retries_remaining_, other->retries_remaining_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata RspEnterSimPin::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RspEnterSimPin_descriptor_;
-  metadata.reflection = RspEnterSimPin_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int ReqHangUp::kConnectionIndexFieldNumber;
-#endif  // !_MSC_VER
-
-ReqHangUp::ReqHangUp()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void ReqHangUp::InitAsDefaultInstance() {
-}
-
-ReqHangUp::ReqHangUp(const ReqHangUp& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void ReqHangUp::SharedCtor() {
-  _cached_size_ = 0;
-  connection_index_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-ReqHangUp::~ReqHangUp() {
-  SharedDtor();
-}
-
-void ReqHangUp::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void ReqHangUp::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ReqHangUp::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return ReqHangUp_descriptor_;
-}
-
-const ReqHangUp& ReqHangUp::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-ReqHangUp* ReqHangUp::default_instance_ = NULL;
-
-ReqHangUp* ReqHangUp::New() const {
-  return new ReqHangUp;
-}
-
-void ReqHangUp::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    connection_index_ = 0;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ReqHangUp::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required int32 connection_index = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &connection_index_)));
-          _set_bit(0);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void ReqHangUp::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required int32 connection_index = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->connection_index(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* ReqHangUp::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required int32 connection_index = 1;
-  if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->connection_index(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int ReqHangUp::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required int32 connection_index = 1;
-    if (has_connection_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->connection_index());
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ReqHangUp::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ReqHangUp* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ReqHangUp*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ReqHangUp::MergeFrom(const ReqHangUp& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_connection_index(from.connection_index());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ReqHangUp::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ReqHangUp::CopyFrom(const ReqHangUp& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ReqHangUp::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
-  return true;
-}
-
-void ReqHangUp::Swap(ReqHangUp* other) {
-  if (other != this) {
-    std::swap(connection_index_, other->connection_index_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata ReqHangUp::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ReqHangUp_descriptor_;
-  metadata.reflection = ReqHangUp_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int ReqScreenState::kStateFieldNumber;
-#endif  // !_MSC_VER
-
-ReqScreenState::ReqScreenState()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void ReqScreenState::InitAsDefaultInstance() {
-}
-
-ReqScreenState::ReqScreenState(const ReqScreenState& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void ReqScreenState::SharedCtor() {
-  _cached_size_ = 0;
-  state_ = false;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-ReqScreenState::~ReqScreenState() {
-  SharedDtor();
-}
-
-void ReqScreenState::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void ReqScreenState::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ReqScreenState::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return ReqScreenState_descriptor_;
-}
-
-const ReqScreenState& ReqScreenState::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-ReqScreenState* ReqScreenState::default_instance_ = NULL;
-
-ReqScreenState* ReqScreenState::New() const {
-  return new ReqScreenState;
-}
-
-void ReqScreenState::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    state_ = false;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ReqScreenState::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required bool state = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &state_)));
-          _set_bit(0);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void ReqScreenState::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required bool state = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->state(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* ReqScreenState::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required bool state = 1;
-  if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->state(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int ReqScreenState::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required bool state = 1;
-    if (has_state()) {
-      total_size += 1 + 1;
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ReqScreenState::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ReqScreenState* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ReqScreenState*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ReqScreenState::MergeFrom(const ReqScreenState& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_state(from.state());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ReqScreenState::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ReqScreenState::CopyFrom(const ReqScreenState& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ReqScreenState::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-  
-  return true;
-}
-
-void ReqScreenState::Swap(ReqScreenState* other) {
-  if (other != this) {
-    std::swap(state_, other->state_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata ReqScreenState::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ReqScreenState_descriptor_;
-  metadata.reflection = ReqScreenState_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-const ::std::string RspOperator::_default_long_alpha_ons_;
-const ::std::string RspOperator::_default_short_alpha_ons_;
-const ::std::string RspOperator::_default_mcc_mnc_;
-#ifndef _MSC_VER
-const int RspOperator::kLongAlphaOnsFieldNumber;
-const int RspOperator::kShortAlphaOnsFieldNumber;
-const int RspOperator::kMccMncFieldNumber;
-#endif  // !_MSC_VER
-
-RspOperator::RspOperator()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RspOperator::InitAsDefaultInstance() {
-}
-
-RspOperator::RspOperator(const RspOperator& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RspOperator::SharedCtor() {
-  _cached_size_ = 0;
-  long_alpha_ons_ = const_cast< ::std::string*>(&_default_long_alpha_ons_);
-  short_alpha_ons_ = const_cast< ::std::string*>(&_default_short_alpha_ons_);
-  mcc_mnc_ = const_cast< ::std::string*>(&_default_mcc_mnc_);
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RspOperator::~RspOperator() {
-  SharedDtor();
-}
-
-void RspOperator::SharedDtor() {
-  if (long_alpha_ons_ != &_default_long_alpha_ons_) {
-    delete long_alpha_ons_;
-  }
-  if (short_alpha_ons_ != &_default_short_alpha_ons_) {
-    delete short_alpha_ons_;
-  }
-  if (mcc_mnc_ != &_default_mcc_mnc_) {
-    delete mcc_mnc_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void RspOperator::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RspOperator::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RspOperator_descriptor_;
-}
-
-const RspOperator& RspOperator::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-RspOperator* RspOperator::default_instance_ = NULL;
-
-RspOperator* RspOperator::New() const {
-  return new RspOperator;
-}
-
-void RspOperator::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (_has_bit(0)) {
-      if (long_alpha_ons_ != &_default_long_alpha_ons_) {
-        long_alpha_ons_->clear();
-      }
-    }
-    if (_has_bit(1)) {
-      if (short_alpha_ons_ != &_default_short_alpha_ons_) {
-        short_alpha_ons_->clear();
-      }
-    }
-    if (_has_bit(2)) {
-      if (mcc_mnc_ != &_default_mcc_mnc_) {
-        mcc_mnc_->clear();
-      }
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RspOperator::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string long_alpha_ons = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_long_alpha_ons()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->long_alpha_ons().data(), this->long_alpha_ons().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_short_alpha_ons;
-        break;
-      }
-      
-      // optional string short_alpha_ons = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_short_alpha_ons:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_short_alpha_ons()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->short_alpha_ons().data(), this->short_alpha_ons().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_mcc_mnc;
-        break;
-      }
-      
-      // optional string mcc_mnc = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_mcc_mnc:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_mcc_mnc()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->mcc_mnc().data(), this->mcc_mnc().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-      
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void RspOperator::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional string long_alpha_ons = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->long_alpha_ons().data(), this->long_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      1, this->long_alpha_ons(), output);
-  }
-  
-  // optional string short_alpha_ons = 2;
-  if (_has_bit(1)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->short_alpha_ons().data(), this->short_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      2, this->short_alpha_ons(), output);
-  }
-  
-  // optional string mcc_mnc = 3;
-  if (_has_bit(2)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->mcc_mnc().data(), this->mcc_mnc().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->mcc_mnc(), output);
-  }
-  
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RspOperator::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional string long_alpha_ons = 1;
-  if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->long_alpha_ons().data(), this->long_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->long_alpha_ons(), target);
-  }
-  
-  // optional string short_alpha_ons = 2;
-  if (_has_bit(1)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->short_alpha_ons().data(), this->short_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->short_alpha_ons(), target);
-  }
-  
-  // optional string mcc_mnc = 3;
-  if (_has_bit(2)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->mcc_mnc().data(), this->mcc_mnc().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->mcc_mnc(), target);
-  }
-  
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RspOperator::ByteSize() const {
-  int total_size = 0;
-  
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional string long_alpha_ons = 1;
-    if (has_long_alpha_ons()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->long_alpha_ons());
-    }
-    
-    // optional string short_alpha_ons = 2;
-    if (has_short_alpha_ons()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->short_alpha_ons());
-    }
-    
-    // optional string mcc_mnc = 3;
-    if (has_mcc_mnc()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->mcc_mnc());
-    }
-    
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void RspOperator::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RspOperator* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RspOperator*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RspOperator::MergeFrom(const RspOperator& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from._has_bit(0)) {
-      set_long_alpha_ons(from.long_alpha_ons());
-    }
-    if (from._has_bit(1)) {
-      set_short_alpha_ons(from.short_alpha_ons());
-    }
-    if (from._has_bit(2)) {
-      set_mcc_mnc(from.mcc_mnc());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RspOperator::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RspOperator::CopyFrom(const RspOperator& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RspOperator::IsInitialized() const {
-  
-  return true;
-}
-
-void RspOperator::Swap(RspOperator* other) {
-  if (other != this) {
-    std::swap(long_alpha_ons_, other->long_alpha_ons_);
-    std::swap(short_alpha_ons_, other->short_alpha_ons_);
-    std::swap(mcc_mnc_, other->mcc_mnc_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata RspOperator::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RspOperator_descriptor_;
-  metadata.reflection = RspOperator_reflection_;
-  return metadata;
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace ril_proto
-
-// @@protoc_insertion_point(global_scope)
diff --git a/mock-ril/src/cpp/ril.pb.h b/mock-ril/src/cpp/ril.pb.h
deleted file mode 100644 (file)
index 80dd55b..0000000
+++ /dev/null
@@ -1,2036 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: ril.proto
-
-#ifndef PROTOBUF_ril_2eproto__INCLUDED
-#define PROTOBUF_ril_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 2003000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 2003000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_reflection.h>
-// @@protoc_insertion_point(includes)
-
-namespace ril_proto {
-
-// Internal implementation detail -- do not call these.
-void  protobuf_AddDesc_ril_2eproto();
-void protobuf_AssignDesc_ril_2eproto();
-void protobuf_ShutdownFile_ril_2eproto();
-
-class RilAppStatus;
-class RilCardStatus;
-class RspStrings;
-class RspIntegers;
-class ReqGetSimStatus;
-class RspGetSimStatus;
-class ReqEnterSimPin;
-class RspEnterSimPin;
-class ReqHangUp;
-class ReqScreenState;
-class RspOperator;
-
-enum RilCommand {
-  CMD_GET_SIM_STATUS = 1,
-  CMD_ENTER_SIM_PIN = 2,
-  CMD_HANGUP = 12,
-  CMD_SCREEN_STATE = 61
-};
-bool RilCommand_IsValid(int value);
-const RilCommand RilCommand_MIN = CMD_GET_SIM_STATUS;
-const RilCommand RilCommand_MAX = CMD_SCREEN_STATE;
-const int RilCommand_ARRAYSIZE = RilCommand_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RilCommand_descriptor();
-inline const ::std::string& RilCommand_Name(RilCommand value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RilCommand_descriptor(), value);
-}
-inline bool RilCommand_Parse(
-    const ::std::string& name, RilCommand* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RilCommand>(
-    RilCommand_descriptor(), name, value);
-}
-enum RadioState {
-  RADIO_STATE_OFF = 0,
-  RADIO_STATE_UNAVAILABLE = 1,
-  RADIO_STATE_SIM_NOT_READY = 2,
-  RADIO_STATE_SIM_LOCKED_OR_ABSENT = 3,
-  RADIO_STATE_SIM_READY = 4,
-  RADIO_STATE_RUIM_NOT_READY = 5,
-  RADIO_STATE_RUIM_READY = 6,
-  RADIO_STATE_RUIM_LOCKED_OR_ABSENT = 7,
-  RADIO_STATE_NV_NOT_READY = 8,
-  RADIO_STATE_NV_READY = 9
-};
-bool RadioState_IsValid(int value);
-const RadioState RadioState_MIN = RADIO_STATE_OFF;
-const RadioState RadioState_MAX = RADIO_STATE_NV_READY;
-const int RadioState_ARRAYSIZE = RadioState_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RadioState_descriptor();
-inline const ::std::string& RadioState_Name(RadioState value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RadioState_descriptor(), value);
-}
-inline bool RadioState_Parse(
-    const ::std::string& name, RadioState* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RadioState>(
-    RadioState_descriptor(), name, value);
-}
-enum RilCardState {
-  CARDSTATE_ABSENT = 0,
-  CARDSTATE_PRESENT = 1,
-  CARDSTATE_ERROR = 2
-};
-bool RilCardState_IsValid(int value);
-const RilCardState RilCardState_MIN = CARDSTATE_ABSENT;
-const RilCardState RilCardState_MAX = CARDSTATE_ERROR;
-const int RilCardState_ARRAYSIZE = RilCardState_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RilCardState_descriptor();
-inline const ::std::string& RilCardState_Name(RilCardState value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RilCardState_descriptor(), value);
-}
-inline bool RilCardState_Parse(
-    const ::std::string& name, RilCardState* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RilCardState>(
-    RilCardState_descriptor(), name, value);
-}
-enum RilPersoSubstate {
-  PERSOSUBSTATE_UNKNOWN = 0,
-  PERSOSUBSTATE_IN_PROGRESS = 1,
-  PERSOSUBSTATE_READY = 2,
-  PERSOSUBSTATE_SIM_NETWORK = 3,
-  PERSOSUBSTATE_SIM_NETWORK_SUBSET = 4,
-  PERSOSUBSTATE_SIM_CORPORATE = 5,
-  PERSOSUBSTATE_SIM_SERVICE_PROVIDER = 6,
-  PERSOSUBSTATE_SIM_SIM = 7,
-  PERSOSUBSTATE_SIM_NETWORK_PUK = 8,
-  PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK = 9,
-  PERSOSUBSTATE_SIM_CORPORATE_PUK = 10,
-  PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK = 11,
-  PERSOSUBSTATE_SIM_SIM_PUK = 12,
-  PERSOSUBSTATE_RUIM_NETWORK1 = 13,
-  PERSOSUBSTATE_RUIM_NETWORK2 = 14,
-  PERSOSUBSTATE_RUIM_HRPD = 15,
-  PERSOSUBSTATE_RUIM_CORPORATE = 16,
-  PERSOSUBSTATE_RUIM_SERVICE_PROVIDER = 17,
-  PERSOSUBSTATE_RUIM_RUIM = 18,
-  PERSOSUBSTATE_RUIM_NETWORK1_PUK = 19,
-  PERSOSUBSTATE_RUIM_NETWORK2_PUK = 20,
-  PERSOSUBSTATE_RUIM_HRPD_PUK = 21,
-  PERSOSUBSTATE_RUIM_CORPORATE_PUK = 22,
-  PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK = 23,
-  PERSOSUBSTATE_RUIM_RUIM_PUK = 24
-};
-bool RilPersoSubstate_IsValid(int value);
-const RilPersoSubstate RilPersoSubstate_MIN = PERSOSUBSTATE_UNKNOWN;
-const RilPersoSubstate RilPersoSubstate_MAX = PERSOSUBSTATE_RUIM_RUIM_PUK;
-const int RilPersoSubstate_ARRAYSIZE = RilPersoSubstate_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RilPersoSubstate_descriptor();
-inline const ::std::string& RilPersoSubstate_Name(RilPersoSubstate value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RilPersoSubstate_descriptor(), value);
-}
-inline bool RilPersoSubstate_Parse(
-    const ::std::string& name, RilPersoSubstate* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RilPersoSubstate>(
-    RilPersoSubstate_descriptor(), name, value);
-}
-enum RilAppState {
-  APPSTATE_UNKNOWN = 0,
-  APPSTATE_DETECTED = 1,
-  APPSTATE_PIN = 2,
-  APPSTATE_PUK = 3,
-  APPSTATE_SUBSCRIPTION_PERSO = 4,
-  APPSTATE_READY = 5
-};
-bool RilAppState_IsValid(int value);
-const RilAppState RilAppState_MIN = APPSTATE_UNKNOWN;
-const RilAppState RilAppState_MAX = APPSTATE_READY;
-const int RilAppState_ARRAYSIZE = RilAppState_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RilAppState_descriptor();
-inline const ::std::string& RilAppState_Name(RilAppState value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RilAppState_descriptor(), value);
-}
-inline bool RilAppState_Parse(
-    const ::std::string& name, RilAppState* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RilAppState>(
-    RilAppState_descriptor(), name, value);
-}
-enum RilPinState {
-  PINSTATE_UNKNOWN = 0,
-  PINSTATE_ENABLED_NOT_VERIFIED = 1,
-  PINSTATE_ENABLED_VERIFIED = 2,
-  PINSTATE_DISABLED = 3,
-  PINSTATE_ENABLED_BLOCKED = 4,
-  PINSTATE_ENABLED_PERM_BLOCKED = 5
-};
-bool RilPinState_IsValid(int value);
-const RilPinState RilPinState_MIN = PINSTATE_UNKNOWN;
-const RilPinState RilPinState_MAX = PINSTATE_ENABLED_PERM_BLOCKED;
-const int RilPinState_ARRAYSIZE = RilPinState_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RilPinState_descriptor();
-inline const ::std::string& RilPinState_Name(RilPinState value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RilPinState_descriptor(), value);
-}
-inline bool RilPinState_Parse(
-    const ::std::string& name, RilPinState* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RilPinState>(
-    RilPinState_descriptor(), name, value);
-}
-enum RilAppType {
-  APPTYPE_UNKNOWN = 0,
-  APPTYPE_SIM = 1,
-  APPTYPE_USIM = 2,
-  APPTYPE_RUIM = 3,
-  APPTYPE_CSIM = 4
-};
-bool RilAppType_IsValid(int value);
-const RilAppType RilAppType_MIN = APPTYPE_UNKNOWN;
-const RilAppType RilAppType_MAX = APPTYPE_CSIM;
-const int RilAppType_ARRAYSIZE = RilAppType_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RilAppType_descriptor();
-inline const ::std::string& RilAppType_Name(RilAppType value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RilAppType_descriptor(), value);
-}
-inline bool RilAppType_Parse(
-    const ::std::string& name, RilAppType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RilAppType>(
-    RilAppType_descriptor(), name, value);
-}
-// ===================================================================
-
-class RilAppStatus : public ::google::protobuf::Message {
- public:
-  RilAppStatus();
-  virtual ~RilAppStatus();
-  
-  RilAppStatus(const RilAppStatus& from);
-  
-  inline RilAppStatus& operator=(const RilAppStatus& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const RilAppStatus& default_instance();
-  
-  void Swap(RilAppStatus* other);
-  
-  // implements Message ----------------------------------------------
-  
-  RilAppStatus* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RilAppStatus& from);
-  void MergeFrom(const RilAppStatus& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // optional .ril_proto.RilAppType app_type = 1;
-  inline bool has_app_type() const;
-  inline void clear_app_type();
-  static const int kAppTypeFieldNumber = 1;
-  inline ril_proto::RilAppType app_type() const;
-  inline void set_app_type(ril_proto::RilAppType value);
-  
-  // optional .ril_proto.RilAppState app_state = 2;
-  inline bool has_app_state() const;
-  inline void clear_app_state();
-  static const int kAppStateFieldNumber = 2;
-  inline ril_proto::RilAppState app_state() const;
-  inline void set_app_state(ril_proto::RilAppState value);
-  
-  // optional .ril_proto.RilPersoSubstate perso_substate = 3;
-  inline bool has_perso_substate() const;
-  inline void clear_perso_substate();
-  static const int kPersoSubstateFieldNumber = 3;
-  inline ril_proto::RilPersoSubstate perso_substate() const;
-  inline void set_perso_substate(ril_proto::RilPersoSubstate value);
-  
-  // optional string aid = 4;
-  inline bool has_aid() const;
-  inline void clear_aid();
-  static const int kAidFieldNumber = 4;
-  inline const ::std::string& aid() const;
-  inline void set_aid(const ::std::string& value);
-  inline void set_aid(const char* value);
-  inline void set_aid(const char* value, size_t size);
-  inline ::std::string* mutable_aid();
-  
-  // optional string app_label = 5;
-  inline bool has_app_label() const;
-  inline void clear_app_label();
-  static const int kAppLabelFieldNumber = 5;
-  inline const ::std::string& app_label() const;
-  inline void set_app_label(const ::std::string& value);
-  inline void set_app_label(const char* value);
-  inline void set_app_label(const char* value, size_t size);
-  inline ::std::string* mutable_app_label();
-  
-  // optional int32 pin1_replaced = 6;
-  inline bool has_pin1_replaced() const;
-  inline void clear_pin1_replaced();
-  static const int kPin1ReplacedFieldNumber = 6;
-  inline ::google::protobuf::int32 pin1_replaced() const;
-  inline void set_pin1_replaced(::google::protobuf::int32 value);
-  
-  // optional .ril_proto.RilPinState pin1 = 7;
-  inline bool has_pin1() const;
-  inline void clear_pin1();
-  static const int kPin1FieldNumber = 7;
-  inline ril_proto::RilPinState pin1() const;
-  inline void set_pin1(ril_proto::RilPinState value);
-  
-  // optional .ril_proto.RilPinState pin2 = 8;
-  inline bool has_pin2() const;
-  inline void clear_pin2();
-  static const int kPin2FieldNumber = 8;
-  inline ril_proto::RilPinState pin2() const;
-  inline void set_pin2(ril_proto::RilPinState value);
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.RilAppStatus)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  int app_type_;
-  int app_state_;
-  int perso_substate_;
-  ::std::string* aid_;
-  static const ::std::string _default_aid_;
-  ::std::string* app_label_;
-  static const ::std::string _default_app_label_;
-  ::google::protobuf::int32 pin1_replaced_;
-  int pin1_;
-  int pin2_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static RilAppStatus* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class RilCardStatus : public ::google::protobuf::Message {
- public:
-  RilCardStatus();
-  virtual ~RilCardStatus();
-  
-  RilCardStatus(const RilCardStatus& from);
-  
-  inline RilCardStatus& operator=(const RilCardStatus& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const RilCardStatus& default_instance();
-  
-  void Swap(RilCardStatus* other);
-  
-  // implements Message ----------------------------------------------
-  
-  RilCardStatus* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RilCardStatus& from);
-  void MergeFrom(const RilCardStatus& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // optional .ril_proto.RilCardState card_state = 1;
-  inline bool has_card_state() const;
-  inline void clear_card_state();
-  static const int kCardStateFieldNumber = 1;
-  inline ril_proto::RilCardState card_state() const;
-  inline void set_card_state(ril_proto::RilCardState value);
-  
-  // optional .ril_proto.RilPinState universal_pin_state = 2;
-  inline bool has_universal_pin_state() const;
-  inline void clear_universal_pin_state();
-  static const int kUniversalPinStateFieldNumber = 2;
-  inline ril_proto::RilPinState universal_pin_state() const;
-  inline void set_universal_pin_state(ril_proto::RilPinState value);
-  
-  // optional int32 gsm_umts_subscription_app_index = 3;
-  inline bool has_gsm_umts_subscription_app_index() const;
-  inline void clear_gsm_umts_subscription_app_index();
-  static const int kGsmUmtsSubscriptionAppIndexFieldNumber = 3;
-  inline ::google::protobuf::int32 gsm_umts_subscription_app_index() const;
-  inline void set_gsm_umts_subscription_app_index(::google::protobuf::int32 value);
-  
-  // optional int32 cdma_subscription_app_index = 4;
-  inline bool has_cdma_subscription_app_index() const;
-  inline void clear_cdma_subscription_app_index();
-  static const int kCdmaSubscriptionAppIndexFieldNumber = 4;
-  inline ::google::protobuf::int32 cdma_subscription_app_index() const;
-  inline void set_cdma_subscription_app_index(::google::protobuf::int32 value);
-  
-  // optional int32 num_applications = 5;
-  inline bool has_num_applications() const;
-  inline void clear_num_applications();
-  static const int kNumApplicationsFieldNumber = 5;
-  inline ::google::protobuf::int32 num_applications() const;
-  inline void set_num_applications(::google::protobuf::int32 value);
-  
-  // repeated .ril_proto.RilAppStatus applications = 6;
-  inline int applications_size() const;
-  inline void clear_applications();
-  static const int kApplicationsFieldNumber = 6;
-  inline const ::ril_proto::RilAppStatus& applications(int index) const;
-  inline ::ril_proto::RilAppStatus* mutable_applications(int index);
-  inline ::ril_proto::RilAppStatus* add_applications();
-  inline const ::google::protobuf::RepeatedPtrField< ::ril_proto::RilAppStatus >&
-      applications() const;
-  inline ::google::protobuf::RepeatedPtrField< ::ril_proto::RilAppStatus >*
-      mutable_applications();
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.RilCardStatus)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  int card_state_;
-  int universal_pin_state_;
-  ::google::protobuf::int32 gsm_umts_subscription_app_index_;
-  ::google::protobuf::int32 cdma_subscription_app_index_;
-  ::google::protobuf::int32 num_applications_;
-  ::google::protobuf::RepeatedPtrField< ::ril_proto::RilAppStatus > applications_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static RilCardStatus* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class RspStrings : public ::google::protobuf::Message {
- public:
-  RspStrings();
-  virtual ~RspStrings();
-  
-  RspStrings(const RspStrings& from);
-  
-  inline RspStrings& operator=(const RspStrings& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const RspStrings& default_instance();
-  
-  void Swap(RspStrings* other);
-  
-  // implements Message ----------------------------------------------
-  
-  RspStrings* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RspStrings& from);
-  void MergeFrom(const RspStrings& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // repeated string strings = 1;
-  inline int strings_size() const;
-  inline void clear_strings();
-  static const int kStringsFieldNumber = 1;
-  inline const ::std::string& strings(int index) const;
-  inline ::std::string* mutable_strings(int index);
-  inline void set_strings(int index, const ::std::string& value);
-  inline void set_strings(int index, const char* value);
-  inline void set_strings(int index, const char* value, size_t size);
-  inline ::std::string* add_strings();
-  inline void add_strings(const ::std::string& value);
-  inline void add_strings(const char* value);
-  inline void add_strings(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& strings() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_strings();
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.RspStrings)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  ::google::protobuf::RepeatedPtrField< ::std::string> strings_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static RspStrings* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class RspIntegers : public ::google::protobuf::Message {
- public:
-  RspIntegers();
-  virtual ~RspIntegers();
-  
-  RspIntegers(const RspIntegers& from);
-  
-  inline RspIntegers& operator=(const RspIntegers& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const RspIntegers& default_instance();
-  
-  void Swap(RspIntegers* other);
-  
-  // implements Message ----------------------------------------------
-  
-  RspIntegers* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RspIntegers& from);
-  void MergeFrom(const RspIntegers& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // repeated int32 integers = 1;
-  inline int integers_size() const;
-  inline void clear_integers();
-  static const int kIntegersFieldNumber = 1;
-  inline ::google::protobuf::int32 integers(int index) const;
-  inline void set_integers(int index, ::google::protobuf::int32 value);
-  inline void add_integers(::google::protobuf::int32 value);
-  inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
-      integers() const;
-  inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
-      mutable_integers();
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.RspIntegers)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  ::google::protobuf::RepeatedField< ::google::protobuf::int32 > integers_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static RspIntegers* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class ReqGetSimStatus : public ::google::protobuf::Message {
- public:
-  ReqGetSimStatus();
-  virtual ~ReqGetSimStatus();
-  
-  ReqGetSimStatus(const ReqGetSimStatus& from);
-  
-  inline ReqGetSimStatus& operator=(const ReqGetSimStatus& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ReqGetSimStatus& default_instance();
-  
-  void Swap(ReqGetSimStatus* other);
-  
-  // implements Message ----------------------------------------------
-  
-  ReqGetSimStatus* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReqGetSimStatus& from);
-  void MergeFrom(const ReqGetSimStatus& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.ReqGetSimStatus)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[1];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static ReqGetSimStatus* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class RspGetSimStatus : public ::google::protobuf::Message {
- public:
-  RspGetSimStatus();
-  virtual ~RspGetSimStatus();
-  
-  RspGetSimStatus(const RspGetSimStatus& from);
-  
-  inline RspGetSimStatus& operator=(const RspGetSimStatus& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const RspGetSimStatus& default_instance();
-  
-  void Swap(RspGetSimStatus* other);
-  
-  // implements Message ----------------------------------------------
-  
-  RspGetSimStatus* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RspGetSimStatus& from);
-  void MergeFrom(const RspGetSimStatus& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // required .ril_proto.RilCardStatus card_status = 1;
-  inline bool has_card_status() const;
-  inline void clear_card_status();
-  static const int kCardStatusFieldNumber = 1;
-  inline const ::ril_proto::RilCardStatus& card_status() const;
-  inline ::ril_proto::RilCardStatus* mutable_card_status();
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.RspGetSimStatus)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  ::ril_proto::RilCardStatus* card_status_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static RspGetSimStatus* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class ReqEnterSimPin : public ::google::protobuf::Message {
- public:
-  ReqEnterSimPin();
-  virtual ~ReqEnterSimPin();
-  
-  ReqEnterSimPin(const ReqEnterSimPin& from);
-  
-  inline ReqEnterSimPin& operator=(const ReqEnterSimPin& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ReqEnterSimPin& default_instance();
-  
-  void Swap(ReqEnterSimPin* other);
-  
-  // implements Message ----------------------------------------------
-  
-  ReqEnterSimPin* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReqEnterSimPin& from);
-  void MergeFrom(const ReqEnterSimPin& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // required string pin = 1;
-  inline bool has_pin() const;
-  inline void clear_pin();
-  static const int kPinFieldNumber = 1;
-  inline const ::std::string& pin() const;
-  inline void set_pin(const ::std::string& value);
-  inline void set_pin(const char* value);
-  inline void set_pin(const char* value, size_t size);
-  inline ::std::string* mutable_pin();
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.ReqEnterSimPin)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  ::std::string* pin_;
-  static const ::std::string _default_pin_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static ReqEnterSimPin* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class RspEnterSimPin : public ::google::protobuf::Message {
- public:
-  RspEnterSimPin();
-  virtual ~RspEnterSimPin();
-  
-  RspEnterSimPin(const RspEnterSimPin& from);
-  
-  inline RspEnterSimPin& operator=(const RspEnterSimPin& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const RspEnterSimPin& default_instance();
-  
-  void Swap(RspEnterSimPin* other);
-  
-  // implements Message ----------------------------------------------
-  
-  RspEnterSimPin* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RspEnterSimPin& from);
-  void MergeFrom(const RspEnterSimPin& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // required int32 retries_remaining = 1;
-  inline bool has_retries_remaining() const;
-  inline void clear_retries_remaining();
-  static const int kRetriesRemainingFieldNumber = 1;
-  inline ::google::protobuf::int32 retries_remaining() const;
-  inline void set_retries_remaining(::google::protobuf::int32 value);
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.RspEnterSimPin)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  ::google::protobuf::int32 retries_remaining_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static RspEnterSimPin* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class ReqHangUp : public ::google::protobuf::Message {
- public:
-  ReqHangUp();
-  virtual ~ReqHangUp();
-  
-  ReqHangUp(const ReqHangUp& from);
-  
-  inline ReqHangUp& operator=(const ReqHangUp& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ReqHangUp& default_instance();
-  
-  void Swap(ReqHangUp* other);
-  
-  // implements Message ----------------------------------------------
-  
-  ReqHangUp* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReqHangUp& from);
-  void MergeFrom(const ReqHangUp& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // required int32 connection_index = 1;
-  inline bool has_connection_index() const;
-  inline void clear_connection_index();
-  static const int kConnectionIndexFieldNumber = 1;
-  inline ::google::protobuf::int32 connection_index() const;
-  inline void set_connection_index(::google::protobuf::int32 value);
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.ReqHangUp)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  ::google::protobuf::int32 connection_index_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static ReqHangUp* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class ReqScreenState : public ::google::protobuf::Message {
- public:
-  ReqScreenState();
-  virtual ~ReqScreenState();
-  
-  ReqScreenState(const ReqScreenState& from);
-  
-  inline ReqScreenState& operator=(const ReqScreenState& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ReqScreenState& default_instance();
-  
-  void Swap(ReqScreenState* other);
-  
-  // implements Message ----------------------------------------------
-  
-  ReqScreenState* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReqScreenState& from);
-  void MergeFrom(const ReqScreenState& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // required bool state = 1;
-  inline bool has_state() const;
-  inline void clear_state();
-  static const int kStateFieldNumber = 1;
-  inline bool state() const;
-  inline void set_state(bool value);
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.ReqScreenState)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  bool state_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static ReqScreenState* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class RspOperator : public ::google::protobuf::Message {
- public:
-  RspOperator();
-  virtual ~RspOperator();
-  
-  RspOperator(const RspOperator& from);
-  
-  inline RspOperator& operator=(const RspOperator& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const RspOperator& default_instance();
-  
-  void Swap(RspOperator* other);
-  
-  // implements Message ----------------------------------------------
-  
-  RspOperator* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RspOperator& from);
-  void MergeFrom(const RspOperator& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // optional string long_alpha_ons = 1;
-  inline bool has_long_alpha_ons() const;
-  inline void clear_long_alpha_ons();
-  static const int kLongAlphaOnsFieldNumber = 1;
-  inline const ::std::string& long_alpha_ons() const;
-  inline void set_long_alpha_ons(const ::std::string& value);
-  inline void set_long_alpha_ons(const char* value);
-  inline void set_long_alpha_ons(const char* value, size_t size);
-  inline ::std::string* mutable_long_alpha_ons();
-  
-  // optional string short_alpha_ons = 2;
-  inline bool has_short_alpha_ons() const;
-  inline void clear_short_alpha_ons();
-  static const int kShortAlphaOnsFieldNumber = 2;
-  inline const ::std::string& short_alpha_ons() const;
-  inline void set_short_alpha_ons(const ::std::string& value);
-  inline void set_short_alpha_ons(const char* value);
-  inline void set_short_alpha_ons(const char* value, size_t size);
-  inline ::std::string* mutable_short_alpha_ons();
-  
-  // optional string mcc_mnc = 3;
-  inline bool has_mcc_mnc() const;
-  inline void clear_mcc_mnc();
-  static const int kMccMncFieldNumber = 3;
-  inline const ::std::string& mcc_mnc() const;
-  inline void set_mcc_mnc(const ::std::string& value);
-  inline void set_mcc_mnc(const char* value);
-  inline void set_mcc_mnc(const char* value, size_t size);
-  inline ::std::string* mutable_mcc_mnc();
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.RspOperator)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  ::std::string* long_alpha_ons_;
-  static const ::std::string _default_long_alpha_ons_;
-  ::std::string* short_alpha_ons_;
-  static const ::std::string _default_short_alpha_ons_;
-  ::std::string* mcc_mnc_;
-  static const ::std::string _default_mcc_mnc_;
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static RspOperator* default_instance_;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-// RilAppStatus
-
-// optional .ril_proto.RilAppType app_type = 1;
-inline bool RilAppStatus::has_app_type() const {
-  return _has_bit(0);
-}
-inline void RilAppStatus::clear_app_type() {
-  app_type_ = 0;
-  _clear_bit(0);
-}
-inline ril_proto::RilAppType RilAppStatus::app_type() const {
-  return static_cast< ril_proto::RilAppType >(app_type_);
-}
-inline void RilAppStatus::set_app_type(ril_proto::RilAppType value) {
-  GOOGLE_DCHECK(ril_proto::RilAppType_IsValid(value));
-  _set_bit(0);
-  app_type_ = value;
-}
-
-// optional .ril_proto.RilAppState app_state = 2;
-inline bool RilAppStatus::has_app_state() const {
-  return _has_bit(1);
-}
-inline void RilAppStatus::clear_app_state() {
-  app_state_ = 0;
-  _clear_bit(1);
-}
-inline ril_proto::RilAppState RilAppStatus::app_state() const {
-  return static_cast< ril_proto::RilAppState >(app_state_);
-}
-inline void RilAppStatus::set_app_state(ril_proto::RilAppState value) {
-  GOOGLE_DCHECK(ril_proto::RilAppState_IsValid(value));
-  _set_bit(1);
-  app_state_ = value;
-}
-
-// optional .ril_proto.RilPersoSubstate perso_substate = 3;
-inline bool RilAppStatus::has_perso_substate() const {
-  return _has_bit(2);
-}
-inline void RilAppStatus::clear_perso_substate() {
-  perso_substate_ = 0;
-  _clear_bit(2);
-}
-inline ril_proto::RilPersoSubstate RilAppStatus::perso_substate() const {
-  return static_cast< ril_proto::RilPersoSubstate >(perso_substate_);
-}
-inline void RilAppStatus::set_perso_substate(ril_proto::RilPersoSubstate value) {
-  GOOGLE_DCHECK(ril_proto::RilPersoSubstate_IsValid(value));
-  _set_bit(2);
-  perso_substate_ = value;
-}
-
-// optional string aid = 4;
-inline bool RilAppStatus::has_aid() const {
-  return _has_bit(3);
-}
-inline void RilAppStatus::clear_aid() {
-  if (aid_ != &_default_aid_) {
-    aid_->clear();
-  }
-  _clear_bit(3);
-}
-inline const ::std::string& RilAppStatus::aid() const {
-  return *aid_;
-}
-inline void RilAppStatus::set_aid(const ::std::string& value) {
-  _set_bit(3);
-  if (aid_ == &_default_aid_) {
-    aid_ = new ::std::string;
-  }
-  aid_->assign(value);
-}
-inline void RilAppStatus::set_aid(const char* value) {
-  _set_bit(3);
-  if (aid_ == &_default_aid_) {
-    aid_ = new ::std::string;
-  }
-  aid_->assign(value);
-}
-inline void RilAppStatus::set_aid(const char* value, size_t size) {
-  _set_bit(3);
-  if (aid_ == &_default_aid_) {
-    aid_ = new ::std::string;
-  }
-  aid_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RilAppStatus::mutable_aid() {
-  _set_bit(3);
-  if (aid_ == &_default_aid_) {
-    aid_ = new ::std::string;
-  }
-  return aid_;
-}
-
-// optional string app_label = 5;
-inline bool RilAppStatus::has_app_label() const {
-  return _has_bit(4);
-}
-inline void RilAppStatus::clear_app_label() {
-  if (app_label_ != &_default_app_label_) {
-    app_label_->clear();
-  }
-  _clear_bit(4);
-}
-inline const ::std::string& RilAppStatus::app_label() const {
-  return *app_label_;
-}
-inline void RilAppStatus::set_app_label(const ::std::string& value) {
-  _set_bit(4);
-  if (app_label_ == &_default_app_label_) {
-    app_label_ = new ::std::string;
-  }
-  app_label_->assign(value);
-}
-inline void RilAppStatus::set_app_label(const char* value) {
-  _set_bit(4);
-  if (app_label_ == &_default_app_label_) {
-    app_label_ = new ::std::string;
-  }
-  app_label_->assign(value);
-}
-inline void RilAppStatus::set_app_label(const char* value, size_t size) {
-  _set_bit(4);
-  if (app_label_ == &_default_app_label_) {
-    app_label_ = new ::std::string;
-  }
-  app_label_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RilAppStatus::mutable_app_label() {
-  _set_bit(4);
-  if (app_label_ == &_default_app_label_) {
-    app_label_ = new ::std::string;
-  }
-  return app_label_;
-}
-
-// optional int32 pin1_replaced = 6;
-inline bool RilAppStatus::has_pin1_replaced() const {
-  return _has_bit(5);
-}
-inline void RilAppStatus::clear_pin1_replaced() {
-  pin1_replaced_ = 0;
-  _clear_bit(5);
-}
-inline ::google::protobuf::int32 RilAppStatus::pin1_replaced() const {
-  return pin1_replaced_;
-}
-inline void RilAppStatus::set_pin1_replaced(::google::protobuf::int32 value) {
-  _set_bit(5);
-  pin1_replaced_ = value;
-}
-
-// optional .ril_proto.RilPinState pin1 = 7;
-inline bool RilAppStatus::has_pin1() const {
-  return _has_bit(6);
-}
-inline void RilAppStatus::clear_pin1() {
-  pin1_ = 0;
-  _clear_bit(6);
-}
-inline ril_proto::RilPinState RilAppStatus::pin1() const {
-  return static_cast< ril_proto::RilPinState >(pin1_);
-}
-inline void RilAppStatus::set_pin1(ril_proto::RilPinState value) {
-  GOOGLE_DCHECK(ril_proto::RilPinState_IsValid(value));
-  _set_bit(6);
-  pin1_ = value;
-}
-
-// optional .ril_proto.RilPinState pin2 = 8;
-inline bool RilAppStatus::has_pin2() const {
-  return _has_bit(7);
-}
-inline void RilAppStatus::clear_pin2() {
-  pin2_ = 0;
-  _clear_bit(7);
-}
-inline ril_proto::RilPinState RilAppStatus::pin2() const {
-  return static_cast< ril_proto::RilPinState >(pin2_);
-}
-inline void RilAppStatus::set_pin2(ril_proto::RilPinState value) {
-  GOOGLE_DCHECK(ril_proto::RilPinState_IsValid(value));
-  _set_bit(7);
-  pin2_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// RilCardStatus
-
-// optional .ril_proto.RilCardState card_state = 1;
-inline bool RilCardStatus::has_card_state() const {
-  return _has_bit(0);
-}
-inline void RilCardStatus::clear_card_state() {
-  card_state_ = 0;
-  _clear_bit(0);
-}
-inline ril_proto::RilCardState RilCardStatus::card_state() const {
-  return static_cast< ril_proto::RilCardState >(card_state_);
-}
-inline void RilCardStatus::set_card_state(ril_proto::RilCardState value) {
-  GOOGLE_DCHECK(ril_proto::RilCardState_IsValid(value));
-  _set_bit(0);
-  card_state_ = value;
-}
-
-// optional .ril_proto.RilPinState universal_pin_state = 2;
-inline bool RilCardStatus::has_universal_pin_state() const {
-  return _has_bit(1);
-}
-inline void RilCardStatus::clear_universal_pin_state() {
-  universal_pin_state_ = 0;
-  _clear_bit(1);
-}
-inline ril_proto::RilPinState RilCardStatus::universal_pin_state() const {
-  return static_cast< ril_proto::RilPinState >(universal_pin_state_);
-}
-inline void RilCardStatus::set_universal_pin_state(ril_proto::RilPinState value) {
-  GOOGLE_DCHECK(ril_proto::RilPinState_IsValid(value));
-  _set_bit(1);
-  universal_pin_state_ = value;
-}
-
-// optional int32 gsm_umts_subscription_app_index = 3;
-inline bool RilCardStatus::has_gsm_umts_subscription_app_index() const {
-  return _has_bit(2);
-}
-inline void RilCardStatus::clear_gsm_umts_subscription_app_index() {
-  gsm_umts_subscription_app_index_ = 0;
-  _clear_bit(2);
-}
-inline ::google::protobuf::int32 RilCardStatus::gsm_umts_subscription_app_index() const {
-  return gsm_umts_subscription_app_index_;
-}
-inline void RilCardStatus::set_gsm_umts_subscription_app_index(::google::protobuf::int32 value) {
-  _set_bit(2);
-  gsm_umts_subscription_app_index_ = value;
-}
-
-// optional int32 cdma_subscription_app_index = 4;
-inline bool RilCardStatus::has_cdma_subscription_app_index() const {
-  return _has_bit(3);
-}
-inline void RilCardStatus::clear_cdma_subscription_app_index() {
-  cdma_subscription_app_index_ = 0;
-  _clear_bit(3);
-}
-inline ::google::protobuf::int32 RilCardStatus::cdma_subscription_app_index() const {
-  return cdma_subscription_app_index_;
-}
-inline void RilCardStatus::set_cdma_subscription_app_index(::google::protobuf::int32 value) {
-  _set_bit(3);
-  cdma_subscription_app_index_ = value;
-}
-
-// optional int32 num_applications = 5;
-inline bool RilCardStatus::has_num_applications() const {
-  return _has_bit(4);
-}
-inline void RilCardStatus::clear_num_applications() {
-  num_applications_ = 0;
-  _clear_bit(4);
-}
-inline ::google::protobuf::int32 RilCardStatus::num_applications() const {
-  return num_applications_;
-}
-inline void RilCardStatus::set_num_applications(::google::protobuf::int32 value) {
-  _set_bit(4);
-  num_applications_ = value;
-}
-
-// repeated .ril_proto.RilAppStatus applications = 6;
-inline int RilCardStatus::applications_size() const {
-  return applications_.size();
-}
-inline void RilCardStatus::clear_applications() {
-  applications_.Clear();
-}
-inline const ::ril_proto::RilAppStatus& RilCardStatus::applications(int index) const {
-  return applications_.Get(index);
-}
-inline ::ril_proto::RilAppStatus* RilCardStatus::mutable_applications(int index) {
-  return applications_.Mutable(index);
-}
-inline ::ril_proto::RilAppStatus* RilCardStatus::add_applications() {
-  return applications_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::ril_proto::RilAppStatus >&
-RilCardStatus::applications() const {
-  return applications_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::ril_proto::RilAppStatus >*
-RilCardStatus::mutable_applications() {
-  return &applications_;
-}
-
-// -------------------------------------------------------------------
-
-// RspStrings
-
-// repeated string strings = 1;
-inline int RspStrings::strings_size() const {
-  return strings_.size();
-}
-inline void RspStrings::clear_strings() {
-  strings_.Clear();
-}
-inline const ::std::string& RspStrings::strings(int index) const {
-  return strings_.Get(index);
-}
-inline ::std::string* RspStrings::mutable_strings(int index) {
-  return strings_.Mutable(index);
-}
-inline void RspStrings::set_strings(int index, const ::std::string& value) {
-  strings_.Mutable(index)->assign(value);
-}
-inline void RspStrings::set_strings(int index, const char* value) {
-  strings_.Mutable(index)->assign(value);
-}
-inline void RspStrings::set_strings(int index, const char* value, size_t size) {
-  strings_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RspStrings::add_strings() {
-  return strings_.Add();
-}
-inline void RspStrings::add_strings(const ::std::string& value) {
-  strings_.Add()->assign(value);
-}
-inline void RspStrings::add_strings(const char* value) {
-  strings_.Add()->assign(value);
-}
-inline void RspStrings::add_strings(const char* value, size_t size) {
-  strings_.Add()->assign(reinterpret_cast<const char*>(value), size);
-}
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-RspStrings::strings() const {
-  return strings_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-RspStrings::mutable_strings() {
-  return &strings_;
-}
-
-// -------------------------------------------------------------------
-
-// RspIntegers
-
-// repeated int32 integers = 1;
-inline int RspIntegers::integers_size() const {
-  return integers_.size();
-}
-inline void RspIntegers::clear_integers() {
-  integers_.Clear();
-}
-inline ::google::protobuf::int32 RspIntegers::integers(int index) const {
-  return integers_.Get(index);
-}
-inline void RspIntegers::set_integers(int index, ::google::protobuf::int32 value) {
-  integers_.Set(index, value);
-}
-inline void RspIntegers::add_integers(::google::protobuf::int32 value) {
-  integers_.Add(value);
-}
-inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
-RspIntegers::integers() const {
-  return integers_;
-}
-inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
-RspIntegers::mutable_integers() {
-  return &integers_;
-}
-
-// -------------------------------------------------------------------
-
-// ReqGetSimStatus
-
-// -------------------------------------------------------------------
-
-// RspGetSimStatus
-
-// required .ril_proto.RilCardStatus card_status = 1;
-inline bool RspGetSimStatus::has_card_status() const {
-  return _has_bit(0);
-}
-inline void RspGetSimStatus::clear_card_status() {
-  if (card_status_ != NULL) card_status_->::ril_proto::RilCardStatus::Clear();
-  _clear_bit(0);
-}
-inline const ::ril_proto::RilCardStatus& RspGetSimStatus::card_status() const {
-  return card_status_ != NULL ? *card_status_ : *default_instance_->card_status_;
-}
-inline ::ril_proto::RilCardStatus* RspGetSimStatus::mutable_card_status() {
-  _set_bit(0);
-  if (card_status_ == NULL) card_status_ = new ::ril_proto::RilCardStatus;
-  return card_status_;
-}
-
-// -------------------------------------------------------------------
-
-// ReqEnterSimPin
-
-// required string pin = 1;
-inline bool ReqEnterSimPin::has_pin() const {
-  return _has_bit(0);
-}
-inline void ReqEnterSimPin::clear_pin() {
-  if (pin_ != &_default_pin_) {
-    pin_->clear();
-  }
-  _clear_bit(0);
-}
-inline const ::std::string& ReqEnterSimPin::pin() const {
-  return *pin_;
-}
-inline void ReqEnterSimPin::set_pin(const ::std::string& value) {
-  _set_bit(0);
-  if (pin_ == &_default_pin_) {
-    pin_ = new ::std::string;
-  }
-  pin_->assign(value);
-}
-inline void ReqEnterSimPin::set_pin(const char* value) {
-  _set_bit(0);
-  if (pin_ == &_default_pin_) {
-    pin_ = new ::std::string;
-  }
-  pin_->assign(value);
-}
-inline void ReqEnterSimPin::set_pin(const char* value, size_t size) {
-  _set_bit(0);
-  if (pin_ == &_default_pin_) {
-    pin_ = new ::std::string;
-  }
-  pin_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* ReqEnterSimPin::mutable_pin() {
-  _set_bit(0);
-  if (pin_ == &_default_pin_) {
-    pin_ = new ::std::string;
-  }
-  return pin_;
-}
-
-// -------------------------------------------------------------------
-
-// RspEnterSimPin
-
-// required int32 retries_remaining = 1;
-inline bool RspEnterSimPin::has_retries_remaining() const {
-  return _has_bit(0);
-}
-inline void RspEnterSimPin::clear_retries_remaining() {
-  retries_remaining_ = 0;
-  _clear_bit(0);
-}
-inline ::google::protobuf::int32 RspEnterSimPin::retries_remaining() const {
-  return retries_remaining_;
-}
-inline void RspEnterSimPin::set_retries_remaining(::google::protobuf::int32 value) {
-  _set_bit(0);
-  retries_remaining_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// ReqHangUp
-
-// required int32 connection_index = 1;
-inline bool ReqHangUp::has_connection_index() const {
-  return _has_bit(0);
-}
-inline void ReqHangUp::clear_connection_index() {
-  connection_index_ = 0;
-  _clear_bit(0);
-}
-inline ::google::protobuf::int32 ReqHangUp::connection_index() const {
-  return connection_index_;
-}
-inline void ReqHangUp::set_connection_index(::google::protobuf::int32 value) {
-  _set_bit(0);
-  connection_index_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// ReqScreenState
-
-// required bool state = 1;
-inline bool ReqScreenState::has_state() const {
-  return _has_bit(0);
-}
-inline void ReqScreenState::clear_state() {
-  state_ = false;
-  _clear_bit(0);
-}
-inline bool ReqScreenState::state() const {
-  return state_;
-}
-inline void ReqScreenState::set_state(bool value) {
-  _set_bit(0);
-  state_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// RspOperator
-
-// optional string long_alpha_ons = 1;
-inline bool RspOperator::has_long_alpha_ons() const {
-  return _has_bit(0);
-}
-inline void RspOperator::clear_long_alpha_ons() {
-  if (long_alpha_ons_ != &_default_long_alpha_ons_) {
-    long_alpha_ons_->clear();
-  }
-  _clear_bit(0);
-}
-inline const ::std::string& RspOperator::long_alpha_ons() const {
-  return *long_alpha_ons_;
-}
-inline void RspOperator::set_long_alpha_ons(const ::std::string& value) {
-  _set_bit(0);
-  if (long_alpha_ons_ == &_default_long_alpha_ons_) {
-    long_alpha_ons_ = new ::std::string;
-  }
-  long_alpha_ons_->assign(value);
-}
-inline void RspOperator::set_long_alpha_ons(const char* value) {
-  _set_bit(0);
-  if (long_alpha_ons_ == &_default_long_alpha_ons_) {
-    long_alpha_ons_ = new ::std::string;
-  }
-  long_alpha_ons_->assign(value);
-}
-inline void RspOperator::set_long_alpha_ons(const char* value, size_t size) {
-  _set_bit(0);
-  if (long_alpha_ons_ == &_default_long_alpha_ons_) {
-    long_alpha_ons_ = new ::std::string;
-  }
-  long_alpha_ons_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RspOperator::mutable_long_alpha_ons() {
-  _set_bit(0);
-  if (long_alpha_ons_ == &_default_long_alpha_ons_) {
-    long_alpha_ons_ = new ::std::string;
-  }
-  return long_alpha_ons_;
-}
-
-// optional string short_alpha_ons = 2;
-inline bool RspOperator::has_short_alpha_ons() const {
-  return _has_bit(1);
-}
-inline void RspOperator::clear_short_alpha_ons() {
-  if (short_alpha_ons_ != &_default_short_alpha_ons_) {
-    short_alpha_ons_->clear();
-  }
-  _clear_bit(1);
-}
-inline const ::std::string& RspOperator::short_alpha_ons() const {
-  return *short_alpha_ons_;
-}
-inline void RspOperator::set_short_alpha_ons(const ::std::string& value) {
-  _set_bit(1);
-  if (short_alpha_ons_ == &_default_short_alpha_ons_) {
-    short_alpha_ons_ = new ::std::string;
-  }
-  short_alpha_ons_->assign(value);
-}
-inline void RspOperator::set_short_alpha_ons(const char* value) {
-  _set_bit(1);
-  if (short_alpha_ons_ == &_default_short_alpha_ons_) {
-    short_alpha_ons_ = new ::std::string;
-  }
-  short_alpha_ons_->assign(value);
-}
-inline void RspOperator::set_short_alpha_ons(const char* value, size_t size) {
-  _set_bit(1);
-  if (short_alpha_ons_ == &_default_short_alpha_ons_) {
-    short_alpha_ons_ = new ::std::string;
-  }
-  short_alpha_ons_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RspOperator::mutable_short_alpha_ons() {
-  _set_bit(1);
-  if (short_alpha_ons_ == &_default_short_alpha_ons_) {
-    short_alpha_ons_ = new ::std::string;
-  }
-  return short_alpha_ons_;
-}
-
-// optional string mcc_mnc = 3;
-inline bool RspOperator::has_mcc_mnc() const {
-  return _has_bit(2);
-}
-inline void RspOperator::clear_mcc_mnc() {
-  if (mcc_mnc_ != &_default_mcc_mnc_) {
-    mcc_mnc_->clear();
-  }
-  _clear_bit(2);
-}
-inline const ::std::string& RspOperator::mcc_mnc() const {
-  return *mcc_mnc_;
-}
-inline void RspOperator::set_mcc_mnc(const ::std::string& value) {
-  _set_bit(2);
-  if (mcc_mnc_ == &_default_mcc_mnc_) {
-    mcc_mnc_ = new ::std::string;
-  }
-  mcc_mnc_->assign(value);
-}
-inline void RspOperator::set_mcc_mnc(const char* value) {
-  _set_bit(2);
-  if (mcc_mnc_ == &_default_mcc_mnc_) {
-    mcc_mnc_ = new ::std::string;
-  }
-  mcc_mnc_->assign(value);
-}
-inline void RspOperator::set_mcc_mnc(const char* value, size_t size) {
-  _set_bit(2);
-  if (mcc_mnc_ == &_default_mcc_mnc_) {
-    mcc_mnc_ = new ::std::string;
-  }
-  mcc_mnc_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RspOperator::mutable_mcc_mnc() {
-  _set_bit(2);
-  if (mcc_mnc_ == &_default_mcc_mnc_) {
-    mcc_mnc_ = new ::std::string;
-  }
-  return mcc_mnc_;
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace ril_proto
-
-#ifndef SWIG
-namespace google {
-namespace protobuf {
-
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RilCommand>() {
-  return ril_proto::RilCommand_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RadioState>() {
-  return ril_proto::RadioState_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RilCardState>() {
-  return ril_proto::RilCardState_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RilPersoSubstate>() {
-  return ril_proto::RilPersoSubstate_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RilAppState>() {
-  return ril_proto::RilAppState_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RilPinState>() {
-  return ril_proto::RilPinState_descriptor();
-}
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RilAppType>() {
-  return ril_proto::RilAppType_descriptor();
-}
-
-}  // namespace google
-}  // namespace protobuf
-#endif  // SWIG
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_ril_2eproto__INCLUDED
index bf1ccf2..6dad1ea 100644 (file)
@@ -26,9 +26,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* RspIntegers_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   RspIntegers_reflection_ = NULL;
 const ::google::protobuf::Descriptor* RspIntegers_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   RspIntegers_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ReqGetSimStatus_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ReqGetSimStatus_reflection_ = NULL;
 const ::google::protobuf::Descriptor* RspGetSimStatus_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   RspGetSimStatus_reflection_ = NULL;
 const ::google::protobuf::Descriptor* RspGetSimStatus_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   RspGetSimStatus_reflection_ = NULL;
@@ -41,13 +38,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* ReqHangUp_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ReqHangUp_reflection_ = NULL;
 const ::google::protobuf::Descriptor* ReqHangUp_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ReqHangUp_reflection_ = NULL;
-const ::google::protobuf::Descriptor* ReqScreenState_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  ReqScreenState_reflection_ = NULL;
 const ::google::protobuf::Descriptor* RspOperator_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   RspOperator_reflection_ = NULL;
 const ::google::protobuf::Descriptor* RspOperator_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   RspOperator_reflection_ = NULL;
-const ::google::protobuf::EnumDescriptor* RilCommand_descriptor_ = NULL;
+const ::google::protobuf::Descriptor* ReqScreenState_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ReqScreenState_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* RadioState_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* RilCardState_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* RilPersoSubstate_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* RadioState_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* RilCardState_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* RilPersoSubstate_descriptor_ = NULL;
@@ -136,21 +132,7 @@ void protobuf_AssignDesc_ril_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspIntegers));
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspIntegers));
-  ReqGetSimStatus_descriptor_ = file->message_type(4);
-  static const int ReqGetSimStatus_offsets_[1] = {
-  };
-  ReqGetSimStatus_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ReqGetSimStatus_descriptor_,
-      ReqGetSimStatus::default_instance_,
-      ReqGetSimStatus_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqGetSimStatus, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqGetSimStatus, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ReqGetSimStatus));
-  RspGetSimStatus_descriptor_ = file->message_type(5);
+  RspGetSimStatus_descriptor_ = file->message_type(4);
   static const int RspGetSimStatus_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspGetSimStatus, card_status_),
   };
   static const int RspGetSimStatus_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspGetSimStatus, card_status_),
   };
@@ -165,7 +147,7 @@ void protobuf_AssignDesc_ril_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspGetSimStatus));
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspGetSimStatus));
-  ReqEnterSimPin_descriptor_ = file->message_type(6);
+  ReqEnterSimPin_descriptor_ = file->message_type(5);
   static const int ReqEnterSimPin_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqEnterSimPin, pin_),
   };
   static const int ReqEnterSimPin_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqEnterSimPin, pin_),
   };
@@ -180,7 +162,7 @@ void protobuf_AssignDesc_ril_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ReqEnterSimPin));
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ReqEnterSimPin));
-  RspEnterSimPin_descriptor_ = file->message_type(7);
+  RspEnterSimPin_descriptor_ = file->message_type(6);
   static const int RspEnterSimPin_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspEnterSimPin, retries_remaining_),
   };
   static const int RspEnterSimPin_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspEnterSimPin, retries_remaining_),
   };
@@ -195,7 +177,7 @@ void protobuf_AssignDesc_ril_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspEnterSimPin));
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspEnterSimPin));
-  ReqHangUp_descriptor_ = file->message_type(8);
+  ReqHangUp_descriptor_ = file->message_type(7);
   static const int ReqHangUp_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqHangUp, connection_index_),
   };
   static const int ReqHangUp_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqHangUp, connection_index_),
   };
@@ -210,22 +192,7 @@ void protobuf_AssignDesc_ril_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ReqHangUp));
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ReqHangUp));
-  ReqScreenState_descriptor_ = file->message_type(9);
-  static const int ReqScreenState_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, state_),
-  };
-  ReqScreenState_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      ReqScreenState_descriptor_,
-      ReqScreenState::default_instance_,
-      ReqScreenState_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(ReqScreenState));
-  RspOperator_descriptor_ = file->message_type(10);
+  RspOperator_descriptor_ = file->message_type(8);
   static const int RspOperator_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, long_alpha_ons_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, short_alpha_ons_),
   static const int RspOperator_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, long_alpha_ons_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RspOperator, short_alpha_ons_),
@@ -242,13 +209,27 @@ void protobuf_AssignDesc_ril_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspOperator));
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RspOperator));
-  RilCommand_descriptor_ = file->enum_type(0);
-  RadioState_descriptor_ = file->enum_type(1);
-  RilCardState_descriptor_ = file->enum_type(2);
-  RilPersoSubstate_descriptor_ = file->enum_type(3);
-  RilAppState_descriptor_ = file->enum_type(4);
-  RilPinState_descriptor_ = file->enum_type(5);
-  RilAppType_descriptor_ = file->enum_type(6);
+  ReqScreenState_descriptor_ = file->message_type(9);
+  static const int ReqScreenState_offsets_[1] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, state_),
+  };
+  ReqScreenState_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ReqScreenState_descriptor_,
+      ReqScreenState::default_instance_,
+      ReqScreenState_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReqScreenState, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ReqScreenState));
+  RadioState_descriptor_ = file->enum_type(0);
+  RilCardState_descriptor_ = file->enum_type(1);
+  RilPersoSubstate_descriptor_ = file->enum_type(2);
+  RilAppState_descriptor_ = file->enum_type(3);
+  RilPinState_descriptor_ = file->enum_type(4);
+  RilAppType_descriptor_ = file->enum_type(5);
 }
 
 namespace {
 }
 
 namespace {
@@ -270,8 +251,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     RspIntegers_descriptor_, &RspIntegers::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     RspIntegers_descriptor_, &RspIntegers::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ReqGetSimStatus_descriptor_, &ReqGetSimStatus::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     RspGetSimStatus_descriptor_, &RspGetSimStatus::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ReqEnterSimPin_descriptor_, &ReqEnterSimPin::default_instance());
     RspGetSimStatus_descriptor_, &RspGetSimStatus::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ReqEnterSimPin_descriptor_, &ReqEnterSimPin::default_instance());
@@ -280,9 +259,9 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ReqHangUp_descriptor_, &ReqHangUp::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ReqHangUp_descriptor_, &ReqHangUp::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    ReqScreenState_descriptor_, &ReqScreenState::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     RspOperator_descriptor_, &RspOperator::default_instance());
     RspOperator_descriptor_, &RspOperator::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ReqScreenState_descriptor_, &ReqScreenState::default_instance());
 }
 
 }  // namespace
 }
 
 }  // namespace
@@ -296,8 +275,6 @@ void protobuf_ShutdownFile_ril_2eproto() {
   delete RspStrings_reflection_;
   delete RspIntegers::default_instance_;
   delete RspIntegers_reflection_;
   delete RspStrings_reflection_;
   delete RspIntegers::default_instance_;
   delete RspIntegers_reflection_;
-  delete ReqGetSimStatus::default_instance_;
-  delete ReqGetSimStatus_reflection_;
   delete RspGetSimStatus::default_instance_;
   delete RspGetSimStatus_reflection_;
   delete ReqEnterSimPin::default_instance_;
   delete RspGetSimStatus::default_instance_;
   delete RspGetSimStatus_reflection_;
   delete ReqEnterSimPin::default_instance_;
@@ -306,10 +283,10 @@ void protobuf_ShutdownFile_ril_2eproto() {
   delete RspEnterSimPin_reflection_;
   delete ReqHangUp::default_instance_;
   delete ReqHangUp_reflection_;
   delete RspEnterSimPin_reflection_;
   delete ReqHangUp::default_instance_;
   delete ReqHangUp_reflection_;
-  delete ReqScreenState::default_instance_;
-  delete ReqScreenState_reflection_;
   delete RspOperator::default_instance_;
   delete RspOperator_reflection_;
   delete RspOperator::default_instance_;
   delete RspOperator_reflection_;
+  delete ReqScreenState::default_instance_;
+  delete ReqScreenState_reflection_;
 }
 
 void protobuf_AddDesc_ril_2eproto() {
 }
 
 void protobuf_AddDesc_ril_2eproto() {
@@ -334,86 +311,81 @@ void protobuf_AddDesc_ril_2eproto() {
     "ption_app_index\030\004 \001(\005\022\030\n\020num_application"
     "s\030\005 \001(\005\022-\n\014applications\030\006 \003(\0132\027.ril_prot"
     "o.RilAppStatus\"\035\n\nRspStrings\022\017\n\007strings\030"
     "ption_app_index\030\004 \001(\005\022\030\n\020num_application"
     "s\030\005 \001(\005\022-\n\014applications\030\006 \003(\0132\027.ril_prot"
     "o.RilAppStatus\"\035\n\nRspStrings\022\017\n\007strings\030"
-    "\001 \003(\t\"\037\n\013RspIntegers\022\020\n\010integers\030\001 \003(\005\"\021"
-    "\n\017ReqGetSimStatus\"@\n\017RspGetSimStatus\022-\n\013"
-    "card_status\030\001 \002(\0132\030.ril_proto.RilCardSta"
-    "tus\"\035\n\016ReqEnterSimPin\022\013\n\003pin\030\001 \002(\t\"+\n\016Rs"
-    "pEnterSimPin\022\031\n\021retries_remaining\030\001 \002(\005\""
-    "%\n\tReqHangUp\022\030\n\020connection_index\030\001 \002(\005\"\037"
-    "\n\016ReqScreenState\022\r\n\005state\030\001 \002(\010\"O\n\013RspOp"
-    "erator\022\026\n\016long_alpha_ons\030\001 \001(\t\022\027\n\017short_"
-    "alpha_ons\030\002 \001(\t\022\017\n\007mcc_mnc\030\003 \001(\t*a\n\nRilC"
-    "ommand\022\026\n\022CMD_GET_SIM_STATUS\020\001\022\025\n\021CMD_EN"
-    "TER_SIM_PIN\020\002\022\016\n\nCMD_HANGUP\020\014\022\024\n\020CMD_SCR"
-    "EEN_STATE\020=*\271\002\n\nRadioState\022\023\n\017RADIO_STAT"
-    "E_OFF\020\000\022\033\n\027RADIO_STATE_UNAVAILABLE\020\001\022\035\n\031"
-    "RADIO_STATE_SIM_NOT_READY\020\002\022$\n RADIO_STA"
-    "TE_SIM_LOCKED_OR_ABSENT\020\003\022\031\n\025RADIO_STATE"
-    "_SIM_READY\020\004\022\036\n\032RADIO_STATE_RUIM_NOT_REA"
-    "DY\020\005\022\032\n\026RADIO_STATE_RUIM_READY\020\006\022%\n!RADI"
-    "O_STATE_RUIM_LOCKED_OR_ABSENT\020\007\022\034\n\030RADIO"
-    "_STATE_NV_NOT_READY\020\010\022\030\n\024RADIO_STATE_NV_"
-    "READY\020\t*P\n\014RilCardState\022\024\n\020CARDSTATE_ABS"
-    "ENT\020\000\022\025\n\021CARDSTATE_PRESENT\020\001\022\023\n\017CARDSTAT"
-    "E_ERROR\020\002*\361\006\n\020RilPersoSubstate\022\031\n\025PERSOS"
-    "UBSTATE_UNKNOWN\020\000\022\035\n\031PERSOSUBSTATE_IN_PR"
-    "OGRESS\020\001\022\027\n\023PERSOSUBSTATE_READY\020\002\022\035\n\031PER"
-    "SOSUBSTATE_SIM_NETWORK\020\003\022$\n PERSOSUBSTAT"
-    "E_SIM_NETWORK_SUBSET\020\004\022\037\n\033PERSOSUBSTATE_"
-    "SIM_CORPORATE\020\005\022&\n\"PERSOSUBSTATE_SIM_SER"
-    "VICE_PROVIDER\020\006\022\031\n\025PERSOSUBSTATE_SIM_SIM"
-    "\020\007\022!\n\035PERSOSUBSTATE_SIM_NETWORK_PUK\020\010\022(\n"
-    "$PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK\020\t\022"
-    "#\n\037PERSOSUBSTATE_SIM_CORPORATE_PUK\020\n\022*\n&"
-    "PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK\020\013"
-    "\022\035\n\031PERSOSUBSTATE_SIM_SIM_PUK\020\014\022\037\n\033PERSO"
-    "SUBSTATE_RUIM_NETWORK1\020\r\022\037\n\033PERSOSUBSTAT"
-    "E_RUIM_NETWORK2\020\016\022\033\n\027PERSOSUBSTATE_RUIM_"
-    "HRPD\020\017\022 \n\034PERSOSUBSTATE_RUIM_CORPORATE\020\020"
-    "\022\'\n#PERSOSUBSTATE_RUIM_SERVICE_PROVIDER\020"
-    "\021\022\033\n\027PERSOSUBSTATE_RUIM_RUIM\020\022\022#\n\037PERSOS"
-    "UBSTATE_RUIM_NETWORK1_PUK\020\023\022#\n\037PERSOSUBS"
-    "TATE_RUIM_NETWORK2_PUK\020\024\022\037\n\033PERSOSUBSTAT"
-    "E_RUIM_HRPD_PUK\020\025\022$\n PERSOSUBSTATE_RUIM_"
-    "CORPORATE_PUK\020\026\022+\n\'PERSOSUBSTATE_RUIM_SE"
-    "RVICE_PROVIDER_PUK\020\027\022\037\n\033PERSOSUBSTATE_RU"
-    "IM_RUIM_PUK\020\030*\223\001\n\013RilAppState\022\024\n\020APPSTAT"
-    "E_UNKNOWN\020\000\022\025\n\021APPSTATE_DETECTED\020\001\022\020\n\014AP"
-    "PSTATE_PIN\020\002\022\020\n\014APPSTATE_PUK\020\003\022\037\n\033APPSTA"
-    "TE_SUBSCRIPTION_PERSO\020\004\022\022\n\016APPSTATE_READ"
-    "Y\020\005*\275\001\n\013RilPinState\022\024\n\020PINSTATE_UNKNOWN\020"
-    "\000\022!\n\035PINSTATE_ENABLED_NOT_VERIFIED\020\001\022\035\n\031"
-    "PINSTATE_ENABLED_VERIFIED\020\002\022\025\n\021PINSTATE_"
-    "DISABLED\020\003\022\034\n\030PINSTATE_ENABLED_BLOCKED\020\004"
-    "\022!\n\035PINSTATE_ENABLED_PERM_BLOCKED\020\005*h\n\nR"
-    "ilAppType\022\023\n\017APPTYPE_UNKNOWN\020\000\022\017\n\013APPTYP"
-    "E_SIM\020\001\022\020\n\014APPTYPE_USIM\020\002\022\020\n\014APPTYPE_RUI"
-    "M\020\003\022\020\n\014APPTYPE_CSIM\020\004B3\n(com.android.int"
-    "ernal.telephony.ril_protoB\007RilCmds", 2834);
+    "\001 \003(\t\"\037\n\013RspIntegers\022\020\n\010integers\030\001 \003(\005\"@"
+    "\n\017RspGetSimStatus\022-\n\013card_status\030\001 \002(\0132\030"
+    ".ril_proto.RilCardStatus\"\035\n\016ReqEnterSimP"
+    "in\022\013\n\003pin\030\001 \002(\t\"+\n\016RspEnterSimPin\022\031\n\021ret"
+    "ries_remaining\030\001 \002(\005\"%\n\tReqHangUp\022\030\n\020con"
+    "nection_index\030\001 \002(\005\"O\n\013RspOperator\022\026\n\016lo"
+    "ng_alpha_ons\030\001 \001(\t\022\027\n\017short_alpha_ons\030\002 "
+    "\001(\t\022\017\n\007mcc_mnc\030\003 \001(\t\"\037\n\016ReqScreenState\022\r"
+    "\n\005state\030\001 \002(\010*\257\002\n\nRadioState\022\022\n\016RADIOSTA"
+    "TE_OFF\020\000\022\032\n\026RADIOSTATE_UNAVAILABLE\020\001\022\034\n\030"
+    "RADIOSTATE_SIM_NOT_READY\020\002\022#\n\037RADIOSTATE"
+    "_SIM_LOCKED_OR_ABSENT\020\003\022\030\n\024RADIOSTATE_SI"
+    "M_READY\020\004\022\035\n\031RADIOSTATE_RUIM_NOT_READY\020\005"
+    "\022\031\n\025RADIOSTATE_RUIM_READY\020\006\022$\n RADIOSTAT"
+    "E_RUIM_LOCKED_OR_ABSENT\020\007\022\033\n\027RADIOSTATE_"
+    "NV_NOT_READY\020\010\022\027\n\023RADIOSTATE_NV_READY\020\t*"
+    "P\n\014RilCardState\022\024\n\020CARDSTATE_ABSENT\020\000\022\025\n"
+    "\021CARDSTATE_PRESENT\020\001\022\023\n\017CARDSTATE_ERROR\020"
+    "\002*\361\006\n\020RilPersoSubstate\022\031\n\025PERSOSUBSTATE_"
+    "UNKNOWN\020\000\022\035\n\031PERSOSUBSTATE_IN_PROGRESS\020\001"
+    "\022\027\n\023PERSOSUBSTATE_READY\020\002\022\035\n\031PERSOSUBSTA"
+    "TE_SIM_NETWORK\020\003\022$\n PERSOSUBSTATE_SIM_NE"
+    "TWORK_SUBSET\020\004\022\037\n\033PERSOSUBSTATE_SIM_CORP"
+    "ORATE\020\005\022&\n\"PERSOSUBSTATE_SIM_SERVICE_PRO"
+    "VIDER\020\006\022\031\n\025PERSOSUBSTATE_SIM_SIM\020\007\022!\n\035PE"
+    "RSOSUBSTATE_SIM_NETWORK_PUK\020\010\022(\n$PERSOSU"
+    "BSTATE_SIM_NETWORK_SUBSET_PUK\020\t\022#\n\037PERSO"
+    "SUBSTATE_SIM_CORPORATE_PUK\020\n\022*\n&PERSOSUB"
+    "STATE_SIM_SERVICE_PROVIDER_PUK\020\013\022\035\n\031PERS"
+    "OSUBSTATE_SIM_SIM_PUK\020\014\022\037\n\033PERSOSUBSTATE"
+    "_RUIM_NETWORK1\020\r\022\037\n\033PERSOSUBSTATE_RUIM_N"
+    "ETWORK2\020\016\022\033\n\027PERSOSUBSTATE_RUIM_HRPD\020\017\022 "
+    "\n\034PERSOSUBSTATE_RUIM_CORPORATE\020\020\022\'\n#PERS"
+    "OSUBSTATE_RUIM_SERVICE_PROVIDER\020\021\022\033\n\027PER"
+    "SOSUBSTATE_RUIM_RUIM\020\022\022#\n\037PERSOSUBSTATE_"
+    "RUIM_NETWORK1_PUK\020\023\022#\n\037PERSOSUBSTATE_RUI"
+    "M_NETWORK2_PUK\020\024\022\037\n\033PERSOSUBSTATE_RUIM_H"
+    "RPD_PUK\020\025\022$\n PERSOSUBSTATE_RUIM_CORPORAT"
+    "E_PUK\020\026\022+\n\'PERSOSUBSTATE_RUIM_SERVICE_PR"
+    "OVIDER_PUK\020\027\022\037\n\033PERSOSUBSTATE_RUIM_RUIM_"
+    "PUK\020\030*\223\001\n\013RilAppState\022\024\n\020APPSTATE_UNKNOW"
+    "N\020\000\022\025\n\021APPSTATE_DETECTED\020\001\022\020\n\014APPSTATE_P"
+    "IN\020\002\022\020\n\014APPSTATE_PUK\020\003\022\037\n\033APPSTATE_SUBSC"
+    "RIPTION_PERSO\020\004\022\022\n\016APPSTATE_READY\020\005*\275\001\n\013"
+    "RilPinState\022\024\n\020PINSTATE_UNKNOWN\020\000\022!\n\035PIN"
+    "STATE_ENABLED_NOT_VERIFIED\020\001\022\035\n\031PINSTATE"
+    "_ENABLED_VERIFIED\020\002\022\025\n\021PINSTATE_DISABLED"
+    "\020\003\022\034\n\030PINSTATE_ENABLED_BLOCKED\020\004\022!\n\035PINS"
+    "TATE_ENABLED_PERM_BLOCKED\020\005*h\n\nRilAppTyp"
+    "e\022\023\n\017APPTYPE_UNKNOWN\020\000\022\017\n\013APPTYPE_SIM\020\001\022"
+    "\020\n\014APPTYPE_USIM\020\002\022\020\n\014APPTYPE_RUIM\020\003\022\020\n\014A"
+    "PPTYPE_CSIM\020\004B3\n(com.android.internal.te"
+    "lephony.ril_protoB\007RilCmds", 2706);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "ril.proto", &protobuf_RegisterTypes);
   RilAppStatus::default_instance_ = new RilAppStatus();
   RilCardStatus::default_instance_ = new RilCardStatus();
   RspStrings::default_instance_ = new RspStrings();
   RspIntegers::default_instance_ = new RspIntegers();
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "ril.proto", &protobuf_RegisterTypes);
   RilAppStatus::default_instance_ = new RilAppStatus();
   RilCardStatus::default_instance_ = new RilCardStatus();
   RspStrings::default_instance_ = new RspStrings();
   RspIntegers::default_instance_ = new RspIntegers();
-  ReqGetSimStatus::default_instance_ = new ReqGetSimStatus();
   RspGetSimStatus::default_instance_ = new RspGetSimStatus();
   ReqEnterSimPin::default_instance_ = new ReqEnterSimPin();
   RspEnterSimPin::default_instance_ = new RspEnterSimPin();
   ReqHangUp::default_instance_ = new ReqHangUp();
   RspGetSimStatus::default_instance_ = new RspGetSimStatus();
   ReqEnterSimPin::default_instance_ = new ReqEnterSimPin();
   RspEnterSimPin::default_instance_ = new RspEnterSimPin();
   ReqHangUp::default_instance_ = new ReqHangUp();
-  ReqScreenState::default_instance_ = new ReqScreenState();
   RspOperator::default_instance_ = new RspOperator();
   RspOperator::default_instance_ = new RspOperator();
+  ReqScreenState::default_instance_ = new ReqScreenState();
   RilAppStatus::default_instance_->InitAsDefaultInstance();
   RilCardStatus::default_instance_->InitAsDefaultInstance();
   RspStrings::default_instance_->InitAsDefaultInstance();
   RspIntegers::default_instance_->InitAsDefaultInstance();
   RilAppStatus::default_instance_->InitAsDefaultInstance();
   RilCardStatus::default_instance_->InitAsDefaultInstance();
   RspStrings::default_instance_->InitAsDefaultInstance();
   RspIntegers::default_instance_->InitAsDefaultInstance();
-  ReqGetSimStatus::default_instance_->InitAsDefaultInstance();
   RspGetSimStatus::default_instance_->InitAsDefaultInstance();
   ReqEnterSimPin::default_instance_->InitAsDefaultInstance();
   RspEnterSimPin::default_instance_->InitAsDefaultInstance();
   ReqHangUp::default_instance_->InitAsDefaultInstance();
   RspGetSimStatus::default_instance_->InitAsDefaultInstance();
   ReqEnterSimPin::default_instance_->InitAsDefaultInstance();
   RspEnterSimPin::default_instance_->InitAsDefaultInstance();
   ReqHangUp::default_instance_->InitAsDefaultInstance();
-  ReqScreenState::default_instance_->InitAsDefaultInstance();
   RspOperator::default_instance_->InitAsDefaultInstance();
   RspOperator::default_instance_->InitAsDefaultInstance();
+  ReqScreenState::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_ril_2eproto);
 }
 
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_ril_2eproto);
 }
 
@@ -424,22 +396,6 @@ struct StaticDescriptorInitializer_ril_2eproto {
   }
 } static_descriptor_initializer_ril_2eproto_;
 
   }
 } static_descriptor_initializer_ril_2eproto_;
 
-const ::google::protobuf::EnumDescriptor* RilCommand_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RilCommand_descriptor_;
-}
-bool RilCommand_IsValid(int value) {
-  switch(value) {
-    case 1:
-    case 2:
-    case 12:
-    case 61:
-      return true;
-    default:
-      return false;
-  }
-}
-
 const ::google::protobuf::EnumDescriptor* RadioState_descriptor() {
   protobuf_AssignDescriptorsOnce();
   return RadioState_descriptor_;
 const ::google::protobuf::EnumDescriptor* RadioState_descriptor() {
   protobuf_AssignDescriptorsOnce();
   return RadioState_descriptor_;
@@ -1962,161 +1918,6 @@ void RspIntegers::Swap(RspIntegers* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
 // ===================================================================
 
 #ifndef _MSC_VER
-#endif  // !_MSC_VER
-
-ReqGetSimStatus::ReqGetSimStatus()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void ReqGetSimStatus::InitAsDefaultInstance() {
-}
-
-ReqGetSimStatus::ReqGetSimStatus(const ReqGetSimStatus& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void ReqGetSimStatus::SharedCtor() {
-  _cached_size_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-ReqGetSimStatus::~ReqGetSimStatus() {
-  SharedDtor();
-}
-
-void ReqGetSimStatus::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void ReqGetSimStatus::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* ReqGetSimStatus::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return ReqGetSimStatus_descriptor_;
-}
-
-const ReqGetSimStatus& ReqGetSimStatus::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
-}
-
-ReqGetSimStatus* ReqGetSimStatus::default_instance_ = NULL;
-
-ReqGetSimStatus* ReqGetSimStatus::New() const {
-  return new ReqGetSimStatus;
-}
-
-void ReqGetSimStatus::Clear() {
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ReqGetSimStatus::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-        ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-      return true;
-    }
-    DO_(::google::protobuf::internal::WireFormat::SkipField(
-          input, tag, mutable_unknown_fields()));
-  }
-  return true;
-#undef DO_
-}
-
-void ReqGetSimStatus::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* ReqGetSimStatus::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int ReqGetSimStatus::ByteSize() const {
-  int total_size = 0;
-  
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ReqGetSimStatus::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ReqGetSimStatus* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ReqGetSimStatus*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ReqGetSimStatus::MergeFrom(const ReqGetSimStatus& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ReqGetSimStatus::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ReqGetSimStatus::CopyFrom(const ReqGetSimStatus& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ReqGetSimStatus::IsInitialized() const {
-  
-  return true;
-}
-
-void ReqGetSimStatus::Swap(ReqGetSimStatus* other) {
-  if (other != this) {
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata ReqGetSimStatus::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ReqGetSimStatus_descriptor_;
-  metadata.reflection = ReqGetSimStatus_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
 const int RspGetSimStatus::kCardStatusFieldNumber;
 #endif  // !_MSC_VER
 
 const int RspGetSimStatus::kCardStatusFieldNumber;
 #endif  // !_MSC_VER
 
@@ -2971,81 +2772,146 @@ void ReqHangUp::Swap(ReqHangUp* other) {
 
 // ===================================================================
 
 
 // ===================================================================
 
+const ::std::string RspOperator::_default_long_alpha_ons_;
+const ::std::string RspOperator::_default_short_alpha_ons_;
+const ::std::string RspOperator::_default_mcc_mnc_;
 #ifndef _MSC_VER
 #ifndef _MSC_VER
-const int ReqScreenState::kStateFieldNumber;
+const int RspOperator::kLongAlphaOnsFieldNumber;
+const int RspOperator::kShortAlphaOnsFieldNumber;
+const int RspOperator::kMccMncFieldNumber;
 #endif  // !_MSC_VER
 
 #endif  // !_MSC_VER
 
-ReqScreenState::ReqScreenState()
+RspOperator::RspOperator()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void ReqScreenState::InitAsDefaultInstance() {
+void RspOperator::InitAsDefaultInstance() {
 }
 
 }
 
-ReqScreenState::ReqScreenState(const ReqScreenState& from)
+RspOperator::RspOperator(const RspOperator& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void ReqScreenState::SharedCtor() {
+void RspOperator::SharedCtor() {
   _cached_size_ = 0;
   _cached_size_ = 0;
-  state_ = false;
+  long_alpha_ons_ = const_cast< ::std::string*>(&_default_long_alpha_ons_);
+  short_alpha_ons_ = const_cast< ::std::string*>(&_default_short_alpha_ons_);
+  mcc_mnc_ = const_cast< ::std::string*>(&_default_mcc_mnc_);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-ReqScreenState::~ReqScreenState() {
+RspOperator::~RspOperator() {
   SharedDtor();
 }
 
   SharedDtor();
 }
 
-void ReqScreenState::SharedDtor() {
+void RspOperator::SharedDtor() {
+  if (long_alpha_ons_ != &_default_long_alpha_ons_) {
+    delete long_alpha_ons_;
+  }
+  if (short_alpha_ons_ != &_default_short_alpha_ons_) {
+    delete short_alpha_ons_;
+  }
+  if (mcc_mnc_ != &_default_mcc_mnc_) {
+    delete mcc_mnc_;
+  }
   if (this != default_instance_) {
   }
 }
 
   if (this != default_instance_) {
   }
 }
 
-void ReqScreenState::SetCachedSize(int size) const {
+void RspOperator::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* ReqScreenState::descriptor() {
+const ::google::protobuf::Descriptor* RspOperator::descriptor() {
   protobuf_AssignDescriptorsOnce();
   protobuf_AssignDescriptorsOnce();
-  return ReqScreenState_descriptor_;
+  return RspOperator_descriptor_;
 }
 
 }
 
-const ReqScreenState& ReqScreenState::default_instance() {
+const RspOperator& RspOperator::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
 }
 
   if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
 }
 
-ReqScreenState* ReqScreenState::default_instance_ = NULL;
+RspOperator* RspOperator::default_instance_ = NULL;
 
 
-ReqScreenState* ReqScreenState::New() const {
-  return new ReqScreenState;
+RspOperator* RspOperator::New() const {
+  return new RspOperator;
 }
 
 }
 
-void ReqScreenState::Clear() {
+void RspOperator::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    state_ = false;
+    if (_has_bit(0)) {
+      if (long_alpha_ons_ != &_default_long_alpha_ons_) {
+        long_alpha_ons_->clear();
+      }
+    }
+    if (_has_bit(1)) {
+      if (short_alpha_ons_ != &_default_short_alpha_ons_) {
+        short_alpha_ons_->clear();
+      }
+    }
+    if (_has_bit(2)) {
+      if (mcc_mnc_ != &_default_mcc_mnc_) {
+        mcc_mnc_->clear();
+      }
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool ReqScreenState::MergePartialFromCodedStream(
+bool RspOperator::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required bool state = 1;
+      // optional string long_alpha_ons = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &state_)));
-          _set_bit(0);
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_long_alpha_ons()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->long_alpha_ons().data(), this->long_alpha_ons().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_short_alpha_ons;
+        break;
+      }
+      
+      // optional string short_alpha_ons = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_short_alpha_ons:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_short_alpha_ons()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->short_alpha_ons().data(), this->short_alpha_ons().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_mcc_mnc;
+        break;
+      }
+      
+      // optional string mcc_mnc = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_mcc_mnc:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_mcc_mnc()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->mcc_mnc().data(), this->mcc_mnc().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
         } else {
           goto handle_uninterpreted;
         }
@@ -3069,11 +2935,33 @@ bool ReqScreenState::MergePartialFromCodedStream(
 #undef DO_
 }
 
 #undef DO_
 }
 
-void ReqScreenState::SerializeWithCachedSizes(
+void RspOperator::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required bool state = 1;
+  // optional string long_alpha_ons = 1;
   if (_has_bit(0)) {
   if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->state(), output);
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->long_alpha_ons().data(), this->long_alpha_ons().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      1, this->long_alpha_ons(), output);
+  }
+  
+  // optional string short_alpha_ons = 2;
+  if (_has_bit(1)) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->short_alpha_ons().data(), this->short_alpha_ons().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      2, this->short_alpha_ons(), output);
+  }
+  
+  // optional string mcc_mnc = 3;
+  if (_has_bit(2)) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->mcc_mnc().data(), this->mcc_mnc().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->mcc_mnc(), output);
   }
   
   if (!unknown_fields().empty()) {
   }
   
   if (!unknown_fields().empty()) {
@@ -3082,11 +2970,36 @@ void ReqScreenState::SerializeWithCachedSizes(
   }
 }
 
   }
 }
 
-::google::protobuf::uint8* ReqScreenState::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* RspOperator::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
     ::google::protobuf::uint8* target) const {
-  // required bool state = 1;
+  // optional string long_alpha_ons = 1;
   if (_has_bit(0)) {
   if (_has_bit(0)) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->state(), target);
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->long_alpha_ons().data(), this->long_alpha_ons().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->long_alpha_ons(), target);
+  }
+  
+  // optional string short_alpha_ons = 2;
+  if (_has_bit(1)) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->short_alpha_ons().data(), this->short_alpha_ons().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->short_alpha_ons(), target);
+  }
+  
+  // optional string mcc_mnc = 3;
+  if (_has_bit(2)) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->mcc_mnc().data(), this->mcc_mnc().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->mcc_mnc(), target);
   }
   
   if (!unknown_fields().empty()) {
   }
   
   if (!unknown_fields().empty()) {
@@ -3096,13 +3009,29 @@ void ReqScreenState::SerializeWithCachedSizes(
   return target;
 }
 
   return target;
 }
 
-int ReqScreenState::ByteSize() const {
+int RspOperator::ByteSize() const {
   int total_size = 0;
   
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
   int total_size = 0;
   
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required bool state = 1;
-    if (has_state()) {
-      total_size += 1 + 1;
+    // optional string long_alpha_ons = 1;
+    if (has_long_alpha_ons()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->long_alpha_ons());
+    }
+    
+    // optional string short_alpha_ons = 2;
+    if (has_short_alpha_ons()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->short_alpha_ons());
+    }
+    
+    // optional string mcc_mnc = 3;
+    if (has_mcc_mnc()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->mcc_mnc());
     }
     
   }
     }
     
   }
@@ -3117,10 +3046,10 @@ int ReqScreenState::ByteSize() const {
   return total_size;
 }
 
   return total_size;
 }
 
-void ReqScreenState::MergeFrom(const ::google::protobuf::Message& from) {
+void RspOperator::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
   GOOGLE_CHECK_NE(&from, this);
-  const ReqScreenState* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ReqScreenState*>(
+  const RspOperator* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const RspOperator*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -3129,194 +3058,136 @@ void ReqScreenState::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
   }
 }
 
-void ReqScreenState::MergeFrom(const ReqScreenState& from) {
+void RspOperator::MergeFrom(const RspOperator& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from._has_bit(0)) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from._has_bit(0)) {
-      set_state(from.state());
+      set_long_alpha_ons(from.long_alpha_ons());
+    }
+    if (from._has_bit(1)) {
+      set_short_alpha_ons(from.short_alpha_ons());
+    }
+    if (from._has_bit(2)) {
+      set_mcc_mnc(from.mcc_mnc());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void ReqScreenState::CopyFrom(const ::google::protobuf::Message& from) {
+void RspOperator::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void ReqScreenState::CopyFrom(const ReqScreenState& from) {
+void RspOperator::CopyFrom(const RspOperator& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool ReqScreenState::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool RspOperator::IsInitialized() const {
   
   return true;
 }
 
   
   return true;
 }
 
-void ReqScreenState::Swap(ReqScreenState* other) {
+void RspOperator::Swap(RspOperator* other) {
   if (other != this) {
   if (other != this) {
-    std::swap(state_, other->state_);
+    std::swap(long_alpha_ons_, other->long_alpha_ons_);
+    std::swap(short_alpha_ons_, other->short_alpha_ons_);
+    std::swap(mcc_mnc_, other->mcc_mnc_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata ReqScreenState::GetMetadata() const {
+::google::protobuf::Metadata RspOperator::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ReqScreenState_descriptor_;
-  metadata.reflection = ReqScreenState_reflection_;
+  metadata.descriptor = RspOperator_descriptor_;
+  metadata.reflection = RspOperator_reflection_;
   return metadata;
 }
 
 
 // ===================================================================
 
   return metadata;
 }
 
 
 // ===================================================================
 
-const ::std::string RspOperator::_default_long_alpha_ons_;
-const ::std::string RspOperator::_default_short_alpha_ons_;
-const ::std::string RspOperator::_default_mcc_mnc_;
 #ifndef _MSC_VER
 #ifndef _MSC_VER
-const int RspOperator::kLongAlphaOnsFieldNumber;
-const int RspOperator::kShortAlphaOnsFieldNumber;
-const int RspOperator::kMccMncFieldNumber;
+const int ReqScreenState::kStateFieldNumber;
 #endif  // !_MSC_VER
 
 #endif  // !_MSC_VER
 
-RspOperator::RspOperator()
+ReqScreenState::ReqScreenState()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void RspOperator::InitAsDefaultInstance() {
+void ReqScreenState::InitAsDefaultInstance() {
 }
 
 }
 
-RspOperator::RspOperator(const RspOperator& from)
+ReqScreenState::ReqScreenState(const ReqScreenState& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void RspOperator::SharedCtor() {
+void ReqScreenState::SharedCtor() {
   _cached_size_ = 0;
   _cached_size_ = 0;
-  long_alpha_ons_ = const_cast< ::std::string*>(&_default_long_alpha_ons_);
-  short_alpha_ons_ = const_cast< ::std::string*>(&_default_short_alpha_ons_);
-  mcc_mnc_ = const_cast< ::std::string*>(&_default_mcc_mnc_);
+  state_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-RspOperator::~RspOperator() {
+ReqScreenState::~ReqScreenState() {
   SharedDtor();
 }
 
   SharedDtor();
 }
 
-void RspOperator::SharedDtor() {
-  if (long_alpha_ons_ != &_default_long_alpha_ons_) {
-    delete long_alpha_ons_;
-  }
-  if (short_alpha_ons_ != &_default_short_alpha_ons_) {
-    delete short_alpha_ons_;
-  }
-  if (mcc_mnc_ != &_default_mcc_mnc_) {
-    delete mcc_mnc_;
-  }
+void ReqScreenState::SharedDtor() {
   if (this != default_instance_) {
   }
 }
 
   if (this != default_instance_) {
   }
 }
 
-void RspOperator::SetCachedSize(int size) const {
+void ReqScreenState::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* RspOperator::descriptor() {
+const ::google::protobuf::Descriptor* ReqScreenState::descriptor() {
   protobuf_AssignDescriptorsOnce();
   protobuf_AssignDescriptorsOnce();
-  return RspOperator_descriptor_;
+  return ReqScreenState_descriptor_;
 }
 
 }
 
-const RspOperator& RspOperator::default_instance() {
+const ReqScreenState& ReqScreenState::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
 }
 
   if (default_instance_ == NULL) protobuf_AddDesc_ril_2eproto();  return *default_instance_;
 }
 
-RspOperator* RspOperator::default_instance_ = NULL;
+ReqScreenState* ReqScreenState::default_instance_ = NULL;
 
 
-RspOperator* RspOperator::New() const {
-  return new RspOperator;
+ReqScreenState* ReqScreenState::New() const {
+  return new ReqScreenState;
 }
 
 }
 
-void RspOperator::Clear() {
+void ReqScreenState::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (_has_bit(0)) {
-      if (long_alpha_ons_ != &_default_long_alpha_ons_) {
-        long_alpha_ons_->clear();
-      }
-    }
-    if (_has_bit(1)) {
-      if (short_alpha_ons_ != &_default_short_alpha_ons_) {
-        short_alpha_ons_->clear();
-      }
-    }
-    if (_has_bit(2)) {
-      if (mcc_mnc_ != &_default_mcc_mnc_) {
-        mcc_mnc_->clear();
-      }
-    }
+    state_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool RspOperator::MergePartialFromCodedStream(
+bool ReqScreenState::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string long_alpha_ons = 1;
+      // required bool state = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_long_alpha_ons()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->long_alpha_ons().data(), this->long_alpha_ons().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_short_alpha_ons;
-        break;
-      }
-      
-      // optional string short_alpha_ons = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_short_alpha_ons:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_short_alpha_ons()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->short_alpha_ons().data(), this->short_alpha_ons().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_mcc_mnc;
-        break;
-      }
-      
-      // optional string mcc_mnc = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_mcc_mnc:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_mcc_mnc()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->mcc_mnc().data(), this->mcc_mnc().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &state_)));
+          _set_bit(0);
         } else {
           goto handle_uninterpreted;
         }
         } else {
           goto handle_uninterpreted;
         }
@@ -3340,33 +3211,11 @@ bool RspOperator::MergePartialFromCodedStream(
 #undef DO_
 }
 
 #undef DO_
 }
 
-void RspOperator::SerializeWithCachedSizes(
+void ReqScreenState::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional string long_alpha_ons = 1;
+  // required bool state = 1;
   if (_has_bit(0)) {
   if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->long_alpha_ons().data(), this->long_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      1, this->long_alpha_ons(), output);
-  }
-  
-  // optional string short_alpha_ons = 2;
-  if (_has_bit(1)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->short_alpha_ons().data(), this->short_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      2, this->short_alpha_ons(), output);
-  }
-  
-  // optional string mcc_mnc = 3;
-  if (_has_bit(2)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->mcc_mnc().data(), this->mcc_mnc().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->mcc_mnc(), output);
+    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->state(), output);
   }
   
   if (!unknown_fields().empty()) {
   }
   
   if (!unknown_fields().empty()) {
@@ -3375,36 +3224,11 @@ void RspOperator::SerializeWithCachedSizes(
   }
 }
 
   }
 }
 
-::google::protobuf::uint8* RspOperator::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* ReqScreenState::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
     ::google::protobuf::uint8* target) const {
-  // optional string long_alpha_ons = 1;
+  // required bool state = 1;
   if (_has_bit(0)) {
   if (_has_bit(0)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->long_alpha_ons().data(), this->long_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->long_alpha_ons(), target);
-  }
-  
-  // optional string short_alpha_ons = 2;
-  if (_has_bit(1)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->short_alpha_ons().data(), this->short_alpha_ons().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->short_alpha_ons(), target);
-  }
-  
-  // optional string mcc_mnc = 3;
-  if (_has_bit(2)) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->mcc_mnc().data(), this->mcc_mnc().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->mcc_mnc(), target);
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->state(), target);
   }
   
   if (!unknown_fields().empty()) {
   }
   
   if (!unknown_fields().empty()) {
@@ -3414,29 +3238,13 @@ void RspOperator::SerializeWithCachedSizes(
   return target;
 }
 
   return target;
 }
 
-int RspOperator::ByteSize() const {
+int ReqScreenState::ByteSize() const {
   int total_size = 0;
   
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
   int total_size = 0;
   
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional string long_alpha_ons = 1;
-    if (has_long_alpha_ons()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->long_alpha_ons());
-    }
-    
-    // optional string short_alpha_ons = 2;
-    if (has_short_alpha_ons()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->short_alpha_ons());
-    }
-    
-    // optional string mcc_mnc = 3;
-    if (has_mcc_mnc()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->mcc_mnc());
+    // required bool state = 1;
+    if (has_state()) {
+      total_size += 1 + 1;
     }
     
   }
     }
     
   }
@@ -3451,10 +3259,10 @@ int RspOperator::ByteSize() const {
   return total_size;
 }
 
   return total_size;
 }
 
-void RspOperator::MergeFrom(const ::google::protobuf::Message& from) {
+void ReqScreenState::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
   GOOGLE_CHECK_NE(&from, this);
-  const RspOperator* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RspOperator*>(
+  const ReqScreenState* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ReqScreenState*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -3463,55 +3271,48 @@ void RspOperator::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
   }
 }
 
-void RspOperator::MergeFrom(const RspOperator& from) {
+void ReqScreenState::MergeFrom(const ReqScreenState& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from._has_bit(0)) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from._has_bit(0)) {
-      set_long_alpha_ons(from.long_alpha_ons());
-    }
-    if (from._has_bit(1)) {
-      set_short_alpha_ons(from.short_alpha_ons());
-    }
-    if (from._has_bit(2)) {
-      set_mcc_mnc(from.mcc_mnc());
+      set_state(from.state());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void RspOperator::CopyFrom(const ::google::protobuf::Message& from) {
+void ReqScreenState::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void RspOperator::CopyFrom(const RspOperator& from) {
+void ReqScreenState::CopyFrom(const ReqScreenState& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool RspOperator::IsInitialized() const {
+bool ReqScreenState::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
   
   return true;
 }
 
   
   return true;
 }
 
-void RspOperator::Swap(RspOperator* other) {
+void ReqScreenState::Swap(ReqScreenState* other) {
   if (other != this) {
   if (other != this) {
-    std::swap(long_alpha_ons_, other->long_alpha_ons_);
-    std::swap(short_alpha_ons_, other->short_alpha_ons_);
-    std::swap(mcc_mnc_, other->mcc_mnc_);
+    std::swap(state_, other->state_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata RspOperator::GetMetadata() const {
+::google::protobuf::Metadata ReqScreenState::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RspOperator_descriptor_;
-  metadata.reflection = RspOperator_reflection_;
+  metadata.descriptor = ReqScreenState_descriptor_;
+  metadata.reflection = ReqScreenState_reflection_;
   return metadata;
 }
 
   return metadata;
 }
 
index 80dd55b..2e47585 100644 (file)
@@ -36,50 +36,28 @@ class RilAppStatus;
 class RilCardStatus;
 class RspStrings;
 class RspIntegers;
 class RilCardStatus;
 class RspStrings;
 class RspIntegers;
-class ReqGetSimStatus;
 class RspGetSimStatus;
 class ReqEnterSimPin;
 class RspEnterSimPin;
 class ReqHangUp;
 class RspGetSimStatus;
 class ReqEnterSimPin;
 class RspEnterSimPin;
 class ReqHangUp;
-class ReqScreenState;
 class RspOperator;
 class RspOperator;
+class ReqScreenState;
 
 
-enum RilCommand {
-  CMD_GET_SIM_STATUS = 1,
-  CMD_ENTER_SIM_PIN = 2,
-  CMD_HANGUP = 12,
-  CMD_SCREEN_STATE = 61
-};
-bool RilCommand_IsValid(int value);
-const RilCommand RilCommand_MIN = CMD_GET_SIM_STATUS;
-const RilCommand RilCommand_MAX = CMD_SCREEN_STATE;
-const int RilCommand_ARRAYSIZE = RilCommand_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* RilCommand_descriptor();
-inline const ::std::string& RilCommand_Name(RilCommand value) {
-  return ::google::protobuf::internal::NameOfEnum(
-    RilCommand_descriptor(), value);
-}
-inline bool RilCommand_Parse(
-    const ::std::string& name, RilCommand* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RilCommand>(
-    RilCommand_descriptor(), name, value);
-}
 enum RadioState {
 enum RadioState {
-  RADIO_STATE_OFF = 0,
-  RADIO_STATE_UNAVAILABLE = 1,
-  RADIO_STATE_SIM_NOT_READY = 2,
-  RADIO_STATE_SIM_LOCKED_OR_ABSENT = 3,
-  RADIO_STATE_SIM_READY = 4,
-  RADIO_STATE_RUIM_NOT_READY = 5,
-  RADIO_STATE_RUIM_READY = 6,
-  RADIO_STATE_RUIM_LOCKED_OR_ABSENT = 7,
-  RADIO_STATE_NV_NOT_READY = 8,
-  RADIO_STATE_NV_READY = 9
+  RADIOSTATE_OFF = 0,
+  RADIOSTATE_UNAVAILABLE = 1,
+  RADIOSTATE_SIM_NOT_READY = 2,
+  RADIOSTATE_SIM_LOCKED_OR_ABSENT = 3,
+  RADIOSTATE_SIM_READY = 4,
+  RADIOSTATE_RUIM_NOT_READY = 5,
+  RADIOSTATE_RUIM_READY = 6,
+  RADIOSTATE_RUIM_LOCKED_OR_ABSENT = 7,
+  RADIOSTATE_NV_NOT_READY = 8,
+  RADIOSTATE_NV_READY = 9
 };
 bool RadioState_IsValid(int value);
 };
 bool RadioState_IsValid(int value);
-const RadioState RadioState_MIN = RADIO_STATE_OFF;
-const RadioState RadioState_MAX = RADIO_STATE_NV_READY;
+const RadioState RadioState_MIN = RADIOSTATE_OFF;
+const RadioState RadioState_MAX = RADIOSTATE_NV_READY;
 const int RadioState_ARRAYSIZE = RadioState_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* RadioState_descriptor();
 const int RadioState_ARRAYSIZE = RadioState_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* RadioState_descriptor();
@@ -703,87 +681,6 @@ class RspIntegers : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
 };
 // -------------------------------------------------------------------
 
-class ReqGetSimStatus : public ::google::protobuf::Message {
- public:
-  ReqGetSimStatus();
-  virtual ~ReqGetSimStatus();
-  
-  ReqGetSimStatus(const ReqGetSimStatus& from);
-  
-  inline ReqGetSimStatus& operator=(const ReqGetSimStatus& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-  
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-  
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const ReqGetSimStatus& default_instance();
-  
-  void Swap(ReqGetSimStatus* other);
-  
-  // implements Message ----------------------------------------------
-  
-  ReqGetSimStatus* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReqGetSimStatus& from);
-  void MergeFrom(const ReqGetSimStatus& from);
-  void Clear();
-  bool IsInitialized() const;
-  
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-  
-  ::google::protobuf::Metadata GetMetadata() const;
-  
-  // nested types ----------------------------------------------------
-  
-  // accessors -------------------------------------------------------
-  
-  // @@protoc_insertion_point(class_scope:ril_proto.ReqGetSimStatus)
- private:
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-  mutable int _cached_size_;
-  
-  friend void  protobuf_AddDesc_ril_2eproto();
-  friend void protobuf_AssignDesc_ril_2eproto();
-  friend void protobuf_ShutdownFile_ril_2eproto();
-  
-  ::google::protobuf::uint32 _has_bits_[1];
-  
-  // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
-  inline bool _has_bit(int index) const {
-    return (_has_bits_[index / 32] & (1u << (index % 32))) != 0;
-  }
-  inline void _set_bit(int index) {
-    _has_bits_[index / 32] |= (1u << (index % 32));
-  }
-  inline void _clear_bit(int index) {
-    _has_bits_[index / 32] &= ~(1u << (index % 32));
-  }
-  
-  void InitAsDefaultInstance();
-  static ReqGetSimStatus* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class RspGetSimStatus : public ::google::protobuf::Message {
  public:
   RspGetSimStatus();
 class RspGetSimStatus : public ::google::protobuf::Message {
  public:
   RspGetSimStatus();
@@ -1144,14 +1041,14 @@ class ReqHangUp : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
 };
 // -------------------------------------------------------------------
 
-class ReqScreenState : public ::google::protobuf::Message {
+class RspOperator : public ::google::protobuf::Message {
  public:
  public:
-  ReqScreenState();
-  virtual ~ReqScreenState();
+  RspOperator();
+  virtual ~RspOperator();
   
   
-  ReqScreenState(const ReqScreenState& from);
+  RspOperator(const RspOperator& from);
   
   
-  inline ReqScreenState& operator=(const ReqScreenState& from) {
+  inline RspOperator& operator=(const RspOperator& from) {
     CopyFrom(from);
     return *this;
   }
     CopyFrom(from);
     return *this;
   }
@@ -1165,17 +1062,17 @@ class ReqScreenState : public ::google::protobuf::Message {
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ReqScreenState& default_instance();
+  static const RspOperator& default_instance();
   
   
-  void Swap(ReqScreenState* other);
+  void Swap(RspOperator* other);
   
   // implements Message ----------------------------------------------
   
   
   // implements Message ----------------------------------------------
   
-  ReqScreenState* New() const;
+  RspOperator* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReqScreenState& from);
-  void MergeFrom(const ReqScreenState& from);
+  void CopyFrom(const RspOperator& from);
+  void MergeFrom(const RspOperator& from);
   void Clear();
   bool IsInitialized() const;
   
   void Clear();
   bool IsInitialized() const;
   
@@ -1198,24 +1095,52 @@ class ReqScreenState : public ::google::protobuf::Message {
   
   // accessors -------------------------------------------------------
   
   
   // accessors -------------------------------------------------------
   
-  // required bool state = 1;
-  inline bool has_state() const;
-  inline void clear_state();
-  static const int kStateFieldNumber = 1;
-  inline bool state() const;
-  inline void set_state(bool value);
+  // optional string long_alpha_ons = 1;
+  inline bool has_long_alpha_ons() const;
+  inline void clear_long_alpha_ons();
+  static const int kLongAlphaOnsFieldNumber = 1;
+  inline const ::std::string& long_alpha_ons() const;
+  inline void set_long_alpha_ons(const ::std::string& value);
+  inline void set_long_alpha_ons(const char* value);
+  inline void set_long_alpha_ons(const char* value, size_t size);
+  inline ::std::string* mutable_long_alpha_ons();
   
   
-  // @@protoc_insertion_point(class_scope:ril_proto.ReqScreenState)
+  // optional string short_alpha_ons = 2;
+  inline bool has_short_alpha_ons() const;
+  inline void clear_short_alpha_ons();
+  static const int kShortAlphaOnsFieldNumber = 2;
+  inline const ::std::string& short_alpha_ons() const;
+  inline void set_short_alpha_ons(const ::std::string& value);
+  inline void set_short_alpha_ons(const char* value);
+  inline void set_short_alpha_ons(const char* value, size_t size);
+  inline ::std::string* mutable_short_alpha_ons();
+  
+  // optional string mcc_mnc = 3;
+  inline bool has_mcc_mnc() const;
+  inline void clear_mcc_mnc();
+  static const int kMccMncFieldNumber = 3;
+  inline const ::std::string& mcc_mnc() const;
+  inline void set_mcc_mnc(const ::std::string& value);
+  inline void set_mcc_mnc(const char* value);
+  inline void set_mcc_mnc(const char* value, size_t size);
+  inline ::std::string* mutable_mcc_mnc();
+  
+  // @@protoc_insertion_point(class_scope:ril_proto.RspOperator)
  private:
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
  private:
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
-  bool state_;
+  ::std::string* long_alpha_ons_;
+  static const ::std::string _default_long_alpha_ons_;
+  ::std::string* short_alpha_ons_;
+  static const ::std::string _default_short_alpha_ons_;
+  ::std::string* mcc_mnc_;
+  static const ::std::string _default_mcc_mnc_;
   friend void  protobuf_AddDesc_ril_2eproto();
   friend void protobuf_AssignDesc_ril_2eproto();
   friend void protobuf_ShutdownFile_ril_2eproto();
   
   friend void  protobuf_AddDesc_ril_2eproto();
   friend void protobuf_AssignDesc_ril_2eproto();
   friend void protobuf_ShutdownFile_ril_2eproto();
   
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
   
   // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
   inline bool _has_bit(int index) const {
   
   // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
   inline bool _has_bit(int index) const {
@@ -1229,18 +1154,18 @@ class ReqScreenState : public ::google::protobuf::Message {
   }
   
   void InitAsDefaultInstance();
   }
   
   void InitAsDefaultInstance();
-  static ReqScreenState* default_instance_;
+  static RspOperator* default_instance_;
 };
 // -------------------------------------------------------------------
 
 };
 // -------------------------------------------------------------------
 
-class RspOperator : public ::google::protobuf::Message {
+class ReqScreenState : public ::google::protobuf::Message {
  public:
  public:
-  RspOperator();
-  virtual ~RspOperator();
+  ReqScreenState();
+  virtual ~ReqScreenState();
   
   
-  RspOperator(const RspOperator& from);
+  ReqScreenState(const ReqScreenState& from);
   
   
-  inline RspOperator& operator=(const RspOperator& from) {
+  inline ReqScreenState& operator=(const ReqScreenState& from) {
     CopyFrom(from);
     return *this;
   }
     CopyFrom(from);
     return *this;
   }
@@ -1254,17 +1179,17 @@ class RspOperator : public ::google::protobuf::Message {
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
   }
   
   static const ::google::protobuf::Descriptor* descriptor();
-  static const RspOperator& default_instance();
+  static const ReqScreenState& default_instance();
   
   
-  void Swap(RspOperator* other);
+  void Swap(ReqScreenState* other);
   
   // implements Message ----------------------------------------------
   
   
   // implements Message ----------------------------------------------
   
-  RspOperator* New() const;
+  ReqScreenState* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RspOperator& from);
-  void MergeFrom(const RspOperator& from);
+  void CopyFrom(const ReqScreenState& from);
+  void MergeFrom(const ReqScreenState& from);
   void Clear();
   bool IsInitialized() const;
   
   void Clear();
   bool IsInitialized() const;
   
@@ -1287,52 +1212,24 @@ class RspOperator : public ::google::protobuf::Message {
   
   // accessors -------------------------------------------------------
   
   
   // accessors -------------------------------------------------------
   
-  // optional string long_alpha_ons = 1;
-  inline bool has_long_alpha_ons() const;
-  inline void clear_long_alpha_ons();
-  static const int kLongAlphaOnsFieldNumber = 1;
-  inline const ::std::string& long_alpha_ons() const;
-  inline void set_long_alpha_ons(const ::std::string& value);
-  inline void set_long_alpha_ons(const char* value);
-  inline void set_long_alpha_ons(const char* value, size_t size);
-  inline ::std::string* mutable_long_alpha_ons();
-  
-  // optional string short_alpha_ons = 2;
-  inline bool has_short_alpha_ons() const;
-  inline void clear_short_alpha_ons();
-  static const int kShortAlphaOnsFieldNumber = 2;
-  inline const ::std::string& short_alpha_ons() const;
-  inline void set_short_alpha_ons(const ::std::string& value);
-  inline void set_short_alpha_ons(const char* value);
-  inline void set_short_alpha_ons(const char* value, size_t size);
-  inline ::std::string* mutable_short_alpha_ons();
-  
-  // optional string mcc_mnc = 3;
-  inline bool has_mcc_mnc() const;
-  inline void clear_mcc_mnc();
-  static const int kMccMncFieldNumber = 3;
-  inline const ::std::string& mcc_mnc() const;
-  inline void set_mcc_mnc(const ::std::string& value);
-  inline void set_mcc_mnc(const char* value);
-  inline void set_mcc_mnc(const char* value, size_t size);
-  inline ::std::string* mutable_mcc_mnc();
+  // required bool state = 1;
+  inline bool has_state() const;
+  inline void clear_state();
+  static const int kStateFieldNumber = 1;
+  inline bool state() const;
+  inline void set_state(bool value);
   
   
-  // @@protoc_insertion_point(class_scope:ril_proto.RspOperator)
+  // @@protoc_insertion_point(class_scope:ril_proto.ReqScreenState)
  private:
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
  private:
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
   mutable int _cached_size_;
   
-  ::std::string* long_alpha_ons_;
-  static const ::std::string _default_long_alpha_ons_;
-  ::std::string* short_alpha_ons_;
-  static const ::std::string _default_short_alpha_ons_;
-  ::std::string* mcc_mnc_;
-  static const ::std::string _default_mcc_mnc_;
+  bool state_;
   friend void  protobuf_AddDesc_ril_2eproto();
   friend void protobuf_AssignDesc_ril_2eproto();
   friend void protobuf_ShutdownFile_ril_2eproto();
   
   friend void  protobuf_AddDesc_ril_2eproto();
   friend void protobuf_AssignDesc_ril_2eproto();
   friend void protobuf_ShutdownFile_ril_2eproto();
   
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
   
   // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
   inline bool _has_bit(int index) const {
   
   // WHY DOES & HAVE LOWER PRECEDENCE THAN != !?
   inline bool _has_bit(int index) const {
@@ -1346,7 +1243,7 @@ class RspOperator : public ::google::protobuf::Message {
   }
   
   void InitAsDefaultInstance();
   }
   
   void InitAsDefaultInstance();
-  static RspOperator* default_instance_;
+  static ReqScreenState* default_instance_;
 };
 // ===================================================================
 
 };
 // ===================================================================
 
@@ -1730,10 +1627,6 @@ RspIntegers::mutable_integers() {
 
 // -------------------------------------------------------------------
 
 
 // -------------------------------------------------------------------
 
-// ReqGetSimStatus
-
-// -------------------------------------------------------------------
-
 // RspGetSimStatus
 
 // required .ril_proto.RilCardStatus card_status = 1;
 // RspGetSimStatus
 
 // required .ril_proto.RilCardStatus card_status = 1;
@@ -1841,26 +1734,6 @@ inline void ReqHangUp::set_connection_index(::google::protobuf::int32 value) {
 
 // -------------------------------------------------------------------
 
 
 // -------------------------------------------------------------------
 
-// ReqScreenState
-
-// required bool state = 1;
-inline bool ReqScreenState::has_state() const {
-  return _has_bit(0);
-}
-inline void ReqScreenState::clear_state() {
-  state_ = false;
-  _clear_bit(0);
-}
-inline bool ReqScreenState::state() const {
-  return state_;
-}
-inline void ReqScreenState::set_state(bool value) {
-  _set_bit(0);
-  state_ = value;
-}
-
-// -------------------------------------------------------------------
-
 // RspOperator
 
 // optional string long_alpha_ons = 1;
 // RspOperator
 
 // optional string long_alpha_ons = 1;
@@ -1989,6 +1862,26 @@ inline ::std::string* RspOperator::mutable_mcc_mnc() {
   return mcc_mnc_;
 }
 
   return mcc_mnc_;
 }
 
+// -------------------------------------------------------------------
+
+// ReqScreenState
+
+// required bool state = 1;
+inline bool ReqScreenState::has_state() const {
+  return _has_bit(0);
+}
+inline void ReqScreenState::clear_state() {
+  state_ = false;
+  _clear_bit(0);
+}
+inline bool ReqScreenState::state() const {
+  return state_;
+}
+inline void ReqScreenState::set_state(bool value) {
+  _set_bit(0);
+  state_ = value;
+}
+
 
 // @@protoc_insertion_point(namespace_scope)
 
 
 // @@protoc_insertion_point(namespace_scope)
 
@@ -1999,10 +1892,6 @@ namespace google {
 namespace protobuf {
 
 template <>
 namespace protobuf {
 
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RilCommand>() {
-  return ril_proto::RilCommand_descriptor();
-}
-template <>
 inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RadioState>() {
   return ril_proto::RadioState_descriptor();
 }
 inline const EnumDescriptor* GetEnumDescriptor< ril_proto::RadioState>() {
   return ril_proto::RadioState_descriptor();
 }
index 082a270..269cabf 100644 (file)
Binary files a/mock-ril/src/generated/desc/ctrl.desc and b/mock-ril/src/generated/desc/ctrl.desc differ
index 73729fb..9f34eb6 100644 (file)
Binary files a/mock-ril/src/generated/desc/ril.desc and b/mock-ril/src/generated/desc/ril.desc differ
index 0f08c71..5c0aa2a 100644 (file)
@@ -4,23 +4,17 @@ package com.android.internal.telephony.ril_proto;
 
 public final class RilCmds {
   private RilCmds() {}
 
 public final class RilCmds {
   private RilCmds() {}
-  // enum RilCommand
-  public static final int CMD_GET_SIM_STATUS = 1;
-  public static final int CMD_ENTER_SIM_PIN = 2;
-  public static final int CMD_HANGUP = 12;
-  public static final int CMD_SCREEN_STATE = 61;
-  
   // enum RadioState
   // enum RadioState
-  public static final int RADIO_STATE_OFF = 0;
-  public static final int RADIO_STATE_UNAVAILABLE = 1;
-  public static final int RADIO_STATE_SIM_NOT_READY = 2;
-  public static final int RADIO_STATE_SIM_LOCKED_OR_ABSENT = 3;
-  public static final int RADIO_STATE_SIM_READY = 4;
-  public static final int RADIO_STATE_RUIM_NOT_READY = 5;
-  public static final int RADIO_STATE_RUIM_READY = 6;
-  public static final int RADIO_STATE_RUIM_LOCKED_OR_ABSENT = 7;
-  public static final int RADIO_STATE_NV_NOT_READY = 8;
-  public static final int RADIO_STATE_NV_READY = 9;
+  public static final int RADIOSTATE_OFF = 0;
+  public static final int RADIOSTATE_UNAVAILABLE = 1;
+  public static final int RADIOSTATE_SIM_NOT_READY = 2;
+  public static final int RADIOSTATE_SIM_LOCKED_OR_ABSENT = 3;
+  public static final int RADIOSTATE_SIM_READY = 4;
+  public static final int RADIOSTATE_RUIM_NOT_READY = 5;
+  public static final int RADIOSTATE_RUIM_READY = 6;
+  public static final int RADIOSTATE_RUIM_LOCKED_OR_ABSENT = 7;
+  public static final int RADIOSTATE_NV_NOT_READY = 8;
+  public static final int RADIOSTATE_NV_READY = 9;
   
   // enum RilCardState
   public static final int CARDSTATE_ABSENT = 0;
   
   // enum RilCardState
   public static final int CARDSTATE_ABSENT = 0;
@@ -847,69 +841,6 @@ public final class RilCmds {
     
   }
   
     
   }
   
-  public static final class ReqGetSimStatus extends
-      com.google.protobuf.micro.MessageMicro {
-    public ReqGetSimStatus() {}
-    
-    public final ReqGetSimStatus clear() {
-      cachedSize = -1;
-      return this;
-    }
-    
-    public final boolean isInitialized() {
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.micro.CodedOutputStreamMicro output)
-                        throws java.io.IOException {
-    }
-    
-    private int cachedSize = -1;
-    public int getCachedSize() {
-      if (cachedSize < 0) {
-        // getSerializedSize sets cachedSize
-        getSerializedSize();
-      }
-      return cachedSize;
-    }
-    
-    public int getSerializedSize() {
-      int size = 0;
-      cachedSize = size;
-      return size;
-    }
-    
-    public ReqGetSimStatus mergeFrom(
-        com.google.protobuf.micro.CodedInputStreamMicro input)
-        throws java.io.IOException {
-      while (true) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            return this;
-          default: {
-            if (!parseUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-        }
-      }
-    }
-    
-    public static ReqGetSimStatus parseFrom(byte[] data)
-        throws com.google.protobuf.micro.InvalidProtocolBufferMicroException {
-      return (ReqGetSimStatus) (new ReqGetSimStatus().mergeFrom(data));
-    }
-    
-    public static ReqGetSimStatus parseFrom(
-            com.google.protobuf.micro.CodedInputStreamMicro input)
-        throws java.io.IOException {
-      return (ReqGetSimStatus) (new ReqGetSimStatus().mergeFrom(input));
-    }
-    
-  }
-  
   public static final class RspGetSimStatus extends
       com.google.protobuf.micro.MessageMicro {
     public RspGetSimStatus() {}
   public static final class RspGetSimStatus extends
       com.google.protobuf.micro.MessageMicro {
     public RspGetSimStatus() {}
@@ -1287,99 +1218,6 @@ public final class RilCmds {
     
   }
   
     
   }
   
-  public static final class ReqScreenState extends
-      com.google.protobuf.micro.MessageMicro {
-    public ReqScreenState() {}
-    
-    // required bool state = 1;
-    public static final int STATE_FIELD_NUMBER = 1;
-    private boolean hasState;
-    private boolean state_ = false;
-    public boolean getState() { return state_; }
-    public boolean hasState() { return hasState; }
-    public ReqScreenState setState(boolean value) {
-      hasState = true;
-      state_ = value;
-      return this;
-    }
-    public ReqScreenState clearState() {
-      hasState = false;
-      state_ = false;
-      return this;
-    }
-    
-    public final ReqScreenState clear() {
-      clearState();
-      cachedSize = -1;
-      return this;
-    }
-    
-    public final boolean isInitialized() {
-      if (!hasState) return false;
-      return true;
-    }
-    
-    public void writeTo(com.google.protobuf.micro.CodedOutputStreamMicro output)
-                        throws java.io.IOException {
-      if (hasState()) {
-        output.writeBool(1, getState());
-      }
-    }
-    
-    private int cachedSize = -1;
-    public int getCachedSize() {
-      if (cachedSize < 0) {
-        // getSerializedSize sets cachedSize
-        getSerializedSize();
-      }
-      return cachedSize;
-    }
-    
-    public int getSerializedSize() {
-      int size = 0;
-      if (hasState()) {
-        size += com.google.protobuf.micro.CodedOutputStreamMicro
-          .computeBoolSize(1, getState());
-      }
-      cachedSize = size;
-      return size;
-    }
-    
-    public ReqScreenState mergeFrom(
-        com.google.protobuf.micro.CodedInputStreamMicro input)
-        throws java.io.IOException {
-      while (true) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            return this;
-          default: {
-            if (!parseUnknownField(input, tag)) {
-              return this;
-            }
-            break;
-          }
-          case 8: {
-            setState(input.readBool());
-            break;
-          }
-        }
-      }
-    }
-    
-    public static ReqScreenState parseFrom(byte[] data)
-        throws com.google.protobuf.micro.InvalidProtocolBufferMicroException {
-      return (ReqScreenState) (new ReqScreenState().mergeFrom(data));
-    }
-    
-    public static ReqScreenState parseFrom(
-            com.google.protobuf.micro.CodedInputStreamMicro input)
-        throws java.io.IOException {
-      return (ReqScreenState) (new ReqScreenState().mergeFrom(input));
-    }
-    
-  }
-  
   public static final class RspOperator extends
       com.google.protobuf.micro.MessageMicro {
     public RspOperator() {}
   public static final class RspOperator extends
       com.google.protobuf.micro.MessageMicro {
     public RspOperator() {}
@@ -1530,4 +1368,97 @@ public final class RilCmds {
     
   }
   
     
   }
   
+  public static final class ReqScreenState extends
+      com.google.protobuf.micro.MessageMicro {
+    public ReqScreenState() {}
+    
+    // required bool state = 1;
+    public static final int STATE_FIELD_NUMBER = 1;
+    private boolean hasState;
+    private boolean state_ = false;
+    public boolean getState() { return state_; }
+    public boolean hasState() { return hasState; }
+    public ReqScreenState setState(boolean value) {
+      hasState = true;
+      state_ = value;
+      return this;
+    }
+    public ReqScreenState clearState() {
+      hasState = false;
+      state_ = false;
+      return this;
+    }
+    
+    public final ReqScreenState clear() {
+      clearState();
+      cachedSize = -1;
+      return this;
+    }
+    
+    public final boolean isInitialized() {
+      if (!hasState) return false;
+      return true;
+    }
+    
+    public void writeTo(com.google.protobuf.micro.CodedOutputStreamMicro output)
+                        throws java.io.IOException {
+      if (hasState()) {
+        output.writeBool(1, getState());
+      }
+    }
+    
+    private int cachedSize = -1;
+    public int getCachedSize() {
+      if (cachedSize < 0) {
+        // getSerializedSize sets cachedSize
+        getSerializedSize();
+      }
+      return cachedSize;
+    }
+    
+    public int getSerializedSize() {
+      int size = 0;
+      if (hasState()) {
+        size += com.google.protobuf.micro.CodedOutputStreamMicro
+          .computeBoolSize(1, getState());
+      }
+      cachedSize = size;
+      return size;
+    }
+    
+    public ReqScreenState mergeFrom(
+        com.google.protobuf.micro.CodedInputStreamMicro input)
+        throws java.io.IOException {
+      while (true) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            return this;
+          default: {
+            if (!parseUnknownField(input, tag)) {
+              return this;
+            }
+            break;
+          }
+          case 8: {
+            setState(input.readBool());
+            break;
+          }
+        }
+      }
+    }
+    
+    public static ReqScreenState parseFrom(byte[] data)
+        throws com.google.protobuf.micro.InvalidProtocolBufferMicroException {
+      return (ReqScreenState) (new ReqScreenState().mergeFrom(data));
+    }
+    
+    public static ReqScreenState parseFrom(
+            com.google.protobuf.micro.CodedInputStreamMicro input)
+        throws java.io.IOException {
+      return (ReqScreenState) (new ReqScreenState().mergeFrom(input));
+    }
+    
+  }
+  
 }
 }
index 053dba6..22b5bd7 100644 (file)
@@ -19,7 +19,7 @@ public final class RilCtrlCmds {
     // required .ril_proto.RadioState state = 1;
     public static final int STATE_FIELD_NUMBER = 1;
     private boolean hasState;
     // required .ril_proto.RadioState state = 1;
     public static final int STATE_FIELD_NUMBER = 1;
     private boolean hasState;
-    private int state_ = com.android.internal.telephony.ril_proto.RilCmds.RADIO_STATE_OFF;
+    private int state_ = com.android.internal.telephony.ril_proto.RilCmds.RADIOSTATE_OFF;
     public boolean hasState() { return hasState; }
     public int getState() { return state_; }
     public CtrlRspRadioState setState(int value) {
     public boolean hasState() { return hasState; }
     public int getState() { return state_; }
     public CtrlRspRadioState setState(int value) {
@@ -29,7 +29,7 @@ public final class RilCtrlCmds {
     }
     public CtrlRspRadioState clearState() {
       hasState = false;
     }
     public CtrlRspRadioState clearState() {
       hasState = false;
-      state_ = com.android.internal.telephony.ril_proto.RilCmds.RADIO_STATE_OFF;
+      state_ = com.android.internal.telephony.ril_proto.RilCmds.RADIOSTATE_OFF;
       return this;
     }
     
       return this;
     }
     
index f751bac..7a10ef4 100644 (file)
@@ -10,37 +10,7 @@ from google.protobuf import descriptor_pb2
 DESCRIPTOR = descriptor.FileDescriptor(
   name='ril.proto',
   package='ril_proto',
 DESCRIPTOR = descriptor.FileDescriptor(
   name='ril.proto',
   package='ril_proto',
-  serialized_pb='\n\tril.proto\x12\tril_proto\"\x9a\x02\n\x0cRilAppStatus\x12\'\n\x08\x61pp_type\x18\x01 \x01(\x0e\x32\x15.ril_proto.RilAppType\x12)\n\tapp_state\x18\x02 \x01(\x0e\x32\x16.ril_proto.RilAppState\x12\x33\n\x0eperso_substate\x18\x03 \x01(\x0e\x32\x1b.ril_proto.RilPersoSubstate\x12\x0b\n\x03\x61id\x18\x04 \x01(\t\x12\x11\n\tapp_label\x18\x05 \x01(\t\x12\x15\n\rpin1_replaced\x18\x06 \x01(\x05\x12$\n\x04pin1\x18\x07 \x01(\x0e\x32\x16.ril_proto.RilPinState\x12$\n\x04pin2\x18\x08 \x01(\x0e\x32\x16.ril_proto.RilPinState\"\x88\x02\n\rRilCardStatus\x12+\n\ncard_state\x18\x01 \x01(\x0e\x32\x17.ril_proto.RilCardState\x12\x33\n\x13universal_pin_state\x18\x02 \x01(\x0e\x32\x16.ril_proto.RilPinState\x12\'\n\x1fgsm_umts_subscription_app_index\x18\x03 \x01(\x05\x12#\n\x1b\x63\x64ma_subscription_app_index\x18\x04 \x01(\x05\x12\x18\n\x10num_applications\x18\x05 \x01(\x05\x12-\n\x0c\x61pplications\x18\x06 \x03(\x0b\x32\x17.ril_proto.RilAppStatus\"\x1d\n\nRspStrings\x12\x0f\n\x07strings\x18\x01 \x03(\t\"\x1f\n\x0bRspIntegers\x12\x10\n\x08integers\x18\x01 \x03(\x05\"\x11\n\x0fReqGetSimStatus\"@\n\x0fRspGetSimStatus\x12-\n\x0b\x63\x61rd_status\x18\x01 \x02(\x0b\x32\x18.ril_proto.RilCardStatus\"\x1d\n\x0eReqEnterSimPin\x12\x0b\n\x03pin\x18\x01 \x02(\t\"+\n\x0eRspEnterSimPin\x12\x19\n\x11retries_remaining\x18\x01 \x02(\x05\"%\n\tReqHangUp\x12\x18\n\x10\x63onnection_index\x18\x01 \x02(\x05\"\x1f\n\x0eReqScreenState\x12\r\n\x05state\x18\x01 \x02(\x08\"O\n\x0bRspOperator\x12\x16\n\x0elong_alpha_ons\x18\x01 \x01(\t\x12\x17\n\x0fshort_alpha_ons\x18\x02 \x01(\t\x12\x0f\n\x07mcc_mnc\x18\x03 \x01(\t*a\n\nRilCommand\x12\x16\n\x12\x43MD_GET_SIM_STATUS\x10\x01\x12\x15\n\x11\x43MD_ENTER_SIM_PIN\x10\x02\x12\x0e\n\nCMD_HANGUP\x10\x0c\x12\x14\n\x10\x43MD_SCREEN_STATE\x10=*\xb9\x02\n\nRadioState\x12\x13\n\x0fRADIO_STATE_OFF\x10\x00\x12\x1b\n\x17RADIO_STATE_UNAVAILABLE\x10\x01\x12\x1d\n\x19RADIO_STATE_SIM_NOT_READY\x10\x02\x12$\n RADIO_STATE_SIM_LOCKED_OR_ABSENT\x10\x03\x12\x19\n\x15RADIO_STATE_SIM_READY\x10\x04\x12\x1e\n\x1aRADIO_STATE_RUIM_NOT_READY\x10\x05\x12\x1a\n\x16RADIO_STATE_RUIM_READY\x10\x06\x12%\n!RADIO_STATE_RUIM_LOCKED_OR_ABSENT\x10\x07\x12\x1c\n\x18RADIO_STATE_NV_NOT_READY\x10\x08\x12\x18\n\x14RADIO_STATE_NV_READY\x10\t*P\n\x0cRilCardState\x12\x14\n\x10\x43\x41RDSTATE_ABSENT\x10\x00\x12\x15\n\x11\x43\x41RDSTATE_PRESENT\x10\x01\x12\x13\n\x0f\x43\x41RDSTATE_ERROR\x10\x02*\xf1\x06\n\x10RilPersoSubstate\x12\x19\n\x15PERSOSUBSTATE_UNKNOWN\x10\x00\x12\x1d\n\x19PERSOSUBSTATE_IN_PROGRESS\x10\x01\x12\x17\n\x13PERSOSUBSTATE_READY\x10\x02\x12\x1d\n\x19PERSOSUBSTATE_SIM_NETWORK\x10\x03\x12$\n PERSOSUBSTATE_SIM_NETWORK_SUBSET\x10\x04\x12\x1f\n\x1bPERSOSUBSTATE_SIM_CORPORATE\x10\x05\x12&\n\"PERSOSUBSTATE_SIM_SERVICE_PROVIDER\x10\x06\x12\x19\n\x15PERSOSUBSTATE_SIM_SIM\x10\x07\x12!\n\x1dPERSOSUBSTATE_SIM_NETWORK_PUK\x10\x08\x12(\n$PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK\x10\t\x12#\n\x1fPERSOSUBSTATE_SIM_CORPORATE_PUK\x10\n\x12*\n&PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK\x10\x0b\x12\x1d\n\x19PERSOSUBSTATE_SIM_SIM_PUK\x10\x0c\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_NETWORK1\x10\r\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_NETWORK2\x10\x0e\x12\x1b\n\x17PERSOSUBSTATE_RUIM_HRPD\x10\x0f\x12 \n\x1cPERSOSUBSTATE_RUIM_CORPORATE\x10\x10\x12\'\n#PERSOSUBSTATE_RUIM_SERVICE_PROVIDER\x10\x11\x12\x1b\n\x17PERSOSUBSTATE_RUIM_RUIM\x10\x12\x12#\n\x1fPERSOSUBSTATE_RUIM_NETWORK1_PUK\x10\x13\x12#\n\x1fPERSOSUBSTATE_RUIM_NETWORK2_PUK\x10\x14\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_HRPD_PUK\x10\x15\x12$\n PERSOSUBSTATE_RUIM_CORPORATE_PUK\x10\x16\x12+\n\'PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK\x10\x17\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_RUIM_PUK\x10\x18*\x93\x01\n\x0bRilAppState\x12\x14\n\x10\x41PPSTATE_UNKNOWN\x10\x00\x12\x15\n\x11\x41PPSTATE_DETECTED\x10\x01\x12\x10\n\x0c\x41PPSTATE_PIN\x10\x02\x12\x10\n\x0c\x41PPSTATE_PUK\x10\x03\x12\x1f\n\x1b\x41PPSTATE_SUBSCRIPTION_PERSO\x10\x04\x12\x12\n\x0e\x41PPSTATE_READY\x10\x05*\xbd\x01\n\x0bRilPinState\x12\x14\n\x10PINSTATE_UNKNOWN\x10\x00\x12!\n\x1dPINSTATE_ENABLED_NOT_VERIFIED\x10\x01\x12\x1d\n\x19PINSTATE_ENABLED_VERIFIED\x10\x02\x12\x15\n\x11PINSTATE_DISABLED\x10\x03\x12\x1c\n\x18PINSTATE_ENABLED_BLOCKED\x10\x04\x12!\n\x1dPINSTATE_ENABLED_PERM_BLOCKED\x10\x05*h\n\nRilAppType\x12\x13\n\x0f\x41PPTYPE_UNKNOWN\x10\x00\x12\x0f\n\x0b\x41PPTYPE_SIM\x10\x01\x12\x10\n\x0c\x41PPTYPE_USIM\x10\x02\x12\x10\n\x0c\x41PPTYPE_RUIM\x10\x03\x12\x10\n\x0c\x41PPTYPE_CSIM\x10\x04\x42\x33\n(com.android.internal.telephony.ril_protoB\x07RilCmds')
-
-_RILCOMMAND = descriptor.EnumDescriptor(
-  name='RilCommand',
-  full_name='ril_proto.RilCommand',
-  filename=None,
-  file=DESCRIPTOR,
-  values=[
-    descriptor.EnumValueDescriptor(
-      name='CMD_GET_SIM_STATUS', index=0, number=1,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CMD_ENTER_SIM_PIN', index=1, number=2,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CMD_HANGUP', index=2, number=12,
-      options=None,
-      type=None),
-    descriptor.EnumValueDescriptor(
-      name='CMD_SCREEN_STATE', index=3, number=61,
-      options=None,
-      type=None),
-  ],
-  containing_type=None,
-  options=None,
-  serialized_start=954,
-  serialized_end=1051,
-)
-
+  serialized_pb='\n\tril.proto\x12\tril_proto\"\x9a\x02\n\x0cRilAppStatus\x12\'\n\x08\x61pp_type\x18\x01 \x01(\x0e\x32\x15.ril_proto.RilAppType\x12)\n\tapp_state\x18\x02 \x01(\x0e\x32\x16.ril_proto.RilAppState\x12\x33\n\x0eperso_substate\x18\x03 \x01(\x0e\x32\x1b.ril_proto.RilPersoSubstate\x12\x0b\n\x03\x61id\x18\x04 \x01(\t\x12\x11\n\tapp_label\x18\x05 \x01(\t\x12\x15\n\rpin1_replaced\x18\x06 \x01(\x05\x12$\n\x04pin1\x18\x07 \x01(\x0e\x32\x16.ril_proto.RilPinState\x12$\n\x04pin2\x18\x08 \x01(\x0e\x32\x16.ril_proto.RilPinState\"\x88\x02\n\rRilCardStatus\x12+\n\ncard_state\x18\x01 \x01(\x0e\x32\x17.ril_proto.RilCardState\x12\x33\n\x13universal_pin_state\x18\x02 \x01(\x0e\x32\x16.ril_proto.RilPinState\x12\'\n\x1fgsm_umts_subscription_app_index\x18\x03 \x01(\x05\x12#\n\x1b\x63\x64ma_subscription_app_index\x18\x04 \x01(\x05\x12\x18\n\x10num_applications\x18\x05 \x01(\x05\x12-\n\x0c\x61pplications\x18\x06 \x03(\x0b\x32\x17.ril_proto.RilAppStatus\"\x1d\n\nRspStrings\x12\x0f\n\x07strings\x18\x01 \x03(\t\"\x1f\n\x0bRspIntegers\x12\x10\n\x08integers\x18\x01 \x03(\x05\"@\n\x0fRspGetSimStatus\x12-\n\x0b\x63\x61rd_status\x18\x01 \x02(\x0b\x32\x18.ril_proto.RilCardStatus\"\x1d\n\x0eReqEnterSimPin\x12\x0b\n\x03pin\x18\x01 \x02(\t\"+\n\x0eRspEnterSimPin\x12\x19\n\x11retries_remaining\x18\x01 \x02(\x05\"%\n\tReqHangUp\x12\x18\n\x10\x63onnection_index\x18\x01 \x02(\x05\"O\n\x0bRspOperator\x12\x16\n\x0elong_alpha_ons\x18\x01 \x01(\t\x12\x17\n\x0fshort_alpha_ons\x18\x02 \x01(\t\x12\x0f\n\x07mcc_mnc\x18\x03 \x01(\t\"\x1f\n\x0eReqScreenState\x12\r\n\x05state\x18\x01 \x02(\x08*\xaf\x02\n\nRadioState\x12\x12\n\x0eRADIOSTATE_OFF\x10\x00\x12\x1a\n\x16RADIOSTATE_UNAVAILABLE\x10\x01\x12\x1c\n\x18RADIOSTATE_SIM_NOT_READY\x10\x02\x12#\n\x1fRADIOSTATE_SIM_LOCKED_OR_ABSENT\x10\x03\x12\x18\n\x14RADIOSTATE_SIM_READY\x10\x04\x12\x1d\n\x19RADIOSTATE_RUIM_NOT_READY\x10\x05\x12\x19\n\x15RADIOSTATE_RUIM_READY\x10\x06\x12$\n RADIOSTATE_RUIM_LOCKED_OR_ABSENT\x10\x07\x12\x1b\n\x17RADIOSTATE_NV_NOT_READY\x10\x08\x12\x17\n\x13RADIOSTATE_NV_READY\x10\t*P\n\x0cRilCardState\x12\x14\n\x10\x43\x41RDSTATE_ABSENT\x10\x00\x12\x15\n\x11\x43\x41RDSTATE_PRESENT\x10\x01\x12\x13\n\x0f\x43\x41RDSTATE_ERROR\x10\x02*\xf1\x06\n\x10RilPersoSubstate\x12\x19\n\x15PERSOSUBSTATE_UNKNOWN\x10\x00\x12\x1d\n\x19PERSOSUBSTATE_IN_PROGRESS\x10\x01\x12\x17\n\x13PERSOSUBSTATE_READY\x10\x02\x12\x1d\n\x19PERSOSUBSTATE_SIM_NETWORK\x10\x03\x12$\n PERSOSUBSTATE_SIM_NETWORK_SUBSET\x10\x04\x12\x1f\n\x1bPERSOSUBSTATE_SIM_CORPORATE\x10\x05\x12&\n\"PERSOSUBSTATE_SIM_SERVICE_PROVIDER\x10\x06\x12\x19\n\x15PERSOSUBSTATE_SIM_SIM\x10\x07\x12!\n\x1dPERSOSUBSTATE_SIM_NETWORK_PUK\x10\x08\x12(\n$PERSOSUBSTATE_SIM_NETWORK_SUBSET_PUK\x10\t\x12#\n\x1fPERSOSUBSTATE_SIM_CORPORATE_PUK\x10\n\x12*\n&PERSOSUBSTATE_SIM_SERVICE_PROVIDER_PUK\x10\x0b\x12\x1d\n\x19PERSOSUBSTATE_SIM_SIM_PUK\x10\x0c\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_NETWORK1\x10\r\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_NETWORK2\x10\x0e\x12\x1b\n\x17PERSOSUBSTATE_RUIM_HRPD\x10\x0f\x12 \n\x1cPERSOSUBSTATE_RUIM_CORPORATE\x10\x10\x12\'\n#PERSOSUBSTATE_RUIM_SERVICE_PROVIDER\x10\x11\x12\x1b\n\x17PERSOSUBSTATE_RUIM_RUIM\x10\x12\x12#\n\x1fPERSOSUBSTATE_RUIM_NETWORK1_PUK\x10\x13\x12#\n\x1fPERSOSUBSTATE_RUIM_NETWORK2_PUK\x10\x14\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_HRPD_PUK\x10\x15\x12$\n PERSOSUBSTATE_RUIM_CORPORATE_PUK\x10\x16\x12+\n\'PERSOSUBSTATE_RUIM_SERVICE_PROVIDER_PUK\x10\x17\x12\x1f\n\x1bPERSOSUBSTATE_RUIM_RUIM_PUK\x10\x18*\x93\x01\n\x0bRilAppState\x12\x14\n\x10\x41PPSTATE_UNKNOWN\x10\x00\x12\x15\n\x11\x41PPSTATE_DETECTED\x10\x01\x12\x10\n\x0c\x41PPSTATE_PIN\x10\x02\x12\x10\n\x0c\x41PPSTATE_PUK\x10\x03\x12\x1f\n\x1b\x41PPSTATE_SUBSCRIPTION_PERSO\x10\x04\x12\x12\n\x0e\x41PPSTATE_READY\x10\x05*\xbd\x01\n\x0bRilPinState\x12\x14\n\x10PINSTATE_UNKNOWN\x10\x00\x12!\n\x1dPINSTATE_ENABLED_NOT_VERIFIED\x10\x01\x12\x1d\n\x19PINSTATE_ENABLED_VERIFIED\x10\x02\x12\x15\n\x11PINSTATE_DISABLED\x10\x03\x12\x1c\n\x18PINSTATE_ENABLED_BLOCKED\x10\x04\x12!\n\x1dPINSTATE_ENABLED_PERM_BLOCKED\x10\x05*h\n\nRilAppType\x12\x13\n\x0f\x41PPTYPE_UNKNOWN\x10\x00\x12\x0f\n\x0b\x41PPTYPE_SIM\x10\x01\x12\x10\n\x0c\x41PPTYPE_USIM\x10\x02\x12\x10\n\x0c\x41PPTYPE_RUIM\x10\x03\x12\x10\n\x0c\x41PPTYPE_CSIM\x10\x04\x42\x33\n(com.android.internal.telephony.ril_protoB\x07RilCmds')
 
 _RADIOSTATE = descriptor.EnumDescriptor(
   name='RadioState',
 
 _RADIOSTATE = descriptor.EnumDescriptor(
   name='RadioState',
@@ -49,50 +19,50 @@ _RADIOSTATE = descriptor.EnumDescriptor(
   file=DESCRIPTOR,
   values=[
     descriptor.EnumValueDescriptor(
   file=DESCRIPTOR,
   values=[
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_OFF', index=0, number=0,
+      name='RADIOSTATE_OFF', index=0, number=0,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_UNAVAILABLE', index=1, number=1,
+      name='RADIOSTATE_UNAVAILABLE', index=1, number=1,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_SIM_NOT_READY', index=2, number=2,
+      name='RADIOSTATE_SIM_NOT_READY', index=2, number=2,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_SIM_LOCKED_OR_ABSENT', index=3, number=3,
+      name='RADIOSTATE_SIM_LOCKED_OR_ABSENT', index=3, number=3,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_SIM_READY', index=4, number=4,
+      name='RADIOSTATE_SIM_READY', index=4, number=4,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_RUIM_NOT_READY', index=5, number=5,
+      name='RADIOSTATE_RUIM_NOT_READY', index=5, number=5,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_RUIM_READY', index=6, number=6,
+      name='RADIOSTATE_RUIM_READY', index=6, number=6,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_RUIM_LOCKED_OR_ABSENT', index=7, number=7,
+      name='RADIOSTATE_RUIM_LOCKED_OR_ABSENT', index=7, number=7,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_NV_NOT_READY', index=8, number=8,
+      name='RADIOSTATE_NV_NOT_READY', index=8, number=8,
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
       options=None,
       type=None),
     descriptor.EnumValueDescriptor(
-      name='RADIO_STATE_NV_READY', index=9, number=9,
+      name='RADIOSTATE_NV_READY', index=9, number=9,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
       options=None,
       type=None),
   ],
   containing_type=None,
   options=None,
-  serialized_start=1054,
-  serialized_end=1367,
+  serialized_start=936,
+  serialized_end=1239,
 )
 
 
 )
 
 
@@ -117,8 +87,8 @@ _RILCARDSTATE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
   ],
   containing_type=None,
   options=None,
-  serialized_start=1369,
-  serialized_end=1449,
+  serialized_start=1241,
+  serialized_end=1321,
 )
 
 
 )
 
 
@@ -231,8 +201,8 @@ _RILPERSOSUBSTATE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
   ],
   containing_type=None,
   options=None,
-  serialized_start=1452,
-  serialized_end=2333,
+  serialized_start=1324,
+  serialized_end=2205,
 )
 
 
 )
 
 
@@ -269,8 +239,8 @@ _RILAPPSTATE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
   ],
   containing_type=None,
   options=None,
-  serialized_start=2336,
-  serialized_end=2483,
+  serialized_start=2208,
+  serialized_end=2355,
 )
 
 
 )
 
 
@@ -307,8 +277,8 @@ _RILPINSTATE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
   ],
   containing_type=None,
   options=None,
-  serialized_start=2486,
-  serialized_end=2675,
+  serialized_start=2358,
+  serialized_end=2547,
 )
 
 
 )
 
 
@@ -341,25 +311,21 @@ _RILAPPTYPE = descriptor.EnumDescriptor(
   ],
   containing_type=None,
   options=None,
   ],
   containing_type=None,
   options=None,
-  serialized_start=2677,
-  serialized_end=2781,
+  serialized_start=2549,
+  serialized_end=2653,
 )
 
 
 )
 
 
-CMD_GET_SIM_STATUS = 1
-CMD_ENTER_SIM_PIN = 2
-CMD_HANGUP = 12
-CMD_SCREEN_STATE = 61
-RADIO_STATE_OFF = 0
-RADIO_STATE_UNAVAILABLE = 1
-RADIO_STATE_SIM_NOT_READY = 2
-RADIO_STATE_SIM_LOCKED_OR_ABSENT = 3
-RADIO_STATE_SIM_READY = 4
-RADIO_STATE_RUIM_NOT_READY = 5
-RADIO_STATE_RUIM_READY = 6
-RADIO_STATE_RUIM_LOCKED_OR_ABSENT = 7
-RADIO_STATE_NV_NOT_READY = 8
-RADIO_STATE_NV_READY = 9
+RADIOSTATE_OFF = 0
+RADIOSTATE_UNAVAILABLE = 1
+RADIOSTATE_SIM_NOT_READY = 2
+RADIOSTATE_SIM_LOCKED_OR_ABSENT = 3
+RADIOSTATE_SIM_READY = 4
+RADIOSTATE_RUIM_NOT_READY = 5
+RADIOSTATE_RUIM_READY = 6
+RADIOSTATE_RUIM_LOCKED_OR_ABSENT = 7
+RADIOSTATE_NV_NOT_READY = 8
+RADIOSTATE_NV_READY = 9
 CARDSTATE_ABSENT = 0
 CARDSTATE_PRESENT = 1
 CARDSTATE_ERROR = 2
 CARDSTATE_ABSENT = 0
 CARDSTATE_PRESENT = 1
 CARDSTATE_ERROR = 2
@@ -604,27 +570,6 @@ _RSPINTEGERS = descriptor.Descriptor(
 )
 
 
 )
 
 
-_REQGETSIMSTATUS = descriptor.Descriptor(
-  name='ReqGetSimStatus',
-  full_name='ril_proto.ReqGetSimStatus',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  extension_ranges=[],
-  serialized_start=640,
-  serialized_end=657,
-)
-
-
 _RSPGETSIMSTATUS = descriptor.Descriptor(
   name='RspGetSimStatus',
   full_name='ril_proto.RspGetSimStatus',
 _RSPGETSIMSTATUS = descriptor.Descriptor(
   name='RspGetSimStatus',
   full_name='ril_proto.RspGetSimStatus',
@@ -648,8 +593,8 @@ _RSPGETSIMSTATUS = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=659,
-  serialized_end=723,
+  serialized_start=640,
+  serialized_end=704,
 )
 
 
 )
 
 
@@ -676,8 +621,8 @@ _REQENTERSIMPIN = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=725,
-  serialized_end=754,
+  serialized_start=706,
+  serialized_end=735,
 )
 
 
 )
 
 
@@ -704,8 +649,8 @@ _RSPENTERSIMPIN = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=756,
-  serialized_end=799,
+  serialized_start=737,
+  serialized_end=780,
 )
 
 
 )
 
 
@@ -732,36 +677,8 @@ _REQHANGUP = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=801,
-  serialized_end=838,
-)
-
-
-_REQSCREENSTATE = descriptor.Descriptor(
-  name='ReqScreenState',
-  full_name='ril_proto.ReqScreenState',
-  filename=None,
-  file=DESCRIPTOR,
-  containing_type=None,
-  fields=[
-    descriptor.FieldDescriptor(
-      name='state', full_name='ril_proto.ReqScreenState.state', index=0,
-      number=1, type=8, cpp_type=7, label=2,
-      has_default_value=False, default_value=False,
-      message_type=None, enum_type=None, containing_type=None,
-      is_extension=False, extension_scope=None,
-      options=None),
-  ],
-  extensions=[
-  ],
-  nested_types=[],
-  enum_types=[
-  ],
-  options=None,
-  is_extendable=False,
-  extension_ranges=[],
-  serialized_start=840,
-  serialized_end=871,
+  serialized_start=782,
+  serialized_end=819,
 )
 
 
 )
 
 
@@ -802,8 +719,36 @@ _RSPOPERATOR = descriptor.Descriptor(
   options=None,
   is_extendable=False,
   extension_ranges=[],
   options=None,
   is_extendable=False,
   extension_ranges=[],
-  serialized_start=873,
-  serialized_end=952,
+  serialized_start=821,
+  serialized_end=900,
+)
+
+
+_REQSCREENSTATE = descriptor.Descriptor(
+  name='ReqScreenState',
+  full_name='ril_proto.ReqScreenState',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    descriptor.FieldDescriptor(
+      name='state', full_name='ril_proto.ReqScreenState.state', index=0,
+      number=1, type=8, cpp_type=7, label=2,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=902,
+  serialized_end=933,
 )
 
 
 )
 
 
@@ -841,12 +786,6 @@ class RspIntegers(message.Message):
   
   # @@protoc_insertion_point(class_scope:ril_proto.RspIntegers)
 
   
   # @@protoc_insertion_point(class_scope:ril_proto.RspIntegers)
 
-class ReqGetSimStatus(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _REQGETSIMSTATUS
-  
-  # @@protoc_insertion_point(class_scope:ril_proto.ReqGetSimStatus)
-
 class RspGetSimStatus(message.Message):
   __metaclass__ = reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _RSPGETSIMSTATUS
 class RspGetSimStatus(message.Message):
   __metaclass__ = reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _RSPGETSIMSTATUS
@@ -871,16 +810,16 @@ class ReqHangUp(message.Message):
   
   # @@protoc_insertion_point(class_scope:ril_proto.ReqHangUp)
 
   
   # @@protoc_insertion_point(class_scope:ril_proto.ReqHangUp)
 
-class ReqScreenState(message.Message):
-  __metaclass__ = reflection.GeneratedProtocolMessageType
-  DESCRIPTOR = _REQSCREENSTATE
-  
-  # @@protoc_insertion_point(class_scope:ril_proto.ReqScreenState)
-
 class RspOperator(message.Message):
   __metaclass__ = reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _RSPOPERATOR
   
   # @@protoc_insertion_point(class_scope:ril_proto.RspOperator)
 
 class RspOperator(message.Message):
   __metaclass__ = reflection.GeneratedProtocolMessageType
   DESCRIPTOR = _RSPOPERATOR
   
   # @@protoc_insertion_point(class_scope:ril_proto.RspOperator)
 
+class ReqScreenState(message.Message):
+  __metaclass__ = reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _REQSCREENSTATE
+  
+  # @@protoc_insertion_point(class_scope:ril_proto.ReqScreenState)
+
 # @@protoc_insertion_point(module_scope)
 # @@protoc_insertion_point(module_scope)
index e2051f3..70da50e 100644 (file)
@@ -137,16 +137,14 @@ include("ctrl_server.js");
  * Worker handler method.
  */
 function Request(reqNum, token, protobuf, schema, schemaName) {
  * Worker handler method.
  */
 function Request(reqNum, token, protobuf, schema, schemaName) {
-    req = new Object();
-    req.reqNum = reqNum;
-    req.token = token;
+    this.reqNum = reqNum;
+    this.token = token;
     try {
     try {
-        req.data = schema[packageNameAndSeperator + schemaName].parse(protobuf);
+        this.data = schema[packageNameAndSeperator + schemaName].parse(protobuf);
     } catch (err) {
         // not a valid protobuf in the request
     } catch (err) {
         // not a valid protobuf in the request
-        req.data = null;
+        this.data = null;
     }
     }
-    return req;
 }
 
 /**
 }
 
 /**
index 0ceb9d5..5af338e 100644 (file)
@@ -6,26 +6,19 @@ package ril_proto;
 option java_package='com.android.internal.telephony.ril_proto';
 option java_outer_classname='RilCmds';
 
 option java_package='com.android.internal.telephony.ril_proto';
 option java_outer_classname='RilCmds';
 
-enum RilCommand {
-  CMD_GET_SIM_STATUS                        = 1;
-  CMD_ENTER_SIM_PIN                         = 2;
-  CMD_HANGUP                                = 12;
-  CMD_SCREEN_STATE                          = 61;
-}
-
 enum RadioState {
 enum RadioState {
-    RADIO_STATE_OFF                         = 0; /* Radio explictly powered off (eg CFUN=0) */
-    RADIO_STATE_UNAVAILABLE                 = 1; /* Radio unavailable (eg, resetting or not booted) */
-    RADIO_STATE_SIM_NOT_READY               = 2; /* Radio is on, but the SIM interface is not ready */
-    RADIO_STATE_SIM_LOCKED_OR_ABSENT        = 3; /* SIM PIN locked, PUK required, network
-                                                    personalization locked, or SIM absent */
-    RADIO_STATE_SIM_READY                   = 4; /* Radio is on and SIM interface is available */
-    RADIO_STATE_RUIM_NOT_READY              = 5; /* Radio is on, but the RUIM interface is not ready */
-    RADIO_STATE_RUIM_READY                  = 6; /* Radio is on and the RUIM interface is available */
-    RADIO_STATE_RUIM_LOCKED_OR_ABSENT       = 7; /* RUIM PIN locked, PUK required, network
-                                                    personalization locked, or RUIM absent */
-    RADIO_STATE_NV_NOT_READY                = 8; /* Radio is on, but the NV interface is not available */
-    RADIO_STATE_NV_READY                    = 9; /* Radio is on and the NV interface is available */
+    RADIOSTATE_OFF                      = 0; /* Radio explictly powered off (eg CFUN=0) */
+    RADIOSTATE_UNAVAILABLE              = 1; /* Radio unavailable (eg, resetting or not booted) */
+    RADIOSTATE_SIM_NOT_READY            = 2; /* Radio is on, but the SIM interface is not ready */
+    RADIOSTATE_SIM_LOCKED_OR_ABSENT     = 3; /* SIM PIN locked, PUK required, network
+                                                personalization locked, or SIM absent */
+    RADIOSTATE_SIM_READY                = 4; /* Radio is on and SIM interface is available */
+    RADIOSTATE_RUIM_NOT_READY           = 5; /* Radio is on, but the RUIM interface is not ready */
+    RADIOSTATE_RUIM_READY               = 6; /* Radio is on and the RUIM interface is available */
+    RADIOSTATE_RUIM_LOCKED_OR_ABSENT    = 7; /* RUIM PIN locked, PUK required, network
+                                                personalization locked, or RUIM absent */
+    RADIOSTATE_NV_NOT_READY             = 8; /* Radio is on, but the NV interface is not available */
+    RADIOSTATE_NV_READY                 = 9; /* Radio is on and the NV interface is available */
 }
 
 enum RilCardState {
 }
 
 enum RilCardState {
@@ -114,7 +107,6 @@ message RilCardStatus {
   repeated RilAppStatus applications                    = 6; /* CARD_MAX_APPS == 8 */
 }
 
   repeated RilAppStatus applications                    = 6; /* CARD_MAX_APPS == 8 */
 }
 
-
 // Response is an array of strings.
 //
 // If a strings(i) is "*magic-null*" then that value will be returned as null.
 // Response is an array of strings.
 //
 // If a strings(i) is "*magic-null*" then that value will be returned as null.
@@ -127,33 +119,34 @@ message RspIntegers{
   repeated int32 integers                   = 1;
 }
 
   repeated int32 integers                   = 1;
 }
 
-message ReqGetSimStatus {
-}
+//  1 RIL_REQUEST_GET_SIM_STATUS
 message RspGetSimStatus {
   required RilCardStatus card_status        = 1;
 }
 
 message RspGetSimStatus {
   required RilCardStatus card_status        = 1;
 }
 
-
+//  2 RIL_REQUEST_ENTER_SIM_PIN
 message ReqEnterSimPin {
   required string pin                       = 1;
 }
 message ReqEnterSimPin {
   required string pin                       = 1;
 }
+//    RIL_REQUEST_ENTER_SIM_PIN response
 message RspEnterSimPin {
   required int32 retries_remaining          = 1;
 }
 
 message RspEnterSimPin {
   required int32 retries_remaining          = 1;
 }
 
-
+// 12 RIL_REQUEST_HANG_UP
 message ReqHangUp {
   required int32 connection_index           = 1;
 }
 
 message ReqHangUp {
   required int32 connection_index           = 1;
 }
 
-
-message ReqScreenState {
-  required bool state                       = 1; // true screen is on, false screen is off
-}
-
-// RIL_REQUEST_OPERATOR response
+// 22 RIL_REQUEST_OPERATOR response
 message RspOperator{
   optional string long_alpha_ons            = 1; // The long alpha ons or eons
   optional string short_alpha_ons           = 2; // The short alpha ons or eons
   optional string mcc_mnc                   = 3; // the 5 or 6 digit mcc + mnc
 }
 message RspOperator{
   optional string long_alpha_ons            = 1; // The long alpha ons or eons
   optional string short_alpha_ons           = 2; // The short alpha ons or eons
   optional string mcc_mnc                   = 3; // the 5 or 6 digit mcc + mnc
 }
+
+// 61 RIL_REQUEST_SCREEN_STATE
+message ReqScreenState {
+  required bool state                       = 1; // true screen is on, false screen is off
+}
+
index 08b082e..0b56301 100755 (executable)
@@ -189,7 +189,7 @@ def main(argv):
 
   # Create an object which is serializable to a protobuf
   rrs = ctrl_pb2.CtrlRspRadioState()
 
   # Create an object which is serializable to a protobuf
   rrs = ctrl_pb2.CtrlRspRadioState()
-  rrs.state = ril_pb2.RADIO_STATE_UNAVAILABLE
+  rrs.state = ril_pb2.RADIOSTATE_UNAVAILABLE
   print "rrs.state=%d" % (rrs.state)
 
   # Serialize
   print "rrs.state=%d" % (rrs.state)
 
   # Serialize