161328 Commits

Author SHA1 Message Date
Yorke Lee
b6ea500ef5 DO NOT MERGE Add BIND_TELECOM_CONNECTION_SERVICE permission
Bug: 21088342
Change-Id: I465307899d83c4a3ee5e88a28554c4b867c1f4ba
2015-05-14 10:18:52 -07:00
Robert Greenwalt
7e00b669bc Merge "Add support for static RadioCapabilities." into m-wireless-dev 2015-05-12 23:31:12 +00:00
Robert Greenwalt
a8fc387e20 Add support for static RadioCapabilities.
Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY.  Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.

Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that.  B 21079604 created for this.

If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).

bug:20561357
Change-Id: I9607e8e99242c6f7a6e330741d4afe8bbd08b1e7
2015-05-12 15:41:09 -07:00
Pierre Vandwalle
216d8c3635 fix null pointer crash
Bug:20232584

Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea
2015-05-08 16:07:15 -07:00
Tyler Gunn
2b5b660203 DO NOT MERGE Un-@hiding some missed VT APIs.
Bug: 20947116
Change-Id: Idda9b7c7debafbea8c42eaadb75c3375b2c8ddb2
2015-05-08 14:55:22 -07:00
Wei Wang
9225cc4f2e [DO NOT MERGE] Fix a bug in ScanSettings constructor.
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
2015-05-08 21:28:08 +00:00
Wei Wang
2ac9f1e1fb [DO NOT MERGE] Honor Ble scanning settings from Settings UI.
Bug:20643039

Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
2015-05-08 21:27:42 +00:00
Tom Turney
295d6bdba8 Merge "[DO NOT MERGE] Temp workaround to track max beacons." into m-wireless-dev 2015-05-08 21:27:28 +00:00
Santos Cordon
39465f9d8a DO NOT MERGE Remove CallState and rename PRE_DIAL_WAIT
Bug: 20532827
Bug: 20532435
Change-Id: I5f0308c5cf4e4a9cf9020b4fe7fa5f3f8dee6e67
2015-05-08 12:07:02 -07:00
Andrew Lee
73a8912a4d DO NOT MERGE Add handler parameter for callbacks.
Bug: 20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
2015-05-07 13:39:45 -07:00
Nitin Arora
75dfd6b3bf DO NOT MERGE Bluetooth: Ensure Bluetooth interface handle is valid
This change adds null checks to Bluetooth interface handle to prevent
using null references when BluetoothService is not up. Also removed
the callbacks for the intermediate state removed for now as they are
not being used.

Change-Id: I4c4a406c99a51e0759d9163f7d658d64dee11ad9
2015-05-06 22:01:05 -07:00
Wei Wang
5dc486c4b1 [DO NOT MERGE] Temp workaround to track max beacons.
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
2015-05-05 14:00:24 -07:00
Etan Cohen
93bbf2774d Add VT over IMS global setting.
Bug: 20750301
Change-Id: Ifb6e832aa67e50aef247a19ef7a7f64096a67dd6
2015-05-04 18:14:28 -07:00
Andrew Lee
113bd7d209 DO NOT MERGE Add Properties to Call.Details.
Moved some capabilities to properties which seemed appropriate.

Bug: 20160395
Change-Id: Iacef4365822e5c3e50f0c41a501bf295c22055f1
2015-05-01 13:45:03 -07:00
Tyler Gunn
f18217248d Change sendSessionModifyRequest VideoProvider API signature.
Including a fromProfile in addition to the requestedProfile.

- Changed VideoCallImpl to generate the fromVideoProfile based on the
call's current videoState.  This ensures the InCall UI only needs to
pass in the new video profile; the VideoCall Impl already has enough
knowledge to generate the fromProfile.
  - Changed VideoCallImpl to track the current videoQuality, which forms
a part of the fromVideoProfile.

Bug: 20704229
Change-Id: I89f293f03a2b13fc8c1dcfd8a07ab8640d3950e0
2015-05-01 09:46:44 -07:00
Prerepa Viswanadham
0353e1ca06 Merge "DO NOT MERGE" into m-wireless-dev 2015-04-30 22:49:58 +00:00
Prerepa Viswanadham
d37bb3223e DO NOT MERGE
Fix build

Change-Id: Id1cc4cc2b241b775edd1553e49fbff4b728adfc4
2015-04-30 15:48:27 -07:00
Amit Mahajan
5c868a2cd2 Support for bearer_bitmask.
Change-Id: I7cae3d229445607c66b6472124264588f7571097
2015-04-30 22:40:58 +00:00
Etan Cohen
35105ee76b Merge "RCS/Presence enabler." into m-wireless-dev 2015-04-30 19:24:26 +00:00
Etan Cohen
b6f59f48cb Merge "IMS-VT: Enable video calls" into m-wireless-dev 2015-04-29 23:29:49 +00:00
Sooraj Sasindran
f6db0ce6c4 DO NOT MERGE - Make sure to return network type after conversion
After converting raf to type, make sure to return
network type

Change-Id: Ifb8bf33b852323b1a9b6febf3a87d1c1bc1082f7
2015-04-28 11:25:31 -07:00
Abhishek Adappa
8407f289e1 DO NOT MERGE - Radio Access Family related fixes
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
2015-04-28 11:14:52 -07:00
Sanket Padawe
536f7c56e3 DO NOT MERGE - Multi-sim device would show 2 PLMN in status bar even if they are same.
Bug: 19710990
Change-Id: Iee3841b0abf31937787c01da3685bc76b5c86f03
2015-04-28 11:00:10 -07:00
Anthony Lee
17455a3d39 Add plumbing for merge failures and renable button. (3/4)
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
2015-04-28 07:13:34 -07:00
Vinit Deshpande
2a550449bc Merge "Added parameter to avoid having a stream opened, and with that, file truncated on no-op." into m-wireless-dev 2015-04-28 01:23:31 +00:00
Jan Nordqvist
e20b8ad4c4 Changed logging tag.
Change-Id: I9a916305910c65425ffe7ea8d5a29dba0ee9a8da
2015-04-27 22:15:53 +00:00
Tyler Gunn
d7017c42be Fixing issue where conference calls enable speaker phone.
- 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
2015-04-27 13:13:32 -07:00
Tyler Gunn
bde0b1e4c8 Add videoStateToString on videoProvider Class.
- 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
2015-04-24 23:47:37 +00:00
Cheuksan Wang
890eb710f9 Merge "add injectSmsPdu with subId to ISms.aidl" into m-wireless-dev 2015-04-24 23:35:25 +00:00
Cheuksan Wang
9ddd2e78cb Update the SmsMessage.createFromPdu() API call
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
2015-04-24 22:45:46 +00:00
xinhe
ebc5ced56e No Permission check for WiFi RTT
Bug:19918231
Change-Id: I98aea756cc15683596096e46da48efe0737ae1d1
2015-04-24 22:17:48 +00:00
Cheuksan Wang
e87e4f077c add a parameter to carrier messaging calls to request delivery status
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
2015-04-24 21:51:28 +00:00
Cheuksan Wang
712cdaf48e Merge "Fail SmsManager requests if SubId is not active." into m-wireless-dev 2015-04-24 21:40:11 +00:00
Jan Nordqvist
58687715da Added parameter to avoid having a stream opened,
and with that, file truncated on no-op.

Change-Id: I5813e4fd269c639a437e17f2554efa4db735a8ba
2015-04-23 15:42:55 -07:00
Matthew Williams
44a05269ee am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev
automerge: 9dfe4ff

* commit '9dfe4ff46abcf0ec9cfe17a1478475a41bd2631e':
  Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
2015-04-23 22:24:34 +00:00
Quddus Chong
c136973a43 am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
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.
2015-04-23 22:24:18 +00:00
Luan Nguyen
abf6f48e22 am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
automerge: 29d9332

* commit '29d93329c23101e304985646c7bce71019945185':
  docs: Remove note about inablity to submit apps to Google Play.
2015-04-23 22:24:09 +00:00
Quddus Chong
a9bd0e523a am 0c3b894c: am 91070dc4: Merge "docs: Added training docs for UI testing frameworks (Espresso, UI Automator)." into lmp-docs
automerge: 6a08de6

* commit '6a08de6f7db0719c6e414ba36b8090836c91a873':
  docs: Added training docs for UI testing frameworks (Espresso, UI Automator).
2015-04-23 22:23:57 +00:00
Wale Ogunwale
b4d5b32082 am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev
automerge: ab52a9d  -s ours

* commit 'ab52a9daa310209b27a57b61aadc704b76712c02':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display
2015-04-23 22:23:46 +00:00
Andrew Solovay
a1a2fa791a am f2ff12ba: Merge "docs: Fixed formatting in android:documentLaunchMode syntax section" into lmp-docs
automerge: 8a5d295

* commit '8a5d2953e2886b610045f268dbb3b2a0a9b0249c':
  docs: Fixed formatting in android:documentLaunchMode syntax section
2015-04-23 22:23:34 +00:00
Yuichi Araki
4da83def05 am 776cf41d: Fix a broken link in javadoc
automerge: 678638e

* commit '678638e8e6c1373f93214bf4da76b53109b4a23d':
  Fix a broken link in javadoc
2015-04-23 22:23:26 +00:00
Eric Gilmore
3498e6ce90 am b2b93762: Merge "Changing wording to reflect c2dm shutdown." into lmp-docs
automerge: c90b7c6

* commit 'c90b7c623f765abcf662364b65f344ef9dcaf3da':
  Changing wording to reflect c2dm shutdown.
2015-04-23 22:23:18 +00:00
Scott Rowe
2f11248654 am 4fc3d3ff: Merge "docs: Building Live TV Apps" into lmp-docs
automerge: 20c886f

* commit '20c886fdee111ecc5766c81da6f03130dcb3a918':
  docs: Building Live TV Apps
2015-04-23 22:23:10 +00:00
Luan Nguyen
d342e9918d am d01ada25: Merge "docs: Update ambient mode to mention disabling bitmap filtering" into lmp-docs
automerge: b24bb3e

* commit 'b24bb3e3109035e627ad8a7d17728b5e6ba39405':
  docs: Update ambient mode to mention disabling bitmap filtering
2015-04-23 22:23:02 +00:00
Luan Nguyen
edd8efe87a am 649d839b: Merge "docs: Remove misleading information about hardware layer performance benefits for optimizing views." into lmp-docs
automerge: 47789f7

* commit '47789f72761e28ae315c460fe969a2f6888b806a':
  docs: Remove misleading information about hardware layer performance benefits for optimizing views.
2015-04-23 22:22:54 +00:00
Luan Nguyen
60b827a383 am 7542c44e: Merge "docs: Add voice intent for starting a stopwatch" into lmp-docs
automerge: bab656f

* commit 'bab656f89e9449960a658d69806e31578ab1443a':
  docs: Add voice intent for starting a stopwatch
2015-04-23 22:22:46 +00:00
Andrew Solovay
fed470ff75 am b2255d4f: docs: Fixed a typo.
automerge: 5600666

* commit '56006668cbd1f101010ce04418a7d056e7711fad':
  docs: Fixed a typo.
2015-04-23 22:22:29 +00:00
Matthew Williams
9dfe4ff46a am 28358eae: Merge "Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test." into lmp-mr1-dev
* commit '28358eaed2e1858fcba7991cbd7199a25d160471':
  Fixing to fail android.JobScheduler.TimingConstraintsTest#testSchedulePeriodic in TV test.
2015-04-23 19:38:51 +00:00
Quddus Chong
9dbb002c88 am d642f829: am 54dee349: docs: Fixed broken urls in the UI testing training main page and revised intro to the \'Testing UI for a Single App\' class.
* 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.
2015-04-23 19:38:43 +00:00
Luan Nguyen
29d93329c2 am b7647017: am eeb42053: Merge "docs: Remove note about inablity to submit apps to Google Play." into lmp-docs
* commit 'b7647017ddf8f57c7333b5ae3e459639ef0a6a7c':
  docs: Remove note about inablity to submit apps to Google Play.
2015-04-23 19:38:39 +00:00