Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Stoza
031cfc8f3f Merge "Cast buffer width and height to int" 2014-11-25 18:33:34 +00:00
John Spurlock
661f2cf458 VolumeZen: Introduce internal vs external ringer mode. 
Stabilize mapping between ringer-mode=silent and zen=priority
by keeping track of two ringer modes:
 - Internal ringer mode: Used for underlying stream muting
 - External ringer mode: Reported to clients

The mapping between external ringer mode + zen is:
 - normal = all
 - vibrate = all
 - silent = priority (read-write) or none (read)

Changes include:
 - Remove "zen check" from audio service, back to audio
   service having no knowledge of zen.
 - Maintain a new external ringer mode in audio service,
   this is the ringer mode reported through AudioManager
   to callers, also mapped to the change intent.
 - Introduce a "ringer mode delegate" to the local
   audio manager interface, responsible for observing
   external / internal mode changes, and making changes
   if necessary.
 - Internal ringer mode changes are still interesting
   to the volume dialog, wire up a callback through
   the existing IVolumeController interface.
 - On devices without vibration, the mapping is the same
   but since no ringer mode change is possible, disable
   the icon toggle and remove the mute icon when volume=0.
 - On devices with vibration, volume down presses should
   pulse the vibrate icon (and vibrate) as a hint that this
   is as low as the device can go using the keys.  Since
   the mechanics are similar to the existing zen=none hint,
   pull into shared helper.
 - Log ringer mode changes to the zen log, include calling
   package information for issue diagnosis.
 - Include whether vibration is supported in the audio service
   dump.
 - Update the status bar icon policy to use the internal ringer
   mode, not the external mode (for vibrate icon).
 - Update the "Muted by <x>" logic, include current suppressor
   in dumpsys, ensure suppression icon is enabled & !clickable,
   regardless of zen mode.

Bug: 17884168
Bug: 15471679
Bug: 16824970
Change-Id: Ia7d3bb23ce6d1e37b24fb6521d1c1ab9bb8f60c0
 2014-11-25 13:20:46 -05:00
Jeff Sharkey
642b478635 am 278dfdf7: am 117c549b: am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 
* commit '278dfdf73142e72944478e50a3f02d3b5c6fd370':
  Ignore spammy package logs when dumping.
 2014-11-25 17:56:01 +00:00
Jeff Sharkey
db81f23e22 am 44952282: am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev 
* commit '44952282e8e170483eef30f18c74fa3995cad0c9':
  Move Documents action bar update even later.
 2014-11-25 17:55:56 +00:00
Alan Viverette
d8eb415d61 am 67c55be3: am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '67c55be39a76fb17cff79d926914a37fe56d452d':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:55:52 +00:00
Jean-Michel Trivi
17bee9ca7d am e19bb5c0: am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev 
* commit 'e19bb5c092309fad108e556e2e76ab13c0c17786':
  Add support for audio focus locking
 2014-11-25 17:55:48 +00:00
Jeff Davidson
633fffbff5 am 476d5a26: am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '476d5a265bae7c638d83fc59037a885065e344a4':
  Don't enforce control permission when preparing consented VPN.
 2014-11-25 17:55:43 +00:00
Jinsuk Kim
d7a7d6f68c am 4043fd8f: am c27f5baa: am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit '4043fd8fec7e7f507851715138d705a8fdfe9e90':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-25 17:55:39 +00:00
Geoff Mendal
77dad0e63b am 0f1fb55b: (-s ours) am 6a0ec6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '0f1fb55b8632542264ebb745618719f4f8bd8d44':
  Import translations. DO NOT MERGE
 2014-11-25 17:55:35 +00:00
Geoff Mendal
a2b2c60383 am 27192976: (-s ours) am db3b7b58: (-s ours) am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '271929761551a0b515194bcdb6364d1b12522b88':
  Import translations. DO NOT MERGE
 2014-11-25 17:55:30 +00:00
John Reck
b945f2313a Force-use the pbuffer surface for destroy 
Bug: 18518580

If CanvasContext is being destroyed() the Surface
is probably no longer valid as well, so make sure to
makeCurrent() to the pbuffer surface so that the
subsequent GL operations are not using an invalid
EGLSurface

Change-Id: Ica5d6a065841772c47e00ad65aa7894c7e27e043
 2014-11-25 09:54:13 -08:00
Jeff Sharkey
278dfdf731 am 117c549b: am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 
* commit '117c549b86979d891edfe1d810ac087609928386':
  Ignore spammy package logs when dumping.
 2014-11-25 17:50:12 +00:00
Jeff Sharkey
44952282e8 am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev 
* commit 'ce7a0e6cc7cd90cc5019f9b150a0295347f38406':
  Move Documents action bar update even later.
 2014-11-25 17:50:06 +00:00
Alan Viverette
67c55be39a am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '0d05788fd06b24068c269bfa80dd96deafb00357':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:49:53 +00:00
Jean-Michel Trivi
e19bb5c092 am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev 
* commit '213472d7384c9d8096748f3cd9305ef49342dbcf':
  Add support for audio focus locking
 2014-11-25 17:49:46 +00:00
Jeff Davidson
476d5a265b am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '6fdf2a1709c2006275d148e3156d249dcc27a99c':
  Don't enforce control permission when preparing consented VPN.
 2014-11-25 17:49:39 +00:00
Jinsuk Kim
4043fd8fec am c27f5baa: am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit 'c27f5baaeb39137b7cedc7c36feaaa1a67b1d3a3':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-25 17:49:34 +00:00
Geoff Mendal
0f1fb55b86 am 6a0ec6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6a0ec6e60616811bb19a25ce79c74361968642c4':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:28 +00:00
Jeff Sharkey
eb9d22bb3d am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit 'c02f304c3a1dc45a7e44b9f91b38c62353850d30':
  Introduce revision codes for split APKs.
 2014-11-25 17:49:24 +00:00
Sailesh Nepal
f671e85416 am 057df69e: am 8c2a8f64: am 0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev 
* commit '057df69e83ef7d53bcf6d6df96a0a460d231696e':
  Add system API to get registered connection managers
 2014-11-25 17:49:20 +00:00
Geoff Mendal
2719297615 am db3b7b58: (-s ours) am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'db3b7b5846d3a047d5a049fd1f931b8a87b46b68':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:14 +00:00
Jorim Jaggi
c204a065f9 am a6eaf8b3: am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit 'a6eaf8b38a21bda59ac202093a7dc926cd31f3a3':
  Fix quick settings on Keyguard
 2014-11-25 17:49:14 +00:00
Chris Wren
827b5537f1 am dd8de0a7: am fa5768ce: am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 
* commit 'dd8de0a7b668bce9193acae290e30e118ec98c69':
  LED should not be blocked by interruption filtering.
 2014-11-25 17:49:10 +00:00
smain@google.com
669131f9b8 am cde20158: am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit 'cde2015889a26926c72d72c6b15c46ed1c3b5ead':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-25 17:49:05 +00:00
John Spurlock
fc3fa08afc am 98c2090d: am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '98c2090de433a79d8b042652cfdccb1a03953176':
  QS: Update data usage over limit title.
 2014-11-25 17:49:01 +00:00
Paul Jensen
0add9b8195 am d5ffce76: am 080b02fc: am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev 
* commit 'd5ffce76fb16d181e3cf313255c336c4ce6ee591':
  Don't bother validating networks that don't satisfy the default request.
 2014-11-25 17:48:56 +00:00
Geoff Mendal
07e9545ca9 am 22af1458: (-s ours) am 5d50bf02: (-s ours) am 44b769d0: (-s ours) am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '22af14587e228d737890888952808880f8b51f05':
  Import translations. DO NOT MERGE
 2014-11-25 17:48:52 +00:00
Svet Ganov
6f206983b9 am f0de3a5c: am f34896bb: am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 
* commit 'f0de3a5ca35df8f94c1546bde60b6d89f2741b13':
  Print spooler crash when printing after a rotation.
 2014-11-25 17:48:47 +00:00
Amit Mahajan
1d9d52c180 am 0e6d836e: am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit '0e6d836efa56d49638d9a830258130cc4fc6f626':
  Set network selection to automatic when in Global mode
 2014-11-25 17:48:41 +00:00
John Reck
dbe2fef929 am b7d40df0: (-s ours) am c68728f5: am b059ff81: am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit 'b7d40df088b0dd83152361efc6d25fb32afc6234':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-25 17:48:36 +00:00
Dianne Hackborn
475615b583 am 14dd6ebf: am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit '14dd6ebff64af8d991680b7dda2286cd1d578c06':
  Final resource IDs.
 2014-11-25 17:48:30 +00:00
Dianne Hackborn
039777e792 am 9fafd0c7: am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '9fafd0c7111f0d0df431f6c0a4f4f5afcdea7b81':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:48:24 +00:00
Andres Morales
83f4847f7b am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit '59093d925decaf6ddf2e952de25e3cdd1b492d81':
  Define permission for system apps to query size of block
 2014-11-25 17:41:30 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
 2014-11-25 17:39:16 +00:00
Sailesh Nepal
057df69e83 am 8c2a8f64: am 0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev 
* commit '8c2a8f64b9c150b8e8422c5e97ca5d491b6fc93b':
  Add system API to get registered connection managers
 2014-11-25 17:38:32 +00:00
Jorim Jaggi
a6eaf8b38a am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
  Fix quick settings on Keyguard
 2014-11-25 17:38:26 +00:00
Chris Wren
dd8de0a7b6 am fa5768ce: am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 
* commit 'fa5768cef416d6379cd2a9e687695591add3f8b5':
  LED should not be blocked by interruption filtering.
 2014-11-25 17:38:21 +00:00
smain@google.com
cde2015889 am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit 'f00d46db377b97da673f8699928d8343b3bc132d':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-25 17:38:15 +00:00
John Spurlock
98c2090de4 am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '98a20f68e0f31c43d090b16e3802c67226dbd055':
  QS: Update data usage over limit title.
 2014-11-25 17:38:02 +00:00
Paul Jensen
d5ffce76fb am 080b02fc: am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev 
* commit '080b02fc6c4531646d29ff4039080f2ac6d5f31a':
  Don't bother validating networks that don't satisfy the default request.
 2014-11-25 17:37:54 +00:00
Geoff Mendal
22af14587e am 5d50bf02: (-s ours) am 44b769d0: (-s ours) am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5d50bf02a6f34afd493e4d38f784790e08f6bd7e':
  Import translations. DO NOT MERGE
 2014-11-25 17:37:49 +00:00
Svet Ganov
f0de3a5ca3 am f34896bb: am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 
* commit 'f34896bbeb49aef3509e55ccf9afc7b62ae4dafd':
  Print spooler crash when printing after a rotation.
 2014-11-25 17:37:42 +00:00
Amit Mahajan
0e6d836efa am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit 'ed7ccb45c0ffe5de22af68904ddba4f515eb3f10':
  Set network selection to automatic when in Global mode
 2014-11-25 17:37:37 +00:00
John Reck
b7d40df088 am c68728f5: am b059ff81: am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit 'c68728f5e97b0f354c00710f2359207d14ef784c':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-25 17:37:31 +00:00
Dianne Hackborn
14dd6ebff6 am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit 'd65cb22872b5dbfb5937d66191b60be22b63fd21':
  Final resource IDs.
 2014-11-25 17:36:58 +00:00
Dianne Hackborn
9fafd0c711 am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '608439df383b40dc0f808e4992b369debaff29cd':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:36:52 +00:00
Andres Morales
59093d925d Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 2014-11-25 17:35:21 +00:00
Ignacio Solla
ea1d90f5da [WebView] Allow the WebView to be compiled against the system SDK. 
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
 2014-11-25 17:03:49 +00:00
Bo Liu
3813430367 am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 
* commit '84be180e97f920a9400789368a6bc54c5a9b90d8':
  Fix crash in getNativeCanvas when canvasHandle is NULL
 2014-11-25 16:59:27 +00:00
Bo Liu
84be180e97 Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev 2014-11-25 16:56:07 +00:00