Bryce Lee
085796bdf5
Merge "DO NOT MERGE ANYWHERE" into cw-e-dev
2015-12-01 15:37:30 +00:00
Bryce Lee
52bdf11583
Merge "Add callback for connections to be notified when the ringer is silenced." into cw-e-dev
2015-11-30 18:51:39 +00:00
Erik Wolsheimer
2242b4d2bd
fix data race condition
...
BUG: 25819358
Change-Id: I9d9978c92d084e93ccb41ea1d0fe33ffe3e17e3d
2015-11-24 13:22:04 -08:00
Kevin Neas
4dbb586585
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
2015-11-24 00:50:18 +00:00
Geoff Mendal
b21b778567
Import translations. DO NOT MERGE
...
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
2015-11-23 14:26:59 +01:00
Adam Lesinski
6902052c77
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
...
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
2015-11-20 10:58:02 -08:00
Geoff Mendal
d0709c3a32
Import translations. DO NOT MERGE
...
am: bddde9b83d
2015-11-20 01:15:04 +00:00
Geoff Mendal
bddde9b83d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
2015-11-20 01:07:33 +00:00
Sreeram Ramachandran
6d983179a0
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801
...
am: 974f805500
2015-11-19 16:59:45 +00:00
Sreeram Ramachandran
974f805500
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205
...
am: b776891801
2015-11-19 16:50:11 +00:00
Sreeram Ramachandran
b776891801
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790
...
am: 33c1718205
2015-11-19 16:40:35 +00:00
Sreeram Ramachandran
33c1718205
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7
...
am: d3b6e2d790
2015-11-19 16:30:59 +00:00
Sreeram Ramachandran
d3b6e2d790
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd
...
am: 42faa221d7
2015-11-19 16:20:26 +00:00
Sreeram Ramachandran
42faa221d7
Don\'t use framework permission strings for netd permissions. am: f1f45fe012
...
am: 0b542630dd
2015-11-19 16:10:19 +00:00
Sreeram Ramachandran
0b542630dd
Don\'t use framework permission strings for netd permissions.
...
am: f1f45fe012
2015-11-19 15:59:42 +00:00
Sreeram Ramachandran
f1f45fe012
Don't use framework permission strings for netd permissions.
...
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a1204420f8f120839
2015-11-18 17:04:18 +00:00
Bryce Lee
cac50775b2
Add callback for connections to be notified when the ringer is silenced.
...
Bug: 25644529
Change-Id: Ie7dc9028cf6243d98b2d87ca4c8b3ffcd31e3676
2015-11-17 15:13:29 -08:00
Joe LaPenna
f2b9b2d85a
Revert "Don't dispatch when non-interactive and the display is off."
...
This reverts commit 2ccf0c8e63
2015-11-17 22:26:41 +00:00
Michael Wright
41ef58be3e
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506
...
am: 08ed2bc083
2015-11-17 20:59:42 +00:00
Michael Wright
08ed2bc083
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours
...
am: 18a2ac0506
2015-11-17 20:41:39 +00:00
Bryce Lee
dd976b1b0d
DO NOT MERGE ANYWHERE
...
Add ability to set supported audio routes on phone accounts and connection.
The set audio routes are used by Telecom to restrict where the audio may
be routed to. For example, an account can specify that calls may not be
routed over bluetooth headsets, which will prevent a new call from being
routed to this source.
Bug: 25485578
Change-Id: Ia1ca665e9ae8852a2538ab7cbeb3a73217d9b03b
2015-11-17 12:31:53 -08:00
Michael Wright
18a2ac0506
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405
...
am: bd23716585
2015-11-17 20:24:16 +00:00
Michael Wright
bd23716585
DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de
...
am: 614ea46405
2015-11-17 20:06:27 +00:00
Michael Wright
614ea46405
DO NOT MERGE. Prevent recents from coming up when in SUW
...
am: 84669ca8de
2015-11-17 19:52:13 +00:00
Michael Wright
c73255d8ab
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71
...
am: 313c7b2ee0
2015-11-17 18:49:32 +00:00
Michael Wright
313c7b2ee0
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
...
am: 4aa1e48a71
2015-11-17 18:40:21 +00:00
Michael Wright
4aa1e48a71
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
2015-11-17 18:33:38 +00:00
Bryce Lee
cb8749c903
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
2015-11-17 16:08:44 +00:00
Joe LaPenna
d083b37917
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
2015-11-17 02:42:22 +00:00
Joe LaPenna
f6ca46d301
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
...
This reverts commit 88c7c3e080
2015-11-17 02:42:10 +00:00
Sanket Padawe
63e6aa8571
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466
...
am: ccfcb636ae
2015-11-17 01:23:47 +00:00
Sanket Padawe
ccfcb636ae
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev
...
am: abea6dc466
2015-11-17 01:12:48 +00:00
Sanket Padawe
abea6dc466
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev
2015-11-17 01:07:28 +00:00
Michael Kwan
8d6630b87c
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
...
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.
The hack stops this behaviour, and also sets MTP mode back to none.
Bug: 25547826
Bug: 25582050
Bug: 25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
2015-11-16 14:05:29 -08:00
Eino-Ville Talvala
062c629e5c
Camera: Minor documentation update am: 0b6e1bfae8
...
am: 0691d16759
2015-11-16 20:16:45 +00:00
Eino-Ville Talvala
0691d16759
Camera: Minor documentation update
...
am: 0b6e1bfae8
2015-11-16 20:07:02 +00:00
Erik Wolsheimer
211abad3b9
Log errno when dup fd cannot be allocated
...
BUG: 25165471
Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
2015-11-16 10:29:20 -08:00
Bryce Lee
0db53d90a0
Add Bluetooth headset API to allow disabling audio route.
...
This functionality is required by devices which have multiple profiles
using the SCO channel. For example, a device that is both a HFP AG and HF.
In this case, we must explicitly notify the profiles when they can acquire
the channel as they are not aware of each other. A similar change was
previously added to the Bluetooth Headset Client profile.
Bug: 25485578
Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
2015-11-16 08:55:52 -08:00
Geoff Mendal
83d65fea01
Import translations. DO NOT MERGE
...
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
2015-11-16 14:18:40 +01:00
Eino-Ville Talvala
0b6e1bfae8
Camera: Minor documentation update
...
- Further clarify hardware.camera feature being only for the back camera
Bug: 24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
2015-11-13 15:25:45 -08:00
Michael Wright
333db2e122
DO NOT MERGE. Prevent recents from coming up when in SUW
...
Bug: 25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
2015-11-13 21:53:14 +00:00
Michael Wright
84669ca8de
DO NOT MERGE. Prevent recents from coming up when in SUW
...
Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
2015-11-13 21:52:18 +00:00
Winson Chung
28fc76ecef
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours am: d45a18c8ec
...
am: ef15ca85d7
2015-11-13 18:37:15 +00:00
Winson Chung
ef15ca85d7
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0 am: 32265b9ea0 -s ours
...
am: d45a18c8ec
2015-11-13 18:29:33 +00:00
Winson Chung
d45a18c8ec
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3 am: b133b984a0
...
am: 32265b9ea0
2015-11-13 18:21:55 +00:00
Winson Chung
32265b9ea0
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am: bb4da4efc3
...
am: b133b984a0
2015-11-13 18:15:30 +00:00
Winson Chung
1b29fd87a2
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am: dce0f8040d
...
am: 3e9f2b7894
2015-11-13 18:15:29 +00:00
Winson Chung
b133b984a0
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
...
am: bb4da4efc3
2015-11-13 18:08:38 +00:00
Winson Chung
3e9f2b7894
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
...
am: dce0f8040d
2015-11-13 18:08:35 +00:00
Winson Chung
dce0f8040d
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
2015-11-13 18:02:47 +00:00
