Projects >> platform_frameworks_base >>54a26bc85f4fe972e929e42b986c65a710a229b3

Chunk
Conflicting content
    public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
            = "android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS";

<<<<<<< HEAD
=======
     /**
     * Broadcast Action: The MDN changed during the CDMA OTA Process
     * The intent will have the following extra values:

*
    *
  • mdn - An Integer of the updated MDN number.
  • *
* *

This is a protected intent that can only be sent * by the system. * *

*/ // TODO(Moto): Generally broadcast intents are for use to allow entities which // may not know about each other to "communicate". This seems quite specific // and maybe using the registrant style would be better. // Moto: Since this is used for apps not in the same process of phone, can the // registrant style be used? (Ling Li says: Maybe the "app" can request rather // than save the MDN each time and this intent would not be necessary?) // Moto response: Moto internal discussion is on-going. public static final String ACTION_CDMA_OTA_MDN_CHANGED = "android.intent.action.ACTION_MDN_STATE_CHANGED"; >>>>>>> 889c2d37f784301ea968e8a44d450ae1d8717a18 }

Solution content
    public static final String ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS
            = "android.intent.action.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS";
}
File
TelephonyIntents.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment