Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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