Skip to content

Ics #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhacker29 wants to merge 5 commits into
base: ics
Choose a base branch
from
Open

Ics #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e920347
Merge branch 'ics-mr1' of https://android.googlesource.com/platform/s…
Dec 17, 2011
35cbd13
Merge branch 'ics' of github.com:Hashcode/android_system_core into ics
Jan 15, 2012
18c92f4
Merge branch 'ics' of git://github.com/CyanogenMod/android_system_cor…
Jan 15, 2012
1950d44
fix duplicate moto ids
Jan 15, 2012
abf9e17
Merge branch 'ics' of github.com:Hashcode/android_system_core into ics
Jan 19, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions include/private/android_filesystem_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,11 @@
#define AID_NET_BW_ACCT 3007 /* change bandwidth statistics accounting */
#define AID_QCOM_ONCRPC 3008 /* can read/write /dev/oncrpc files */

<<<<<<< HEAD
//#ifdef USE_MOTOROLA_USERS
=======
#ifdef USE_MOTOROLA_USERS
>>>>>>> 485d7f95cb867a93db0146f84d5ac8f991485880
#define AID_MOT_OSH 5000 /* OSH */
#define AID_MOT_ACCY 9000 /* access to accessory */
#define AID_MOT_PWRIC 9001 /* power IC */
Expand All @@ -91,7 +95,11 @@
#define AID_MOT_WHISPER 9009 /* Whisper Protocol access */
#define AID_MOT_CAIF 9010 /* can create CAIF sockets */
#define AID_MOT_DLNA 9011 /*DLNA native */
<<<<<<< HEAD
//#endif
=======
#endif
>>>>>>> 485d7f95cb867a93db0146f84d5ac8f991485880

#define AID_MISC 9998 /* access to misc storage */
#define AID_NOBODY 9999
Expand Down Expand Up @@ -158,21 +166,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, },
};
Expand Down