Irfan Sheriff
4e7f2ffe17
Merge "Handle group tear down only at group removed event" into jb-mr1-dev
2012-10-24 15:23:47 -07:00
Irfan Sheriff
2bc0c5fef2
Handle group tear down only at group removed event
...
Handling group removal at disconnect causes issues where supplicant keeps
the group and then the next invocation fails
Bug: 7403755
Change-Id: Iea7e5ec98486607f8e2c4a55be3743e0545a9da7
2012-10-24 15:05:56 -07:00
Jeff Brown
b21b4fdcea
am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
...
* commit '900e0ba5163bd03becf49922dfdfad07460716f0':
Dim the screen quickly in response to user activity timeout.
2012-10-24 14:58:26 -07:00
Jeff Brown
900e0ba516
Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev
2012-10-24 14:55:41 -07:00
Jeff Brown
5244c93176
Dim the screen quickly in response to user activity timeout.
...
Reverts a previous change that made the screen dim slowly instead.
The quick transition does a better job of attracting the user's
attention to the fact that the screen is about to turn off
unless the user touches the screen.
Bug: 7386034
Change-Id: I81e4d8939f6791b96352004984a9e5b2aab79788
2012-10-24 14:46:26 -07:00
Romain Guy
4344f20959
am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
...
* commit '9933331506c91e535ba277bef9c44e1852ccf16c':
Ensure we have a GL context before deleting View layers Bug #7391098
2012-10-24 13:53:46 -07:00
Romain Guy
9933331506
Merge "Ensure we have a GL context before deleting View layers Bug #7391098 " into jb-mr1-dev
2012-10-24 13:50:45 -07:00
Baligh Uddin
229a22efc5
am 188bf0e6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '188bf0e63c30fa557dc897faf1b55da045b23ca0':
Import translations. DO NOT MERGE
2012-10-24 13:50:23 -07:00
Baligh Uddin
188bf0e63c
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-24 13:47:21 -07:00
Baligh Uddin
3dc0cb6e43
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-24 13:43:41 -07:00
Amith Yamasani
9bf572c2d3
am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
...
* commit 'cd668554417f089aa0ae013a29ab81864b4b4685':
Fix a crash in InputMethodManagerService due to permission failure.
2012-10-24 13:33:37 -07:00
Amith Yamasani
cd66855441
Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
2012-10-24 13:30:01 -07:00
Victoria Lease
1417167f1b
am f704e9f6: Merge "revise android.location.Geofence documentation" into jb-mr1-dev
...
* commit 'f704e9f67745d1f1c01058f4c74b06d157b4054d':
revise android.location.Geofence documentation
2012-10-24 13:26:41 -07:00
Victoria Lease
f704e9f677
Merge "revise android.location.Geofence documentation" into jb-mr1-dev
2012-10-24 13:23:21 -07:00
Baligh Uddin
de18c8bf21
Import translations. DO NOT MERGE
...
Change-Id: I3717e675767f545d33b89efc85909a2d172808b8
Auto-generated-cl: translation import
2012-10-24 12:45:34 -07:00
Baligh Uddin
c5a1f8cd78
Import translations. DO NOT MERGE
...
Change-Id: I153e44f39a1bc197f1e0acca274239aee0404809
Auto-generated-cl: translation import
2012-10-24 12:44:10 -07:00
Christopher Tate
6eb0d77701
am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
...
* commit 'acf5943c44d34845386afe7946aed086f8b3e87e':
Fix the Backup Manager's uninstall tracking
2012-10-24 12:27:46 -07:00
Christopher Tate
acf5943c44
Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-dev
2012-10-24 12:24:51 -07:00
Daniel Sandler
be2cf3206e
Be a little more lenient with panel-open gestures.
...
The code would not consider any drag that did not complete
the "peek" distance (the distance the panel opens when you
press and hold on the status bar; on tablets this is
statusbarheight + closehandleheight, and on phones it's
headerheight + closehandleheight) as a candidate for a
fling, and set that drag's effective velocity to 0.
This CL just removes that check. Now a fling must meet the
minimum linear velocity and minimum Y distance thresholds
(100dp/sec and 20dp, respectively) to change the position of
the panel (closed->open or open->closed).
Bug: 7390976
Change-Id: Ia0c2450f9fdf3f27b890aab240a155dad1ab052f
2012-10-24 15:23:42 -04:00
Baligh Uddin
c832ca325f
am 0fa4cf5b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '0fa4cf5bb57d1c116db6b07256afa224619c461f':
Import translations. DO NOT MERGE
2012-10-24 12:17:24 -07:00
Jeff Brown
b43269acdd
am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
Secure windows, secure surface views and secure displays.
2012-10-24 12:17:16 -07:00
Baligh Uddin
0fa4cf5bb5
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-24 12:15:05 -07:00
Jeff Brown
1202c43685
Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
2012-10-24 12:14:08 -07:00
Baligh Uddin
c1afd56898
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-24 12:11:09 -07:00
Baligh Uddin
c1b2060b17
Import translations. DO NOT MERGE
...
Change-Id: I60e51769668cbf4823155238a51cdac84b4b49af
Auto-generated-cl: translation import
2012-10-24 12:08:18 -07:00
Baligh Uddin
af185e7dbf
Import translations. DO NOT MERGE
...
Change-Id: Ibde369e39b0ba2da783f00795aabe9769e47e1d0
Auto-generated-cl: translation import
2012-10-24 12:06:04 -07:00
Daniel Sandler
50a531337e
Missing copyright headers.
...
Change-Id: I0fac062ffa52fc21f32d25d3f0a38e263e701c46
2012-10-24 15:02:27 -04:00
Zhihai Xu
a656971e73
am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit '8e080d7e10dd17662750605538a9799af66494e9':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:48:01 -07:00
Dirk Dougherty
87949f2307
am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
...
* commit 'd8d83faae8101cda0c4f6fa2616d6b4c596e7d75':
Doc change: update develop landing page content.
2012-10-24 10:46:22 -07:00
Zhihai Xu
8e080d7e10
Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
2012-10-24 10:44:16 -07:00
Dirk Dougherty
d8d83faae8
am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
...
* commit 'cde979d2fdc9cf7517819b896ca46a7d7768ff43':
Doc change: update develop landing page content.
2012-10-24 10:43:44 -07:00
Dirk Dougherty
cde979d2fd
am 3d087920: am 76cdbdc8: Doc change: update develop landing page content.
...
* commit '3d0879201d4c1c660f0ff3b8fc63410298cd9264':
Doc change: update develop landing page content.
2012-10-24 10:40:30 -07:00
Victoria Lease
b17223b6f5
revise android.location.Geofence documentation
...
Bug: 7172696
Change-Id: Ib1a104ee4a97c51996200b8d456face66178115f
2012-10-24 10:40:07 -07:00
Dirk Dougherty
3d0879201d
am 76cdbdc8: Doc change: update develop landing page content.
...
* commit '76cdbdc848153680d27e8f7abd6281c0f95d793e':
Doc change: update develop landing page content.
2012-10-24 10:38:45 -07:00
Dianne Hackborn
619eea609f
am ecf4725e: Merge "Fix issue #7401818 : Wrong transition animation when clearing task" into jb-mr1-dev
...
* commit 'ecf4725ef4e753a2ef08205c922391753eb3803f':
Fix issue #7401818 : Wrong transition animation when clearing task
2012-10-24 10:31:06 -07:00
Dianne Hackborn
ecf4725ef4
Merge "Fix issue #7401818 : Wrong transition animation when clearing task" into jb-mr1-dev
2012-10-24 10:28:30 -07:00
Dirk Dougherty
76cdbdc848
Doc change: update develop landing page content.
...
Change-Id: I1b3639e4097650d9182b8e2bf213f1603ee17e10
2012-10-24 10:23:37 -07:00
Amith Yamasani
f043de93eb
Fix a crash in InputMethodManagerService due to permission failure.
...
Clear calling identity before sending broadcast to the current user.
Bug: 7403829
Change-Id: If2b27d07d917b892470163e1303883b29a86c0e4
2012-10-24 06:45:12 -07:00
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