drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,536 Commits 1 Branch 0 Tags
Commit Graph

22203 Commits

Author SHA1 Message Date
Rubin Xu
f978e667a6 am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '0122db0a6397f5bd08042e1a5919114e3cccb9f4':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:19:43 +00:00
Rubin Xu
0122db0a63 am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '3a7d3fc60e1347ff9bdddb8040237e2818d67a0e':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:09:38 +00:00
Rubin Xu
3a7d3fc60e Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 2014-11-18 23:42:21 +00:00
Marco Nelissen
7f8040a804 am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev 
* commit '0acbed256eaadd3e704942405d130729d3366534':
  Use stream type if set by user
 2014-11-18 22:30:03 +00:00
Marco Nelissen
0acbed256e am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev 
* commit '6104fb2862e591fcd62660f5cd11ab5ca48adebb':
  Use stream type if set by user
 2014-11-18 22:25:12 +00:00
Marco Nelissen
6104fb2862 Merge "Use stream type if set by user" into lmp-mr1-dev 2014-11-18 22:20:05 +00:00
Alan Viverette
098f36c302 am a4733b68: am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev 
* commit 'a4733b68c4ccc19794e9eadcad4e1ec6691c5be2':
  Don't ignore accessibility overlays during visibility computation
 2014-11-18 21:56:11 +00:00
Alan Viverette
a4733b68c4 am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev 
* commit 'fb11949d5bb810b39e34ec707fcddde345c474cd':
  Don't ignore accessibility overlays during visibility computation
 2014-11-18 21:51:31 +00:00
Marco Nelissen
1c066306c6 Use stream type if set by user 
Bug: 18426086
Change-Id: I0df390ddb850f8e2a02e24296f2a0d39f5718839
 2014-11-18 11:28:28 -08:00
Alan Viverette
d0c73f49b7 Don't ignore accessibility overlays during visibility computation 
Just don't use then to compute unaccounted space. This is a partial
revert of commit 9538eea5ff6f8e2183ced81b5b8eac60b0e774ea.

Change-Id: Ie2e29c8934da8ef707d20db1333abd4e240cd213
 2014-11-18 10:25:04 -08:00
Jae Seo
723b3dd579 am 1d96b28d: am f0a8c3e6: Merge "TIF: fix NPE for TvInputHardwareManager" into lmp-mr1-dev 
* commit '1d96b28d1d8d6882c30604721b81ac5dab1323d6':
  TIF: fix NPE for TvInputHardwareManager
 2014-11-18 18:22:15 +00:00
Jae Seo
1d96b28d1d am f0a8c3e6: Merge "TIF: fix NPE for TvInputHardwareManager" into lmp-mr1-dev 
* commit 'f0a8c3e6743de4ec491d717961d60fcf9bc3115b':
  TIF: fix NPE for TvInputHardwareManager
 2014-11-18 18:06:19 +00:00
Wonsik Kim
b683e6e4c7 TIF: fix NPE for TvInputHardwareManager 
Bug: 18365836
Change-Id: I270fac7c73ad8e7225b523a8ec517157310509dc
 2014-11-18 12:00:54 +09:00
Lorenzo Colitti
fda8740722 am ff01f81f: am e9f7e65c: Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev 
* commit 'ff01f81f1e845fb1aa48405be3e89760bd7ac962':
  Populate 464xlat LinkProperties only when the interface comes up.
 2014-11-18 02:08:22 +00:00
xinhe
5f1188c3f6 am b596bffd: am a8e6d6fd: Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 
* commit 'b596bffdaa7a9abf9110ca0d1ea90bdfca47c956':
  air plane mode only send to the owner through the quick setting
 2014-11-18 02:06:12 +00:00
Jeff Davidson
704b7521b1 am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '0e7848748256f4b5709a4c94882e20d96a86ae8e':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-18 02:05:29 +00:00
Jeff Davidson
b431a198ec am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'e6bc5adf2d4639b63001a5889ad301bae47bcd7f':
  Enforce VPN control "permission" with an actual permission.
 2014-11-18 02:05:21 +00:00
Lorenzo Colitti
ff01f81f1e am e9f7e65c: Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev 
* commit 'e9f7e65c4090d7ea97bc065f6fefd58c2fcebd47':
  Populate 464xlat LinkProperties only when the interface comes up.
 2014-11-18 00:30:10 +00:00
Lorenzo Colitti
e9f7e65c40 Merge "Populate 464xlat LinkProperties only when the interface comes up." into lmp-mr1-dev 2014-11-18 00:25:53 +00:00
xinhe
b596bffdaa am a8e6d6fd: Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 
* commit 'a8e6d6fd993c449b442be8c19f6c2688b75c018d':
  air plane mode only send to the owner through the quick setting
 2014-11-17 22:59:20 +00:00
Jeff Davidson
0e78487482 am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. 
* commit '9a1da68bf7980449a5ee5d6fa9d9686b04d667ff':
  Expose a SystemApi method to prepare a VPN without consent.
 2014-11-17 22:58:12 +00:00
Jeff Davidson
e6bc5adf2d am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 
* commit 'e0cb56b02eb2bb52a537b32c5d3f5360b9718c8a':
  Enforce VPN control "permission" with an actual permission.
 2014-11-17 22:58:05 +00:00
xinhe
a8e6d6fd99 Merge "air plane mode only send to the owner through the quick setting" into lmp-mr1-dev 2014-11-17 22:18:11 +00:00
Jeff Davidson
9a1da68bf7 Expose a SystemApi method to prepare a VPN without consent. 
This is NOT designed to be called normally. Most apps (even
system-privileged ones) should request user consent before launching a
VPN. However, it is needed to support flows where consent can be
obtained through other means external to the VPN flow itself.

The API requires a system-privileged permission, CONTROL_VPN.

Bug: 18327583
Change-Id: I1bcdcf0fb5707faeb861ec4535e7ccffea369ae7
 2014-11-17 21:03:10 +00:00
Jeff Davidson
e0cb56b02e Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev 2014-11-17 21:02:10 +00:00
Wale Ogunwale
b723931b88 am 58cdb919: am 465e9967: Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 
* commit '58cdb919d1e7d6aa6fd066c22a457388c23982b0':
  Consolidated processing of package boardcasts in AM service.
 2014-11-17 19:53:40 +00:00
Jorim Jaggi
77979f23bd am 477226bb: am da5a2863: Merge "Always set correct policy visibility" into lmp-mr1-dev 
* commit '477226bb63fa357b26a71abd3e9209659efdb337':
  Always set correct policy visibility
 2014-11-17 19:53:22 +00:00
xinhe
98e25fc377 air plane mode only send to the owner through the quick setting 
It should send to all the uesers as it behaves in setting

Bug:18353278
Change-Id: Ib46a97e30bfba73dd78fab0c8139d6ccb7ad210f
 2014-11-17 11:35:01 -08:00
Dianne Hackborn
8a297f6d76 am 0a3e11fe: am 76919595: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 
* commit '0a3e11fe428b2d49cecaaf1199ceed36245c1d6f':
  Issue #17551667: Voice interaction service should be disabled...
 2014-11-17 19:31:59 +00:00
Wale Ogunwale
58cdb919d1 am 465e9967: Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 
* commit '465e996776d916d8d1b62c539142827bd96a42bc':
  Consolidated processing of package boardcasts in AM service.
 2014-11-17 19:30:16 +00:00
Wale Ogunwale
465e996776 Merge "Consolidated processing of package boardcasts in AM service." into lmp-mr1-dev 2014-11-17 19:27:08 +00:00
Jorim Jaggi
477226bb63 am da5a2863: Merge "Always set correct policy visibility" into lmp-mr1-dev 
* commit 'da5a28635af883c330fe57e98e78eff127706ed4':
  Always set correct policy visibility
 2014-11-17 19:25:40 +00:00
Jorim Jaggi
da5a28635a Merge "Always set correct policy visibility" into lmp-mr1-dev 2014-11-17 19:20:13 +00:00
Dianne Hackborn
0a3e11fe42 am 76919595: Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 
* commit '76919595f4dd3b61f132422372ce4350584a1d42':
  Issue #17551667: Voice interaction service should be disabled...
 2014-11-17 18:42:30 +00:00
Dianne Hackborn
76919595f4 Merge "Issue #17551667: Voice interaction service should be disabled..." into lmp-mr1-dev 2014-11-17 18:33:10 +00:00
Jorim Jaggi
235607589c Always set correct policy visibility 
Windows without a surface didn't get the correct policy visibility
applied after dismissing lockscreen. Thus, when launching something
from lockscreen, home activity was hidden but never set to visible
again. Before executing the transition to home, we didn't consider
home as a wallpaper target because it was still invisible, and thus
we picked the wrong transition.

Always applying policy visibility when lockscreen changes fixes this
outdated state.

Bug: 18369599
Change-Id: I2933eaf0ab55fe31cb382c46c411033e33a756e0
 2014-11-17 19:15:22 +01:00
Jeff Sharkey
9f72206848 am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* commit 'ecfd372ae4fc69c10de83c6499c0c0e4379debc8':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:39:16 +00:00
Jeff Sharkey
ecfd372ae4 am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* commit '9c76a7b3e85ce7056071ac8627c8d675cc5c1599':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:32:31 +00:00
Jeff Sharkey
9c76a7b3e8 Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* changes:
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:28:54 +00:00
Prashant Malani
673d86591f am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev 
automerge: 9d2a478

* commit '9d2a47857899845d2e00f4a968a0916deeb1fb2e':
  Don't animate screen brightness if there is a pending off transition
 2014-11-15 10:13:23 +00:00
Prashant Malani
9d2a478578 am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev 
* commit '4d269ba32037485bfa5ffba4dd23f796cbf10c43':
  Don't animate screen brightness if there is a pending off transition
 2014-11-15 10:04:00 +00:00
Prashant Malani
4d269ba320 am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev 
* commit 'fb26a2c80b988118983251caf36492f2ae39559c':
  Don't animate screen brightness if there is a pending off transition
 2014-11-15 09:56:57 +00:00
Prashant Malani
fb26a2c80b Merge "Don't animate screen brightness if there is a pending off transition" into lmp-sprout-dev 2014-11-15 09:46:33 +00:00
Chong Zhang
fcab74b3ce am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev 
automerge: 82e9db4

* commit '82e9db49724ae62f7a0adf284c6bc3ae620741c5':
  implement HDMI-like demo mode for remote display
 2014-11-15 02:49:37 +00:00
Chong Zhang
82e9db4972 am 1c814b5c: Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev 
* commit '1c814b5c61c538c7ef5176b1121e1ea0c65046e6':
  implement HDMI-like demo mode for remote display
 2014-11-15 02:32:34 +00:00
Chong Zhang
1c814b5c61 Merge "implement HDMI-like demo mode for remote display" into lmp-mr1-dev 2014-11-15 02:25:33 +00:00
Winson Chung
46695cf934 am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev 
automerge: 0d539c2

* commit '0d539c295613442a7926a2c3505a2834ab2b086c':
  Fixing regression in screen pinning button visibility. (Bug 18390050)
 2014-11-15 01:20:17 +00:00
Chong Zhang
ae6119ffce implement HDMI-like demo mode for remote display 
adding the following two system properties to control remote
display rotation and device orientation lock:

"persist.demo.rotationlock"=true|false
"persist.demo.remoterotation"=landscape|portrait

Bug: 18317603
Change-Id: Id5fe115f895c6a0e72563036b9a98ff3b5037763
 2014-11-14 16:39:15 -08:00
Jeff Sharkey
6eb093909c Prevent user ID reuse until after reboot. 
We're still seeing rare cases where a device struggles to create a
new user, probably because of a subtle bug in the FUSE daemon.  To
work around this, only allow user IDs reuse after reboot.

Bug: 8302014
Change-Id: Id7f9fb539c6d6d1ff3d47d941af1d9e6b93eca03
 2014-11-14 15:58:01 -08:00
Winson Chung
0d539c2956 am 1c903b4e: Merge "Fixing regression in screen pinning button visibility. (Bug 18390050)" into lmp-mr1-dev 
* commit '1c903b4e110a60da115acf6f94cdc50fd9e6cd62':
  Fixing regression in screen pinning button visibility. (Bug 18390050)
 2014-11-14 23:34:07 +00:00