nadlabak/android_frameworks_base — pull request #4 by berolinux (2012-04-01 08:52:06+00:00)
Title: Build fix for Stk

Without this commit from upstream pulled in, Stk fails to build because it expects the OPEN_CHANNEL, CLOSE_CHANNEL, RECEIVE_DATA and SEND_DATA enum values to exist.

[...]
packages/apps/Stk/src/com/android/stk/StkAppService.java:335: unqualified enumeration constant name required
case CLOSE_CHANNEL:
^
[...]

Since all it does is add some members to an enum, merging this should be harmless.

Original (upstream) commit message:

While BIP data call setup is still handled in RIL/Modem,
this patch is adding support of Alpha tag display on UI.
Alpha tag is optionally included in "OPEN Channel", "Close Channel",
"Send Data" or "Receive Data" command.

"Open channel" will be notified via RIL_UNSOL_STK_PROACTIVE_COMMAND
which requires TERMINAL RESPONSE based on user input.
"Close channel", "Send Data" and "Receive Data" commands
are send via RIL_UNSOL_STK_EVENT_NOTIFY just to display
transient notice.

Bug:5165510
Change-Id: I873e55274c860886bc816ce6fb07cb882d339214