Amith Yamasani
2f389eaff1
am 2104cdb0: am 9bf572c2: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
...
* commit '2104cdb0e6bed1616b3a67f4b7eb3d1d6feae07b':
Fix a crash in InputMethodManagerService due to permission failure.
2012-10-24 13:39:01 -07:00
Amith Yamasani
2104cdb0e6
am 9bf572c2: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev
...
* commit '9bf572c2d3998977d4aef456e1c55c5d682b0bef':
Fix a crash in InputMethodManagerService due to permission failure.
2012-10-24 13:36:13 -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
Christopher Tate
cd0e1c91a8
am d5d2161c: am 6eb0d777: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
...
* commit 'd5d2161c91f4eb20087f66386a42989123354a59':
Fix the Backup Manager's uninstall tracking
2012-10-24 12:32:28 -07:00
Christopher Tate
d5d2161c91
am 6eb0d777: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev
...
* commit '6eb0d7770160f9adc0f5d20bbb292352494b5049':
Fix the Backup Manager's uninstall tracking
2012-10-24 12:29:27 -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
Jeff Brown
2af7e72229
am 5bac2df4: am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit '5bac2df4d69f096fa8c858bcb3713b7af9e977f8':
Secure windows, secure surface views and secure displays.
2012-10-24 12:22:01 -07:00
Jeff Brown
5bac2df4d6
am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
...
* commit 'b43269acddb7061c43fa6ace6a896c51a9bf4dce':
Secure windows, secure surface views and secure displays.
2012-10-24 12:19:59 -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
Jeff Brown
1202c43685
Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev
2012-10-24 12:14:08 -07:00
Zhihai Xu
99fc7d9c94
am 843031b0: am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit '843031b03eaa062a59f467bd3e00f88d5f87adba':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:52:10 -07:00
Zhihai Xu
843031b03e
am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev
...
* commit 'a656971e73a09c8aa01f8a2922865ea00df43758':
License of files Bluetooth package is not updated to ASL2
2012-10-24 10:50:16 -07: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
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
Dianne Hackborn
9221792e0b
am e9c9a4ce: am 619eea60: am ecf4725e: Merge "Fix issue #7401818 : Wrong transition animation when clearing task" into jb-mr1-dev
...
* commit 'e9c9a4ce9e9766b8950f34adeedeb7705cadf71e':
Fix issue #7401818 : Wrong transition animation when clearing task
2012-10-24 10:36:30 -07:00
Dianne Hackborn
e9c9a4ce9e
am 619eea60: am ecf4725e: Merge "Fix issue #7401818 : Wrong transition animation when clearing task" into jb-mr1-dev
...
* commit '619eea609f50d85f5a7a11dace2d18feeea23c9e':
Fix issue #7401818 : Wrong transition animation when clearing task
2012-10-24 10:34:04 -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
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
Dave Burke
101af1b291
am aea7b690: am da2f2e51: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
...
* commit 'aea7b6903b66b07f35369c8b16b7a7df503022c7':
Revert "Check non-primary user dirs during package scan"
2012-10-23 23:21:54 -07:00
Dave Burke
aea7b6903b
am da2f2e51: am 799916e6: Merge "Revert "Check non-primary user dirs during package scan"" into jb-mr1-dev
...
* commit 'da2f2e51c71b5ebc50fe76c3cd5a920c81a5ee92':
Revert "Check non-primary user dirs during package scan"
2012-10-23 23:19:01 -07: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
Kenny Root
ec32687666
am c2a1c123: am a392de74: am 92bc9b31: PMS: check outInfo for null during delete
...
* commit 'c2a1c123de10f508510a75f6e501fa9d9ea1227c':
PMS: check outInfo for null during delete
2012-10-23 21:10:28 -07:00
Kenny Root
c2a1c123de
am a392de74: am 92bc9b31: PMS: check outInfo for null during delete
...
* commit 'a392de74585496e92f821e43ee250f62e9e1a377':
PMS: check outInfo for null during delete
2012-10-23 21:08:00 -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
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
Dianne Hackborn
1705a59e86
am 3dcc2279: am d4337ae0: am 56e75631: Merge "Fix issue #7342364 : JellyBean broke Toddler Lock, again" into jb-mr1-dev
...
* commit '3dcc22799af9f5080ad2bb26369d35beb46c1a9c':
Fix issue #7342364 : JellyBean broke Toddler Lock, again
2012-10-23 17:45:35 -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
3dcc22799a
am d4337ae0: am 56e75631: Merge "Fix issue #7342364 : JellyBean broke Toddler Lock, again" into jb-mr1-dev
...
* commit 'd4337ae09b1646a0c1dec2869c350e496d564348':
Fix issue #7342364 : JellyBean broke Toddler Lock, again
2012-10-23 17:42:43 -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
Dianne Hackborn
56e75631bd
Merge "Fix issue #7342364 : JellyBean broke Toddler Lock, again" into jb-mr1-dev
2012-10-23 17:35:59 -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
Kenny Root
bf3c8f6cb8
am 5e24b92f: am f461d3f6: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
...
* commit '5e24b92f0407e413cc9d2aafeef4905e1b139dc0':
Check non-primary user dirs during package scan
2012-10-23 17:29:44 -07:00
Kenny Root
5e24b92f04
am f461d3f6: am da2509c4: Merge "Check non-primary user dirs during package scan" into jb-mr1-dev
...
* commit 'f461d3f69f4533045167b4dc1f7445ad6ae47af3':
Check non-primary user dirs during package scan
2012-10-23 17:10:24 -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
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
Dianne Hackborn
77119bc6c9
Fix issue #7342364 : JellyBean broke Toddler Lock, again
...
Change-Id: I400c02711edc302a1bc7fbf98b62fcb9f76e5e12
2012-10-23 15:02:25 -07:00
Jeff Brown
e31e0f8c7c
am 265fcd2f: am 22705824: am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
...
* commit '265fcd2f85679ddbb2c89d6d517b4a55c1c7306e':
Improve auto-brightness hysteresis.
2012-10-23 12:53:16 -07:00
Jeff Brown
265fcd2f85
am 22705824: am 6fd394ae: Merge "Improve auto-brightness hysteresis." into jb-mr1-dev
...
* commit '227058243de992c87e66a912f64326abb3f01269':
Improve auto-brightness hysteresis.
2012-10-23 12:50:33 -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
Jeff Brown
e941b1e27f
Improve auto-brightness hysteresis.
...
Reintroduced the stability time heuristic which requires brightness
to remain significantly above or below the currently accepted
ambient brightnes before effecting a brightness change. The
heuristic has the nice property of preventing light sensor noise
from causing oscillations in brightness even when the noise has
a relatively large magnitude (such as in low light environments).
The time bound and filter thresholds are current set so that
brightness increases typically occur within 5 seconds of a change
in the ambient environment. Decreases take somewhat longer and
typically occur within 10 seconds.
Changed the timing for brightness animations when the screen is
being dimmed due to a pending user activity timeout. The screen
now dims slowly but then brightens rapidly when touched.
Previously the screen dimmed quickly and brightened slowly which
felt somewhat unresponsive.
Fixed a problem where a brightness change might not occur because
the light sensor had not reported a new value in a long time.
Now we synthesize measurements when needed to ensure that a
transition will take place if appropriate.
Bug: 7387800
Change-Id: I998df2fec59922042a41a1ba4af97ea52c0bd02a
2012-10-22 18:56:39 -07:00
Kenny Root
4525f5b69c
Check non-primary user dirs during package scan
...
During package scan, only the primary user data directories were
checked. If the secondary user didn't have an application directory, it
would happily ignore it. The app would then crash upon startup.
Bug: 7391882
Change-Id: I1fa92aa27386104d4ac6bc5dc92bfbf2e7dfac9f
2012-10-22 18:48:24 -07:00
Colin Cross
7d06a0b87c
am 3ebec529: am 08306ca0: am 034b386c: Merge "Add ro.revision property to checkin headers" into jb-mr1-dev
...
* commit '3ebec52947a122a867c96d0e869c21088b3ab190':
Add ro.revision property to checkin headers
2012-10-22 14:28:57 -07:00