1. Include EHRPD in the EVDO group
2. Fix mapping of CDMA network type to include EVDO
3. Add utility to get the network type from the Raf
Change-Id: I4d3658a3d0063cbc8cd51cfb38666c6bb17f80dd
The merge failure is not plumbed up through any layer that
can trap the callback and act on it. The first part of this
fix is to create that plumbing. Then we need to reenable the
merge button. At this point in time, we leverage the fact
that forcing the call to reassess its capabilities will poke
the InCallUI to reenable the merge button. In the future, we
should plumb the merge failure all the way to InCallUI and
not only handle the button but display UI to the user. The UI
is currently being displayed by CallNotifier which is the wrong
place. See b/20530631 for more details.
Bug: 20229905
Change-Id: I0355ada46b484c6db4bee656c77386dd61be5e1f
- The issue was due to a mis-merge in ParcelableConference. The write
of the status hints happens at the end of the writeToParcel method.
Bug: 20503132
Change-Id: I40ef9b267b48876006e4cbe29e5ae09ba77bcb33
- Got tired of looking at numerical integer videoStates, so added a new
"videoStateToString" static method, similar to how we have a
Connection#capabilitiesToString method.
Bug: 20257400
Change-Id: I39fcf413938c90e5993985f0976ad4fcce11505d
Deprecate the old createFromPdu(byte[] pdu) call because it just
guesses the format of the PDU. Instead, unhide the
createFromPdu(byte[] pdu, String format) call which specifies the PDU
format.
BUG: 20015718
Change-Id: I133fc17bf5af4f762fea3106e75beea58185fd5d
In the carrier messaging API, I forgot to add the parameter to request
delivery status. We need to add one more parameter (to indicate
requesting delivery status) to these calls:
onSendMultipartTextSms
onSendTextSms
onSendDataSms
Backward compatibility is maintained in
CarrierMessagingService.java. Third-party carrier apps implementing
the old API will continue to work.
BUG: 20224743
Change-Id: I09901558e7cb75a9ec6a5bd5ba2c8117ac471932
automerge: 9dfe4ff
* commit '9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e':
Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
automerge: 9dbb002
* commit '9dbb002c88fb85c8b3d7f512b789f183fe8361ad':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
automerge: ab52a9d -s ours
* commit 'ab52a9daa310209b27a57b61aadc704b76712c02':
[DO NOT MERGE] Fixed NPE when trying to animate a window without display
* commit 'd642f8297529b3df96d0f822b062cb8354c90c18':
docs: Fixed broken urls in the UI testing training main page and revised intro to the 'Testing UI for a Single App' class.
* commit '649d839b82a8fafc99ae79ba1ad5fc12218391cb':
docs: Remove misleading information about hardware layer performance benefits for optimizing views.
Currently we send it only in request packets, but not in discover
packets. This might confuse servers because they might think that
the discover and the request come from different clients.
Also reorder the options in the request packet to match the order
used by the legacy DHCP client.
While I'm at it, fix the generation code for inform and decline
packets, which we do not use.
Bug: 19704592
Bug: 20335221
Change-Id: I1d45306e76dbd5da9cc4611e6df84a9f67346b2c
Since the demise of the connectivity change delay,
CONNECTIVITY_ACTION_IMMEDIATE has been sent out back to back with
CONNECTIVITY_ACTION.
Interested parties should watch for CONNECTIVITY_ACTION.
Bug: 20013379
Change-Id: I072dddf95adb3bbd17fa1f7159d4ea848ade8f19