| Chunk |
|---|
| Conflicting content |
|---|
public static final int WIFI_UID = 1010;
/**
<<<<<<< HEAD
* Defines the GID for the group that allows write access to the SD card.
* @hide
*/
public static final int SDCARD_RW_GID = 1015;
=======
* Defines the UID/GID for the NFC service process.
* @hide
*/
public static final int NFC_UID = 1022;
>>>>>>> 36e7790b6b3c2c36c67fbe5dc2e2313cdd537349
/**
* Defines the start of a range of UIDs (and GIDs), going from this |
| Solution content |
|---|
public static final int WIFI_UID = 1010;
/**
* Defines the GID for the group that allows write access to the SD card.
* @hide
*/
public static final int SDCARD_RW_GID = 1015;
/**
* Defines the start of a range of UIDs (and GIDs), going from this |
| File |
|---|
| Process.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |