Fix merge mistake in TelephonyConnectionService. #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In createConnectionFor() we return the GsmConnection object incorrectly. This is the result of an incorrect merge. Remove the return statement and do not add the connection to the controller. Change-Id: I83c11a4495c0c4d4d5675679ca73ece18c669c10 Conflicts: src/com/android/services/telephony/TelephonyConnectionService.java
|
Pretty sure I got this http://review.cyanogenmod.org/#/c/85426/ |
|
Hey bud we got a Gerrit up now, u can submit to it from now on :) |
|
Im having issues setting up gerrit On Thu, Jan 15, 2015 at 12:38 PM, remicks [email protected] wrote:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In createConnectionFor() we return the GsmConnection object incorrectly.
This is the result of an incorrect merge. Remove the return statement
and do not add the connection to the controller.
Change-Id: I83c11a4495c0c4d4d5675679ca73ece18c669c10
Conflicts:
src/com/android/services/telephony/TelephonyConnectionService.java