278941 Commits

Author SHA1 Message Date
Nick Kralevich
7099984f4c Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4
am: 4400fb5bed

Change-Id: I2d0f491b2f5f814aa92749a2f5d1130393cd1a83
2017-01-01 22:51:23 +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
72d9008700 Fix profiles broken by ag/1751147
am: 5297dba712

Change-Id: I9c0a4ead26f60b601847c1ba73e6b492a3611880
2016-12-30 23:07:32 +00:00
Ivan Podogov
5297dba712 Fix profiles broken by ag/1751147
Change-Id: Ifa92819df8e63355a3979ea0f1a20a0363b6cd45
2016-12-30 22:22:38 +00:00
Marie Janssen
07e590a574 resolve merge conflicts of c816141 to nyc-mr1-dev-plus-aosp
Change-Id: I42e00b90165220d88519771b8f4280aaf3a07525
2016-12-29 14:05:47 -08: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
e11c3f6657 Merge changes from topic 'HID-Client' am: 8a74d0440c
am: 59d63e8b1d

Change-Id: I73dc7aa098c0a4cb4c58371088c2aa0661ecdc41
2016-12-29 19:47:47 +00:00
Ivan Podogov
91ab2e2f98 Rename the Bluetooth profile classes for HID Device role. am: 0afe190af5
am: 94e3d3f499

Change-Id: I97ff93fd2564bd76d90095f8086f79c6c6086aff
2016-12-29 19:46:55 +00:00
Hemant Gupta
1ee22b7f70 Bluetooth: Add support for HID Device Role am: e88fd4b594
am: ee469c6fe9

Change-Id: Ic48911d254671d402f5a6b8198109f28e6497036
2016-12-29 19:46:08 +00: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
Charles He
2c29250b44 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814 am: 596e3a9d1a
am: 821fdbd3ff

Change-Id: Ic735b56728a9e8f8df25c22ed33135890e8b6f08
2016-12-29 11:20:39 +00:00
Charles He
0881d980ad Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2 am: b75b025578
am: 3ad5df5231

Change-Id: I4223d7df9ecdf7c39401fcaa9e7ec5b2ed3253a4
2016-12-29 11:19:27 +00:00
Charles He
ccf6c25b3c Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4 am: 835c1bcedb
am: b5f3383589

Change-Id: Id728f54d83459d4a583a4b639529308667fd7f8e
2016-12-29 11:18:16 +00:00
Charles He
22faa73586 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad am: 9bc2d6b446
am: 08ea823955

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

Change-Id: Icef54e7756a1b9b63f909ea8011a2625df38df99
2016-12-29 11:10:29 +00:00
Charles He
821fdbd3ff Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04 am: b07ddf3814
am: 596e3a9d1a

Change-Id: If8e61075126f4b8a5ccf5a29e2bd74fec222f2f6
2016-12-29 11:06:56 +00:00
Charles He
3ad5df5231 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc am: e426dac4e2
am: b75b025578

Change-Id: Iff7b172dafedff0dcca720c4e7ca1c16e8c6a35c
2016-12-29 11:05:43 +00:00
Charles He
b5f3383589 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216 am: c189f23dd4
am: 835c1bcedb

Change-Id: Ia49ac04fb87b215fc52b0dd40d917f2aab045745
2016-12-29 11:04:37 +00:00
Charles He
08ea823955 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f am: dd7837c5ad
am: 9bc2d6b446

Change-Id: I7e5794885bf78dfd1d755a7fdb0b1edf66b9fdee
2016-12-29 11:03:26 +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
Charles He
596e3a9d1a Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf am: 0e2e913b04
am: b07ddf3814

Change-Id: I5fc69e1d8e02e405ae9ca8362a5c1f6312b4f53e
2016-12-29 10:58:44 +00:00
Charles He
b75b025578 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c am: 3cc7f6acdc
am: e426dac4e2

Change-Id: I6451344efe089a7ff5de2082a9b8b77661c49ab7
2016-12-29 10:57:41 +00:00
Charles He
835c1bcedb Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15 am: 03fa83e216
am: c189f23dd4

Change-Id: I8426e0788ce1dcb12daac23e82663284633cae5b
2016-12-29 10:56:32 +00:00
Charles He
9bc2d6b446 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0 am: 8bcdab7e6f
am: dd7837c5ad

Change-Id: I2124f52b38314199950d1448cddd2bbd328c85ce
2016-12-29 10:55:23 +00:00
Charles He
b07ddf3814 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb am: 1d84f619bf
am: 0e2e913b04

Change-Id: I02047ef2536a6a77df84e1b203d3b5ee55439e32
2016-12-29 10:44:41 +00:00
Charles He
e426dac4e2 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089 am: ced5ab190c
am: 3cc7f6acdc

Change-Id: I98e65fcf8180e5187a92e8d5b888eb794f89ab6d
2016-12-29 10:43:40 +00:00
Charles He
c189f23dd4 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5 am: 6bb6f02a15
am: 03fa83e216

Change-Id: I8f10fcf6b604848f68ecc086dd3723841e07ef8c
2016-12-29 10:42:32 +00:00
Charles He
dd7837c5ad Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9 am: 9a47fa7fc0
am: 8bcdab7e6f

Change-Id: I6e41bfad4ce66ca80bca636a5fb4ddc85b71e83a
2016-12-29 10:41:25 +00:00
Charles He
0e2e913b04 Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b am: 5c74a1e9bb
am: 1d84f619bf

Change-Id: Ic189edc98c3079ca98b258d08a5821b9c97dc027
2016-12-29 10:37:45 +00:00
Charles He
3cc7f6acdc Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8 am: 0cc0219089
am: ced5ab190c

Change-Id: I59602f83fd659ce5192636d0e66feae217997d7c
2016-12-29 10:36:32 +00:00
Charles He
03fa83e216 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd am: e15e0de7e5
am: 6bb6f02a15

Change-Id: I849811a3be2c6989edea3ed6f938b4b36a4fabe7
2016-12-29 10:35:19 +00:00
Charles He
8bcdab7e6f Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882 am: e5156ec1e9
am: 9a47fa7fc0

Change-Id: Ifb9f5b177f7c031352e6e9cf308e6295f7c60074
2016-12-29 10:34:04 +00:00
Charles He
1d84f619bf Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad am: f027831c6b
am: 5c74a1e9bb

Change-Id: Ie15d3c1927f17a36ed6d6bbe4b96c986536be3c7
2016-12-29 10:28:57 +00:00
Charles He
ced5ab190c Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2 am: 76ca2da7e8
am: 0cc0219089

Change-Id: Id72d64d9356e362f35062bc6e45071b2be308558
2016-12-29 10:27:52 +00:00
Charles He
6bb6f02a15 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7 am: b64af9bacd
am: e15e0de7e5

Change-Id: I12af619f1fce710f643387dca3e06c1c4b5258d3
2016-12-29 10:26:51 +00:00
Charles He
9a47fa7fc0 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611 am: 00a581f882
am: e5156ec1e9

Change-Id: I62b79fe7ef5a2febce27729f4709a599832cb3da
2016-12-29 10:25:50 +00:00
Charles He
5c74a1e9bb Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d am: a1d59972ad
am: f027831c6b

Change-Id: I49d10d41d5b89c97a2f418ccaed44eeae720bb22
2016-12-29 10:21:47 +00:00
Charles He
0cc0219089 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. am: 71d2a41dd9 am: d0339c6e8f am: 6aa436bef2
am: 76ca2da7e8

Change-Id: I9e20b2954ccb462cee31cb5ea44986c00afadbff
2016-12-29 10:20:47 +00:00
Charles He
e15e0de7e5 Merge "Prevent writing to FRP partition during factory reset." into lmp-mr1-dev am: 4bd97eb888 am: a8484b4f92 am: d7f2a4b0c7
am: b64af9bacd

Change-Id: I261c46544e8e1aef26772d57475037810198e4d9
2016-12-29 10:19:49 +00:00
Charles He
e5156ec1e9 Prevent writing to FRP partition during factory reset. am: a9437bd1ca am: 2ce5c4320d am: 133ff4d611
am: 00a581f882

Change-Id: I016955744e48d7a91380c2ff39f7c64536a39c7e
2016-12-29 10:18:49 +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
Charles He
f027831c6b Merge "Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable." into lmp-mr1-dev am: 63a27d773b am: 1422a6074d
am: a1d59972ad

Change-Id: I027ab6594b563204515677fca9c256251b7067cd
2016-12-29 10:14:26 +00:00