Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
202,126 Commits 3 Branches 0 Tags
d0709c3a329ce555d9d968bc1808fec5bcc1fb10
Commit Graph

202126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
d0709c3a32 Import translations. DO NOT MERGE 
am: bddde9b83d  -s ours

* commit 'bddde9b83db2bab9343cbe107d3672fea5314d4b':
  Import translations. DO NOT MERGE
 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

* commit '974f8055005a3d75e45cab89badd9ef183a75107':
  Don't use framework permission strings for netd permissions.
 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

* commit 'b7768918014d34c2e4d74abefeb03956aee421fc':
  Don't use framework permission strings for netd permissions.
 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

* commit '33c17182058ce0f9d0bae48467827ff52422cdd2':
  Don't use framework permission strings for netd permissions.
 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

* commit 'd3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
  Don't use framework permission strings for netd permissions.
 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

* commit '42faa221d7e8bc6db32698b3528e9c5898dbb943':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:20:26 +00:00
Sreeram Ramachandran
42faa221d7 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 
am: 0b542630dd

* commit '0b542630dd8b4d43f2e4f70563d3e44bb680455f':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:10:19 +00:00
Sreeram Ramachandran
0b542630dd Don\'t use framework permission strings for netd permissions. 
am: f1f45fe012

* commit 'f1f45fe012ddbd516e797099994c400a1cac8581':
  Don't use framework permission strings for netd permissions.
 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 a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 0f8f120839)
 2015-11-18 17:04:18 +00:00
Joe LaPenna
f2b9b2d85a Revert "Don't dispatch when non-interactive and the display is off." 
This reverts commit 2ccf0c8e63.

BUG: 22422588
BUG: 25067918

Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775
 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

* commit '08ed2bc083fe142ea6f89f97172543327f423e61':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 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

* commit '18a2ac0506ec834c2522de94040dab9e77304e7b':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:41:39 +00:00
Michael Wright
18a2ac0506 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 
am: bd23716585  -s ours

* commit 'bd23716585bd21b4dc4bf87bd56ce588c8d457df':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 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

* commit '614ea464051835e1c2267ef2bc343f98b62b177a':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:06:27 +00:00
Michael Wright
614ea46405 DO NOT MERGE. Prevent recents from coming up when in SUW 
am: 84669ca8de

* commit '84669ca8de55d38073a0dcb01074233b0a417541':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 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

* commit '313c7b2ee07ea74ac184294e4a6133a813bfcabf':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 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

* commit '4aa1e48a71df78fed20ac4105a2bd97ff04addf7':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 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.

Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG: 23753686
 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

* commit 'ccfcb636ae0c99b974f3cbe3177322c41e33bb15':
  Don't allow contact sharing by default for device not recognized as carkit.
 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

* commit 'abea6dc466cbd01be261192f8dbc083b58661bad':
  Don't allow contact sharing by default for device not recognized as carkit.
 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

* commit '0691d16759bf58a93209d4ab156e96f96fed7092':
  Camera: Minor documentation update
 2015-11-16 20:16:45 +00:00
Eino-Ville Talvala
0691d16759 Camera: Minor documentation update 
am: 0b6e1bfae8

* commit '0b6e1bfae848b7b177bba9c8119ad44cdc05684a':
  Camera: Minor documentation update
 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

* commit 'ef15ca85d7f847884e391e3283daabb019e44e10':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 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

* commit 'd45a18c8eca074f8c83a64ed465021a61becb49a':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 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  -s ours

* commit '32265b9ea000b04ac62f3c114edb063246260401':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 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

* commit 'b133b984a0644a78270d51007123e75ded24eb14':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 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

* commit '3e9f2b789414f34b5530107c362295c5a637bac1':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 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

* commit 'bb4da4efc320caee77f11bb316145b8e5f264e07':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 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

* commit 'dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
  DO NOT MERGE Ensure that the device is provisioned before showing Recents.
 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
Winson Chung
bb4da4efc3 Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev 2015-11-13 18:02:38 +00:00
Filip Gruszczynski
fe482e0bca Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev 2015-11-13 17:15:14 +00:00
Wale Ogunwale
4ff84631af Initialize DisplayContent base info when object is constructed 
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.

Bug: 22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
 2015-11-12 20:46:07 -08:00
Shreyas Basarge
d80d24f5b1 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b am: c9eb8b4367 
am: c4a9c319e5

* commit 'c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:41:55 +00:00
Shreyas Basarge
c4a9c319e5 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d am: 64bdb9f06b 
am: c9eb8b4367

* commit 'c9eb8b436715ba9b59382759cf0dcf991ed33594':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:35:51 +00:00
Shreyas Basarge
c9eb8b4367 Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e am: 359ee7f47d 
am: 64bdb9f06b

* commit '64bdb9f06b7fc3e497088243a966dec95d1936e1':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:29:47 +00:00
Shreyas Basarge
64bdb9f06b Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af am: 44368e6dd4 am: bf29f10c1e 
am: 359ee7f47d

* commit '359ee7f47de2eee82951abed294e4db44405973c':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:40 +00:00
Matthew Williams
ffffcf14c5 Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74 am: c455148edc am: af5c9f809c 
am: 69ee300c90

* commit '69ee300c90288fba6c3f81a37fd347892009e42e':
  Sync extras bundle comparison can throw NPE
 2015-11-13 02:23:37 +00:00