From 1950d441c17125445ab693533ae97c63177273e0 Mon Sep 17 00:00:00 2001 From: dhacker29 Date: Sat, 14 Jan 2012 20:36:41 -0600 Subject: [PATCH] fix duplicate moto ids --- include/private/android_filesystem_config.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index c516c645d92..91ffdd77e80 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -78,8 +78,6 @@ #define AID_QCOM_ONCRPC 3008 /* can read/write /dev/oncrpc files */ //#ifdef USE_MOTOROLA_USERS -======= -#if defined(MOTOROLA_UIDS) #define AID_MOT_OSH 5000 /* OSH */ #define AID_MOT_ACCY 9000 /* access to accessory */ #define AID_MOT_PWRIC 9001 /* power IC */ @@ -94,9 +92,6 @@ #define AID_MOT_CAIF 9010 /* can create CAIF sockets */ #define AID_MOT_DLNA 9011 /*DLNA native */ //#endif -======= -#define AID_MOT_DLNA 9011 /* DLNA native */ -#endif // MOTOROLA_UIDS #define AID_MISC 9998 /* access to misc storage */ #define AID_NOBODY 9999 @@ -163,21 +158,6 @@ static const struct android_id_info android_ids[] = { { "mot_dlna", AID_MOT_DLNA,}, //#endif { "qcom_oncrpc", AID_QCOM_ONCRPC, }, -#if defined(MOTOROLA_UIDS) - { "mot_osh", AID_MOT_OSH, }, - { "mot_accy", AID_MOT_ACCY, }, - { "mot_pwric", AID_MOT_PWRIC, }, - { "mot_usb", AID_MOT_USB, }, - { "mot_drm", AID_MOT_DRM, }, - { "mot_tcmd", AID_MOT_TCMD, }, - { "mot_sec_rtc", AID_MOT_SEC_RTC, }, - { "mot_tombstone", AID_MOT_TOMBSTONE, }, - { "mot_tpapi", AID_MOT_TPAPI, }, - { "mot_secclkd", AID_MOT_SECCLKD, }, - { "mot_whisper", AID_MOT_WHISPER, }, - { "mot_caif", AID_MOT_CAIF, }, - { "mot_dlna", AID_MOT_DLNA, }, -#endif { "misc", AID_MISC, }, { "nobody", AID_NOBODY, }, };