drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,595 Commits 1 Branch 0 Tags
Commit Graph

90595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
25250c21a3 am c832ca32: am 0fa4cf5b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c832ca325f309d10d0bceea958439c1517cf70d3':
  Import translations. DO NOT MERGE
 2012-10-24 12:20:02 -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
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
Baligh Uddin
f7b191a3cf am c1afd568: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'c1afd56898cf41692f128329a1d104650791daf2':
  Import translations. DO NOT MERGE
 2012-10-24 12:14:48 -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
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
Dirk Dougherty
90525b5cba am 87949f23: am d8d83faa: am cde979d2: am 3d087920: am 76cdbdc8: Doc change: update develop landing page content. 
* commit '87949f23070d1ce83e24cb14880cda9c813344d5':
  Doc change: update develop landing page content.
 2012-10-24 10:48:32 -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
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
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
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
Dirk Dougherty
76cdbdc848 Doc change: update develop landing page content. 
Change-Id: I1b3639e4097650d9182b8e2bf213f1603ee17e10
 2012-10-24 10:23:37 -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
Eric Laurent
850fc75f1c am 9e76f415: am f52cbb6b: Merge "AudioService: add fix for corrupted settings" into jb-mr1-dev 
* commit '9e76f415e62325673c07ecbe3ce3fa377b293d04':
  AudioService: add fix for corrupted settings
 2012-10-23 21:23:49 -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
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
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
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
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
Svetoslav Ganov
73c4e65d67 am 444fc17f: am e1655c98: Merge "When A11y is on, use a longer interval between lockout announcements." into jb-mr1-dev 
* commit '444fc17f4ba3be0e66d735d7ac8ffe8007d28ee0':
  When A11y is on, use a longer interval between lockout announcements.
 2012-10-23 17:42:34 -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
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
Craig Mautner
a170dcb7b6 am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into jb-mr1-dev 
* commit '9e96c69e3e9ebdb820acd347b4691c32a5d76be4':
  Add throwing InvalidDisplayException from addView.
 2012-10-23 17:01:20 -07:00