277199 Commits

Author SHA1 Message Date
Jeremy Joslin
acbf592683 Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
am: 34d46ca94c

Change-Id: I1e6f1751cf3ce690e09e8681c86f744a38c550d6
2017-01-04 21:42:41 +00:00
Treehugger Robot
34d46ca94c Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." 2017-01-04 21:35:04 +00:00
Joe LaPenna
1c4cfe1af9 Merge "Expose RecommendationRequest.Builder as SystemApi."
am: 944b017031

Change-Id: If63881b8b33ced7950ebb7e83fb8994e454b8642
2017-01-04 19:49:35 +00:00
Jeremy Joslin
c02fd4ea78 Use the new BIND_NETWORK_RECOMMENDATION_SERVICE.
Declare that the system uses the new
BIND_NETWORK_RECOMMENDATION_SERVICE permission.

Test: Built & ran
BUG: 33897544
Change-Id: I43424642a631f58da3a065f8221e351180f4f221
Merged-In: I41c7550adf0d1f81ed9a12068ba569e6a57f3b42
2017-01-04 11:46:06 -08:00
Treehugger Robot
944b017031 Merge "Expose RecommendationRequest.Builder as SystemApi." 2017-01-04 19:42:17 +00:00
Marie Janssen
fde6c2a4af Merge "Bluetooth: don't output dumpsys info twice"
am: c77074300b

Change-Id: I727ed233944a18565e7286bfe0a8d7832a2be962
2017-01-04 19:13:57 +00:00
Marie Janssen
c77074300b Merge "Bluetooth: don't output dumpsys info twice" 2017-01-04 19:07:18 +00:00
Marie Janssen
f5ec538f27 Bluetooth: don't output dumpsys info twice
Dumpsys info was printed in the "Application Services" section as well
as the bluetooth_manager section.  Add an argument to print so it prints
from here, and doesn't in the other section.

Test: run a bugreport, check in "APP SERVICES" section
Bug: 29356402
Change-Id: I8adedaeac54c9a538c581459654dbdf96361e046
2017-01-04 11:06:27 -08:00
Joe LaPenna
010e8b0dc8 Expose RecommendationRequest.Builder as SystemApi.
In order to test our recommender, we need to be able to create
network recommendation requests.

Test: make update-api
Change-Id: I68df0d3e684bcdb90709a34478d2aa669ee23547
Merged-In: I68df0d3e684bcdb90709a34478d2aa669ee23547
2017-01-04 10:15:52 -08:00
qinzhichao
15c9c1f8d1 Merge "Fix NullPointerException in MediaPlayer"
am: c7c899bbe2

Change-Id: Iff261e6bd78c4f757ee0f7ae199710c9f92f0778
2017-01-04 17:27:48 +00:00
Treehugger Robot
c7c899bbe2 Merge "Fix NullPointerException in MediaPlayer" 2017-01-04 17:23:07 +00:00
Jeremy Joslin
a169fc3494 Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
am: 871beedc6d

Change-Id: I2554ede84b313e66af57e05c59046747c16ec23e
2017-01-04 15:29:57 +00:00
Treehugger Robot
871beedc6d Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." 2017-01-04 15:24:30 +00:00
Neil Fuller
6a29676687 Merge "Set isConnected, isBound, implCreated on server-side LocalSockets"
am: 75ba827a4e

Change-Id: I08b809241b6e025c9a30377c09f616be3484d7af
2017-01-04 12:32:29 +00:00
Treehugger Robot
75ba827a4e Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" 2017-01-04 12:26:49 +00:00
Ivan Podogov
a7d58fecc6 Merge "HID Device role API fixes"
am: f33a71d017

Change-Id: Ib7f524b7ad0bf63b852f2ffd4039d8b47ef7fc01
2017-01-04 10:37:38 +00:00
Neil Fuller
b08c7bc0bd Set isConnected, isBound, implCreated on server-side LocalSockets
Previously LocalServerSocket.accept() would return a LocalSocket
instance with isConnected, isBound and implCreated set to false.
[implCreated determines whether impl.create() needs to called].

A socket created via accept() in this way is implicitly bound
and connected. impl.create() does not need to be called because
impl.accept(LocalSocketImpl s) is called instead and has the same
effect (s.fd and s.mFdCreatedInternally set correctly).

This change modifies the behavior so that the flags are now all
set to true in this case and isBound() and isConnected() will
now return the correct answer.

Attempts to call bind() and connect() will still throw
IOException as before, but with a different exception message.

Correctly setting implCreated in LocalSocket means that
LocalSocketImpl.create() will no longer be called for accept()
created sockets and no longer needs to treat the "fd != null"
case as a no-op: we can now assert that there must be no fd set
when create() is called as we will no longer call it with sockets
created using accept().

Bug: https://code.google.com/p/android/issues/detail?id=35942
Test: Device boot
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalServerSocketTest.java
Test: vogar --mode app_process cts/tests/tests/net/src/android/net/cts/LocalSocketTest.java
Change-Id: I3ac55439412e84501ae7c5ae6c9976e03b2d6fc5
2017-01-04 10:33:18 +00:00
Ivan Podogov
f33a71d017 Merge "HID Device role API fixes" 2017-01-04 10:32:41 +00:00
qinzhichao
30d4a498c4 Fix NullPointerException in MediaPlayer
Issue detail:
https://code.google.com/p/android/issues/detail?id=231417

setSubtitleAnchor() is a synchronized method and has checked
mSubtitleController. So checking for null pointer is not
needed in scanInternalSubtitleTracks() method.

Signed-off-by: qinzhichao <qinzhichao@xiaomi.com>
2017-01-04 14:51:33 +08:00
Steven Moreland
ca5d560090 Merge "Add checked exceptions to HwBinder transact."
am: 6c5cc261f8

Change-Id: I3bcac03a745722acd983dc4e7bdc31ae806bdbd4
2017-01-04 05:03:28 +00:00
Treehugger Robot
6c5cc261f8 Merge "Add checked exceptions to HwBinder transact." 2017-01-04 04:58:38 +00:00
Pavlin Radoslavov
8b46f87e7e Merge "Add a mechanism for configuring the A2DP Source codecs"
am: 63270f2b96

Change-Id: I289d3b61e29b02bae208c656a6e963ff58248a15
2017-01-04 03:39:50 +00:00
Treehugger Robot
63270f2b96 Merge "Add a mechanism for configuring the A2DP Source codecs" 2017-01-04 03:35:42 +00:00
Pavlin Radoslavov
44a4ef0aa9 Add a mechanism for configuring the A2DP Source codecs
* Added a new class BluetoothCodecConfig that contains codec-related
  configuration or capabilities: codec type, priority, sample rate,
  bits per sample, channel mode, and codec specific fields.

* Extended the Bluetooth A2DP AIDL interface to get/set the current
  codec configuration

* Added new call handleBluetoothA2dpDeviceConfigChange() to the Media
  Framework that is called when there are changes in the
  Bluetooth A2DP device configuration - e.g., the A2DP codec is changed.

Test: A2DP streaming to headsets, TestPlans/71390
Bug: 30958229
Change-Id: I9a82716cbc2a5efbe77352a031ac80c88f6a2459
2017-01-03 17:52:52 -08:00
Steven Moreland
e62b1f32f3 Add checked exceptions to HwBinder transact.
Bug: 33673120
Test: hidl_test_java
Merged-In: I7b62eb6b066fc24c44ef7e46aaa2a3208c053d11

Change-Id: I7b62eb6b066fc24c44ef7e46aaa2a3208c053d11
2017-01-04 01:13:16 +00:00
Ivan Podogov
dd87cd3bb6 HID Device role API fixes
This change makes HIDD API more like the other ones, i.e.
supporting multiple devices, and implements missing methods.

While the underlying implementation may still only support a
single device at a time, the "device" parameter can still be
useful for checking if the application is trying to send the
data to a correct device.

Test: make
Change-Id: I55fe04c0762a96fcddd6c6678e790361d648111a
2017-01-03 22:36:30 +00:00
Jeremy Joslin
b9a61979cc New permission - BIND_NETWORK_RECOMMENDATION_SERVICE.
Used to protect exported network recommendation services.

Test: Built & ran
BUG:33897544
Change-Id: Icfc566275a8d832449f6358e576784199ab0f7b2
Merged-In: I4f163fb965be6a25201bc3ba5e0032e7652c8f20
2017-01-03 14:19:51 -08:00
Jeff Sharkey
4b80a4a372 Merge "Offer to measure disk stats using quotas."
am: f8720b95be

Change-Id: I56bab3ec4895c232ce8287623827c20f2dbfaaf6
2017-01-03 19:24:00 +00:00
Jeff Sharkey
f8720b95be Merge "Offer to measure disk stats using quotas." 2017-01-03 19:08:08 +00:00
Robert Greenwalt
14a5b810b6 Merge "Add IMEI_NOT_ACCEPTED disconnect cause"
am: 43ced5941e

Change-Id: I5457b80932f4bb155bf136fc4e05199f04ca7e7c
2017-01-03 17:32:59 +00:00
Robert Greenwalt
43ced5941e Merge "Add IMEI_NOT_ACCEPTED disconnect cause" 2017-01-03 17:26:59 +00:00
Jeff Sharkey
5eb3eb58ac Offer to measure disk stats using quotas.
Now we're getting somewhere!  This CL starts measuring disk usage
using quotactl(), which is almost instant and has much lower impact
on flash memory lifetime.

We now grant the per-app cache GID to every launched app, and the
ContextImpl logic that creates cache directories matches the logic
down in installd.

Test: builds, boots, quota stats match manual stats
Bug: 27948817
Change-Id: Ie269a2958ce0e1c17cb74dbfecc791a5c12922cf
2017-01-03 10:22:39 -07:00
dongwan0605.kim
56812a0146 Merge "QS: Fix QuickQS visibility at non-first page"
am: fce04dc0be

Change-Id: I83100ac5c1f4d896d96d2ff12d0ad59eba8b533b
2017-01-03 16:09:21 +00:00
Treehugger Robot
fce04dc0be Merge "QS: Fix QuickQS visibility at non-first page" 2017-01-03 15:54:21 +00:00
dongwan0605.kim
03c9afadab QS: Fix QuickQS visibility at non-first page
When user collapsed QSPanel at non-first page, QuickQS always remained
View.Visible. When user canceled collapsing, QQS remained clickable
although invisible to user(alpha = 0).
QQS must be non-clickable when user cancels collapsing at non-first page.

Test: QSPanel > 2nd page > Cancel collapsing while collapse QSPanel
      > Verify invisible QQS is non-clickable

Change-Id: I4c1f195a3faec8e89bb073443f6345f4faddf781
2017-01-03 06:47:17 +00:00
Nick Kralevich
4400fb5bed Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs"
am: 9156ccdbb4

Change-Id: I1501dce93ba090237831bf4c777cea13870f393d
2017-01-01 22:43:20 +00:00
Treehugger Robot
9156ccdbb4 Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" 2017-01-01 22:28:37 +00:00
Ivan Podogov
5297dba712 Fix profiles broken by ag/1751147
Change-Id: Ifa92819df8e63355a3979ea0f1a20a0363b6cd45
2016-12-30 22:22:38 +00:00
Marie Janssen
c816141bce resolve merge conflicts of 9cc7ebe to stage-aosp-master
Change-Id: Ia1cdf49d77a574c38ed5cc33c31d5cf930103484
2016-12-29 12:44:03 -08:00
Ivan Podogov
59d63e8b1d Merge changes from topic 'HID-Client'
am: 8a74d0440c

Change-Id: I6a541011024253f7b7f5f5207294cf1bce60a4f0
2016-12-29 19:39:07 +00:00
Ivan Podogov
94e3d3f499 Rename the Bluetooth profile classes for HID Device role.
am: 0afe190af5

Change-Id: Ib5c9b904da57048d719df504142edd3dab0e6ec3
2016-12-29 19:38:41 +00:00
Hemant Gupta
ee469c6fe9 Bluetooth: Add support for HID Device Role
am: e88fd4b594

Change-Id: Ic2a82d5670ffbd3046766d73ed9b180546c59169
2016-12-29 19:37:58 +00:00
Marie Janssen
9cc7ebe7d9 Merge "Bluetooth: track enabling in dumpsys" 2016-12-29 19:32:36 +00:00
Treehugger Robot
8a74d0440c Merge changes from topic 'HID-Client'
* changes:
  Rename the Bluetooth profile classes for HID Device role.
  Bluetooth: Add support for HID Device Role
2016-12-29 19:29:17 +00:00
Marie Janssen
5980456040 Bluetooth: track enabling in dumpsys
Move basic state dumpsys to here from AdapterService.

Track which apps are enabling and disabling Bluetooth, including BLE
apps, and show the apps in the dumpsys logs.

Test: start phone and enable/disable, take bug report
Bug: 33692282
Change-Id: I6ea62ebdcfd7873d0be1bb5c5c520bbce3737a40
2016-12-29 19:22:14 +00:00
Ivan Podogov
0afe190af5 Rename the Bluetooth profile classes for HID Device role.
We already have BluetoothInputDevice class, so adding something
called BluetoothHidDevice seems confusing. On the other hand,
the new class is designed to connect to HID Host devices, so
naming it BluetoothInputHost makes sense and goes in line with
the existing BluetoothInputDevice.

The same goes for the new constant HID_DEVICE that is just as
confusing to have together with the INPUT_DEVICE one.

This CL also renames the "connection state changed" broadcast
(for the same reasons), declares it as an SDK constant, and also
adds some javadoc to it.

Note that BluetoothHidDeviceApp* classes remained unchanged, as
those correspond to the app that implements the Device (and
connects to the Host).

Test: make
Change-Id: I5075ca5b97db3c1dd403c2e9660eecc7380cffe2
2016-12-29 14:30:40 +00:00
Hemant Gupta
e88fd4b594 Bluetooth: Add support for HID Device Role
This patch adds the HID Device Role support in Bluetooth framework.
Also AIDL and callback related files for HID Device role are added
to provide interface for third party applications to communicate with
HID Device Service.

Change-Id: Id03a362b7bcfa2e76056fa0197eaac12ce49b5a2
2016-12-29 14:29:53 +00:00
Ivan Podogov
fd770e1cb8 Merge "In permission review mode, always request user's consent to toggle BT."
am: 895e2d7a40  -s ours

Change-Id: Id2deabb5875b0ca13bb818a7c65893e01dc655e2
2016-12-29 11:03:21 +00:00
Ivan Podogov
895e2d7a40 Merge "In permission review mode, always request user's consent to toggle BT." 2016-12-29 10:18:11 +00:00
Martijn Coenen
010d0be575 Merge "Add (un)linkToDeath support to HwBinder."
am: 7705363166

Change-Id: I007b2fc2982d164176607cd8f2d0ccc9ebde982c
2016-12-29 09:04:49 +00:00