21030 Commits

Author SHA1 Message Date
RoboErik
3ef3a9bff3 am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev
* commit 'ac4af18bbb077a89696260e595fc130d9c172f79':
  Handle volume events on master volume devices correctly
2014-11-20 18:04:59 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
Wonsik Kim
b429c01558 am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev
* commit '59d3669512b4fdff262ec6fe2760c9ae967eca95':
  TIF: set audio gain properly
2014-11-20 07:07:51 +00:00
Wonsik Kim
59d3669512 Merge "TIF: set audio gain properly" into lmp-mr1-dev 2014-11-20 07:04:25 +00:00
Wale Ogunwale
005080e5f8 am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev
* commit '70273e05b26f671dcec9ff1aa4bafabb5e407895':
  Stop activity onVisibleBehindCanceled()
2014-11-20 01:49:37 +00:00
Wale Ogunwale
70273e05b2 Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 2014-11-20 01:46:28 +00:00
Wonsik Kim
71dfa96f53 TIF: set audio gain properly
Bug: 18392706
Change-Id: I56c21c156a54e7d6dcf787f6b3ab4b901843b922
2014-11-20 09:54:36 +09:00
Wale Ogunwale
1f4c02bb18 Stop activity onVisibleBehindCanceled()
Once an activity is no longer visible behind and has released
its background resources, it is added to the list of activities
that can be stopped, but not actually stopped until the next
major event (like another activity starting). We now schedule
the idle processing once the background resources have been
released so the activity can be stopped as soon as possible.

Bug: 18191707
Change-Id: I472eee949c1a78b4d944454463f03c90e7d2618b
2014-11-19 16:25:51 -08:00
Andres Morales
29db396ea9 am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev
* commit '6722598ef3d23f75d244399536b2302b30388c51':
  Add a checksum to FRP partition
2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
Jinsuk Kim
0beb76e108 am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev
* commit '9899b663f4c512e4a9acaa5508f0fd86bed6e476':
  CEC: Use thread-safe version for avr info
2014-11-19 00:31:59 +00:00
Jinsuk Kim
9899b663f4 Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 2014-11-19 00:25:43 +00:00
Jeff Sharkey
c5efb2b92a am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev
* commit 'd6447bbc88b8c1c238dd8e5bfb4b0daf6d2266cb':
  Speed up GrantUri.hashCode().
2014-11-19 00:14:51 +00:00
Jinsuk Kim
86a1e5a16e CEC: Use thread-safe version for avr info
getSystemAudioMode() should have used the thread-safe method
to get the information of the connected AVR.

Bug: 18426137

Change-Id: Ib3edff97337b5960160dd39d551fbfbbfdfce93b
2014-11-19 09:12:21 +09:00
Jeff Sharkey
d6447bbc88 Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 2014-11-19 00:09:51 +00:00
Christopher Tate
f066bf229c am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev
* commit '04eb368d0381b0f94365b4e270afb610fe3564c2':
  Prevent some alarm pathologies
2014-11-19 00:09:50 +00:00
Rubin Xu
40603baa3e am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
2014-11-19 00:09: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
Christopher Tate
04eb368d03 Merge "Prevent some alarm pathologies" into lmp-mr1-dev 2014-11-18 23:49:54 +00:00
Rubin Xu
735f22850e Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 2014-11-18 23:43:17 +00:00
Rubin Xu
3a7d3fc60e Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 2014-11-18 23:42:21 +00:00
Andres Morales
2830130770 Add a checksum to FRP partition
It will be hard to mandate the contents
of the FRP partition out of factory. Further, for upgrading
units, it would require that OEMs format the partition and then store
a bit saying that they've done so. This adds another attack vector.
Now defeating FRP means either compromising the FRP partition
OR wherever the OEMs decide to store that bit.

This patch adds a checksum to the FRP partition. If the checksum
is not valid, the partition is wiped - disabling OEM unlock.

This ensures that no matter what data comes on the partition, we will 
always disable OEM unlock by default. It also allows OEMs to not have to
worry about initializing the partition, as it happens automatically. 

Bug: 18322021
Change-Id: Ib30782baa771591c30ea95054d3b83f36fc08cc2
2014-11-18 22:52:58 +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
Jeff Sharkey
3597b55d12 Speed up GrantUri.hashCode().
It's used as a key for all outstanding permission grants, so let's
keep it fast.

Bug: 18381401
Change-Id: I4db8dba13302b98f33aacfa3e9acd9a394541cd0
2014-11-18 14:04:18 -08: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
Christopher Tate
498c6cbd78 Prevent some alarm pathologies
* Sanity-check the recurrence interval.  Some buggy apps pass seconds
  where the API expects milliseconds, with the result that the device
  pins the CPU at 100% trying to deliver alarm broadcasts every 60 ms
  or what have you.  The minimum recurrence is now 1 minute.

* Sanity-check alarms being scheduled for the immediate future.  As
  with the above this will catch people trying to schedule alarms
  in a spammy way that keeps the device from entering low-power state.
  The minimum futurity of a new alarm is now 5 seconds.

Bug 17495168

Change-Id: If8ff7d88da48960532ac21a0ba20094af9912603
2014-11-18 12:00:58 -08:00
Marco Nelissen
1c066306c6 Use stream type if set by user
Bug: 18426086
Change-Id: I0df390ddb850f8e2a02e24296f2a0d39f5718839
2014-11-18 11:28:28 -08:00
RoboErik
519c7744b5 Handle volume events on master volume devices correctly
We weren't passing volume events to the master volume correctly on
devices that only use a master volume. This fix checks if the device
only has a master volume and adjusts the master volume instead of the
stream's volume if that's the case.

bug:18305790
Change-Id: Iec35e0a7dc59e6d73c9dfc88da324660bb15b1f3
2014-11-18 11:00:34 -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
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
Rubin Xu
a97855b784 Remove permission check in DevicePolicyManager.isUninstallBlocked()
This is to allow Play to use this API to find out whether a package
is uninstallable due to profile or device owner policy's restriction.

Bug: 17914630
Change-Id: I4ce2963884ecdf3306805f36db80ed1ebf04d88f
2014-11-18 17:53:46 +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
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
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
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
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