88312 Commits

Author SHA1 Message Date
Bryan Mawhinney
2bb7c122ef Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)
Change-Id: Id8fa45aefde85e2ba2b57694b91485ef25e2e5f2
2012-10-24 13:59:33 +01:00
Dave Burke
da2f2e51c7 am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
* commit '799916e6ac706921e43a3382e5d9e06e13f87525':
  Revert "Check non-primary user dirs during package scan"
2012-10-23 23:17:23 -07:00
Dave Burke
799916e6ac Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev 2012-10-23 23:14:15 -07:00
Dave Burke
383fa18b51 Revert "Check non-primary user dirs during package scan"
This reverts commit 4525f5b69cb44a9a0c92f9c525fc47541f456621

Change-Id: I31b7a0860972532478ab3420556b806bfa78739a
2012-10-23 23:12:19 -07:00
Eric Laurent
9e76f415e6 am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev
* commit 'f52cbb6b1800fc2b338e8c0883170567fcd0447a':
  AudioService: add fix for corrupted settings
2012-10-23 21:21:39 -07:00
Eric Laurent
f52cbb6b18 Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev 2012-10-23 21:18:28 -07:00
Kenny Root
a392de7458 am 92bc9b31: PMS: check outInfo for null during delete
* commit '92bc9b3196907a76d4b73c3f361d41c14dfd7f5c':
  PMS: check outInfo for null during delete
2012-10-23 21:05:12 -07:00
Jeff Brown
f0681b34df Secure windows, secure surface views and secure displays.
Add new API to determine whether a display is secure.
Add new API to make a SurfaceView secure.
Clarify documentation.

Bug: 7368436
Change-Id: I7068c34c910e43b4bc72e43fa0dded59a25f0fe2
2012-10-23 20:37:40 -07:00
Eric Laurent
d799db406b AudioService: add fix for corrupted settings
Added correction of MODE_RINGER_STREAMS_AFFECTED setting in
case it is inconsistent when read from the database: ringtone,
notification and system streams are always affected by ringer mode.
A corruption of this setting persists accross reboots and propagates via
backup/restore causing devices to play notification and ringtones in silent mode.

Bug 7384750.

Change-Id: I23170413d01e6a8e34ef514f1516d7b9ab8bc656
2012-10-23 20:14:27 -07:00
Romain Guy
bd17bd3431 Ensure we have a GL context before deleting View layers
Bug #7391098

The existing code was doing a make current to guarantee we have a
current context. This can however fail when the surface is destroyed
which could lead to GL calls without an EGL context, and therefore
potential leaks. This change fixes the issue by using a technique
found in HardwareRenderer.destroyHardwareResources(). If the surface
is not available then we use a special 1x1 pbuffer as a way to get
a valid context.

Change-Id: I716d3799bf90120d793d76e90a83956837ecd491
2012-10-23 19:17:15 -07:00
Dianne Hackborn
9622ca4f88 Fix issue #7401818: Wrong transition animation when clearing task
When we are clearing activities off the top of a task, propagate
any activity options down from the top-most one to whatever top
activity we are keeping.  This ensures that if we set the activity
options on the top activity of the task previously to give it the
correct animation, we still keep that animation for the activity
that really ends up being the top.

Change-Id: I6919b644a530ac283fe4d320496edc2bf72aa04e
2012-10-23 18:56:33 -07:00
Kenny Root
92bc9b3196 PMS: check outInfo for null during delete
It appears that changing an application's signature during boot can pass
an outInfo of null to this function.

Bug: 7402550
Change-Id: I839fea6c8ee728a352c6b906f0fa6671c85f8694
2012-10-23 17:44:26 -07:00
Dianne Hackborn
d4337ae09b am 56e75631: Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev
* commit '56e75631bd737e5362309330d4839cc1dddb501c':
  Fix issue #7342364: JellyBean broke Toddler Lock, again
2012-10-23 17:38:54 -07:00
Svetoslav Ganov
444fc17f4b am e1655c98: Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev
* commit 'e1655c980d28b953597727d2c7832b442ca926cc':
  When A11y is on, use a longer interval between lockout announcements.
2012-10-23 17:38:41 -07:00
Dianne Hackborn
56e75631bd Merge "Fix issue #7342364: JellyBean broke Toddler Lock, again" into jb-mr1-dev 2012-10-23 17:35:59 -07:00
Svetoslav Ganov
e1655c980d Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev 2012-10-23 17:35:24 -07:00
Zhihai Xu
fa0fd39a4b License of files Bluetooth package is not updated to ASL2
bug 7385618

Change-Id: I6232f537f4fda979d3aabe3a059c11d3299de9b8
2012-10-23 17:31:56 -07:00
alanv
c2798a916e When A11y is on, use a longer interval between lockout announcements.
Bug: 7384471
Change-Id: I72ac1fe7646588c9c7185cb0186f1e990b3a2f72
2012-10-23 17:26:17 -07:00
Kenny Root
f461d3f69f am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
* commit 'da2509c434ebb2a5a0da1bc270cae7f007cbb0f9':
  Check non-primary user dirs during package scan
2012-10-23 17:06:24 -07:00
Kenny Root
da2509c434 Merge "Check non-primary user dirs during package scan" into jb-mr1-dev 2012-10-23 17:03:09 -07:00
Craig Mautner
9e96c69e3e am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev
* commit '6757572b39d3802c4d7b69467b5ebf69a96c208b':
  Add throwing InvalidDisplayException from addView.
2012-10-23 16:57:11 -07:00
Craig Mautner
6757572b39 Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 2012-10-23 16:53:32 -07:00
Hiroshi Lockheimer
4fed68a2b1 am c63aa962: Merge "Fix NPE." into jb-mr1-dev
* commit 'c63aa9621821b3f1e32292362cce76cd1899d932':
  Fix NPE.
2012-10-23 16:29:14 -07:00
Hiroshi Lockheimer
c63aa96218 Merge "Fix NPE." into jb-mr1-dev 2012-10-23 16:26:25 -07:00
Daniel Sandler
1a3bdd5097 Fix NPE.
Bug: 7401286
Change-Id: I45334c4b2263bb611952b7dd949f5df98556377d
2012-10-23 19:21:20 -04:00
Chet Haase
f5fa64f24b am fbba753f: Merge "Handle offscreen animations correctly" into jb-mr1-dev
* commit 'fbba753f62f13a12d9287c67921d1ea60e92768d':
  Handle offscreen animations correctly
2012-10-23 15:48:40 -07:00
Chet Haase
fbba753f62 Merge "Handle offscreen animations correctly" into jb-mr1-dev 2012-10-23 15:46:04 -07:00
Romain Guy
9389d447c1 am b75ade9c: Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev
* commit 'b75ade9cce02dffb967ff4719381254585074c58':
  Use existing display list to render the resize buffer Bug #7400903
2012-10-23 15:44:26 -07:00
Romain Guy
b75ade9cce Merge "Use existing display list to render the resize buffer Bug #7400903" into jb-mr1-dev 2012-10-23 15:41:42 -07:00
Christopher Tate
e82f68d016 Fix the Backup Manager's uninstall tracking
The bug was that when an app was uninstalled, the Backup Manager was
discarding its bookkeeping about that app being represented in the
device's current live backup dataset.  This in turn meant that if the
app was subsequently reinstalled, its data would not be restored from
that most-recent dataset: it would be restored from the *ancestral*
dataset if possible, or not at all.

Now the "ever backed up" state is retained correctly, and the app
will get its most-recent-data restored as expected.

Bug 7394519

Change-Id: I733cf41737765676e0a3a05fb1bcd32b165cb4ba
2012-10-23 15:40:27 -07:00
Craig Mautner
6018aeec27 Add throwing InvalidDisplayException from addView.
Throw an InvalidDisplayException to addView if the display being
added to has been removed. Handle this exception in Dialog.show()
by removing the view after it has been added and rethrow the
exception from there.

Add javadoc to ViewManager.addView and Presentation.show explaining
the new exception and how best to handle it.

Bug: 7368565 partially fixed. It remains for the Videos app to
handle Presentation.show throwing the InvalidDisplayException.

Change-Id: Ib4303c9b3f7bf7a0cfa95d19bd60a0c128658c48
2012-10-23 15:34:29 -07:00
Chet Haase
3561d062ff Handle offscreen animations correctly
A bug in software rendering caused animations on views that are offscreen
to not get drawn, therefore the animation doesn't continue (since old-style
animations depend on the logic in the drawing code to keep running). Fix is
to special case the isAnimating case in ViewRoot to go ahead and schedule
a traversal even if the dirty rect does not intersect with the visible region.

Issue #7396035 Animations starting offscreen don't draw run/end/draw properly (sw rendering only)

Change-Id: Iae25b3a424ddc5a16ba431ecd68cf42d5500db3f
2012-10-23 15:30:15 -07:00
Jamie Gennis
39c68da57b am cd79b35c: Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev
* commit 'cd79b35c3828e0ebf4c9e68da75f9d857ccf01db':
  Surface: add the PhysicalDisplayInfo#secure field
2012-10-23 15:24:29 -07:00
Andy McFadden
30fd55cf98 am d401a53c: Merge "Improve systrace tag propagation" into jb-mr1-dev
* commit 'd401a53c6472921ce7785059195a4f031feea7cc':
  Improve systrace tag propagation
2012-10-23 15:24:25 -07:00
Jamie Gennis
cd79b35c38 Merge "Surface: add the PhysicalDisplayInfo#secure field" into jb-mr1-dev 2012-10-23 15:22:37 -07:00
Andy McFadden
d401a53c64 Merge "Improve systrace tag propagation" into jb-mr1-dev 2012-10-23 15:21:56 -07:00
Michael Jurka
e66083db00 am a665df57: Merge "Use lighter background for Recents" into jb-mr1-dev
* commit 'a665df573e16d79dfd327c8b9a51176a0edde5c7':
  Use lighter background for Recents
2012-10-23 15:10:11 -07:00
Jamie Gennis
95429c3d1b Surface: add the PhysicalDisplayInfo#secure field
Bug: 7368436
Change-Id: I38bf7bbfca354380c30da7516f628cf40416d350
2012-10-23 15:07:22 -07:00
Michael Jurka
a665df573e Merge "Use lighter background for Recents" into jb-mr1-dev 2012-10-23 15:06:46 -07:00
Michael Jurka
9ed2bebe09 Use lighter background for Recents
Also, re-enable gradient on tablets
(gradient will be disabled in device-specific
overlays on devices that don't render it well)

Bug: 7381275
2012-10-23 15:02:57 -07:00
Dianne Hackborn
77119bc6c9 Fix issue #7342364: JellyBean broke Toddler Lock, again
Change-Id: I400c02711edc302a1bc7fbf98b62fcb9f76e5e12
2012-10-23 15:02:25 -07:00
Romain Guy
3a2d6aaf8e Use existing display list to render the resize buffer
Bug #7400903

Change-Id: Ia2e534e47b4f67c280e2de7ce99cae0202751c42
2012-10-23 13:25:13 -07:00
Jeff Brown
227058243d am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
* commit '6fd394ae799cc81e3b571773819ee99374a25158':
  Improve auto-brightness hysteresis.
2012-10-23 12:47:53 -07:00
Jeff Brown
6fd394ae79 Merge "Improve auto-brightness hysteresis." into jb-mr1-dev 2012-10-23 12:43:47 -07:00
Baligh Uddin
1c2fb2436f am 8ed48222: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '8ed482224ccd9d43fbb7544379a9bb7c10554419':
  Import translations. DO NOT MERGE
2012-10-23 11:21:25 -07:00
Baligh Uddin
8ed482224c Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-23 11:19:07 -07:00
Baligh Uddin
c730c00ae5 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-23 11:16:25 -07:00
Romain Guy
d04fe3c1ae am 04c8d402: Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev
* commit '04c8d402fa824c548dc5de82c56e63eb5df02371':
  Properly draw the window background on window resize Bug #7385090
2012-10-23 10:51:14 -07:00
Irfan Sheriff
9998f77a75 am c48ca657: Merge "Fix driver stop handling" into jb-mr1-dev
* commit 'c48ca657f801b120e88c94287cdeecddc1a46e88':
  Fix driver stop handling
2012-10-23 10:49:14 -07:00
Romain Guy
04c8d402fa Merge "Properly draw the window background on window resize Bug #7385090" into jb-mr1-dev 2012-10-23 10:47:56 -07:00