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

60269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wink Saville
3c776cd968 Merge "Do not always say OTASP_NOT_NEEDED for LTE." 2011-10-19 15:43:38 -07:00
Adam Cohen
5a631b6b2f Merge "Manually merging screenshot notification string changes to master." 2011-10-19 15:31:49 -07:00
Eric Laurent
ee00c0541e am 3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0 
* commit '3c86134a50618605c86eb9f5f120dbf97826e3e1':
  Fix issue 381905: BassBoostTest CTS tests fail...
 2011-10-19 14:02:10 -07:00
Eric Laurent
3c86134a50 Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0 2011-10-19 13:59:55 -07:00
Wink Saville
7d50525511 Do not always say OTASP_NOT_NEEDED for LTE. 
Do not override CdamServiceStateTracker#getOtasp as we
should report the "real" status as OTASP can be needed
for LTE.

Bug: 5413788
Change-Id: Ia34c9e1169bfc9682f81f9c4935eb2853507bd04
 2011-10-19 12:39:28 -07:00
Scott Main
337276806f am bdca5c62: cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update 
* commit 'bdca5c6237558015910a14d38f78ba84973e8ed4':
  cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 plus a small tweak to remove "other" data from platform chart docs: dashboard update
 2011-10-19 12:25:12 -07:00
Scott Main
bdca5c6237 cherrypick from hc-mr2 Change-Id: I20c238ae599db79e41eaa2ea82a1e5631d004967 
plus a small tweak to remove "other" data from platform chart
docs: dashboard update

Change-Id: If47597399cbcdef92d0b4a83d728bd9ea9034f83
 2011-10-19 12:20:59 -07:00
Scott Main
b51541f679 am 47bc0fea: docs: fix typo in platform notes issue 5481512 
* commit '47bc0feace5b842b3b8bf07b88e41ff658667bb3':
  docs: fix typo in platform notes issue 5481512
 2011-10-19 12:04:13 -07:00
Scott Main
47bc0feace docs: fix typo in platform notes 
issue 5481512

Change-Id: I4773e06b315100f97b8d1dda6003a03b40cedd0b
 2011-10-19 12:01:16 -07:00
Daniel Sandler
dc1269b546 am 2f6a5327: Merge "Auto-close if you swipe away the last notification." into ics-mr0 
* commit '2f6a53270f113a244f3b6ca91a1efef2c4a26fac':
  Auto-close if you swipe away the last notification.
 2011-10-19 12:00:13 -07:00
Daniel Sandler
2f6a53270f Merge "Auto-close if you swipe away the last notification." into ics-mr0 2011-10-19 11:58:27 -07:00
Eric Laurent
7fa1cee12c Fix issue 381905: BassBoostTest CTS tests fail... 
When AudioEffectTest is executed, an Equalizer is created
and enabled on a MediaPlayer session. Effects on the output
mix are therefore suspended.
Then the MediaPlayer is released with the effect still enabled.
In this case, Audioflinger::purgeStaleEffects_l() fails to restore
the suspended effects when the effect attached to the released audio session
is removed.
When subsequent tests are executed on output mix effects, these effects cannot be
enabled as they are still suspended.

Fixed purgeStaleEffects_l() to restore suspended effects if the effect removed is enabled.

Also fixed EffectHandle::disconnect() to only restore suspended effects if the disconnected
handle actually has control over the effect.

Change-Id: I67232e7c34680b0cc01abfd57d5d510a524e5d4f
 2011-10-19 11:44:54 -07:00
Dianne Hackborn
3585a3dfc6 am 47f8367a: Merge "Work on issue #5465917: Wakelock *overflow* held for very long times" into ics-mr0 
* commit '47f8367ab79247501d5d204632a7797fa8a888e5':
  Work on issue #5465917: Wakelock *overflow* held for very long times
 2011-10-19 11:10:18 -07:00
Jamie Gennis
08bad20ee7 am 827d069a: Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0 
* commit '827d069afb297b6d96c995c03da9d4ee17e60679':
  SurfaceTexture: free buffers when disconnect fails
 2011-10-19 11:08:11 -07:00
Dianne Hackborn
47f8367ab7 Merge "Work on issue #5465917: Wakelock *overflow* held for very long times" into ics-mr0 2011-10-19 11:07:34 -07:00
Jamie Gennis
827d069afb Merge "SurfaceTexture: free buffers when disconnect fails" into ics-mr0 2011-10-19 11:06:05 -07:00
Winson Chung
b5968c780d Manually merging screenshot notification string changes to master. 
Change-Id: I35468b5e641078d772c19505765db90adea2445b
 2011-10-19 11:04:17 -07:00
Michael Jurka
c1c2430431 am 9a76afff: Merge "Make Recent Apps faster" into ics-mr0 
* commit '9a76afff4da4bd51685b0938439c4f4a0e19345f':
  Make Recent Apps faster
 2011-10-19 10:31:47 -07:00
Ben Komalo
667580b716 am 8408e516: Merge "Fix remote device wipe to not hang." into ics-mr0 
* commit '8408e5165a74ddee7d2d8698314cfda521fbfc76':
  Fix remote device wipe to not hang.
 2011-10-19 10:31:42 -07:00
Michael Jurka
9a76afff4d Merge "Make Recent Apps faster" into ics-mr0 2011-10-19 10:04:19 -07:00
Ben Komalo
8408e5165a Merge "Fix remote device wipe to not hang." into ics-mr0 2011-10-19 09:32:50 -07:00
Marco Nelissen
e68a6936c7 Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class." 2011-10-19 07:50:24 -07:00
Daniel Sandler
8cc36e5728 Auto-close if you swipe away the last notification. 
Matias, I think this will enchant you.

Bug: 4902177
Change-Id: I748b62d3928519455b6b98b0b074a1204e2fdb4b
 2011-10-19 10:33:35 -04:00
The Android Open Source Project
4715402557 Reconcile with ics-mr0-release 
Change-Id: Ie6705bfff564fe89f151753a034decc60f02b03b
 2011-10-19 07:23:01 -07:00
The Android Automerger
1f74cb9e9d merge in ics-mr0-release history after reset to ics-mr0 2011-10-19 06:28:30 -07:00
Dave Burke
2696d0520f am 70ac412b: Merge "Add a LayerScreenshot" into ics-mr0 
* commit '70ac412b2fe7be2507189a9fdfb30c43b36d56ac':
  Add a LayerScreenshot
 2011-10-18 23:00:08 -07:00
Dave Burke
70ac412b2f Merge "Add a LayerScreenshot" into ics-mr0 2011-10-18 22:58:09 -07:00
Dave Burke
3254774b92 am d7035c58: Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0 
* commit 'd7035c58b006b62084232c8db6c4f7c4002170cc':
  Fix a hang in SF caused by invalid transform matrix from the WM
 2011-10-18 22:34:51 -07:00
Dave Burke
d7035c58b0 Merge "Fix a hang in SF caused by invalid transform matrix from the WM" into ics-mr0 2011-10-18 22:33:40 -07:00
James Dong
3c563ce672 am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 
* commit '5264f6003bbcb8ca70df034379154914260cc322':
  Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
 2011-10-18 22:17:34 -07:00
James Dong
5264f6003b Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 2011-10-18 22:16:08 -07:00
Mathias Agopian
960a0b4813 am f7613743: Merge "Don\'t call hwc set() if there is nothing new to do" into ics-mr0 
* commit 'f7613743f29f38cbbaf4ae09996c380845a17daf':
  Don't call hwc set() if there is nothing new to do
 2011-10-18 20:24:23 -07:00
Mathias Agopian
43d109c2c8 am 23bf2505: Merge "Make sure set GL state properly" into ics-mr0 
* commit '23bf250522b7dff9acd14c5900b66b1df9c76745':
  Make sure set GL state properly
 2011-10-18 20:24:21 -07:00
Mathias Agopian
f7613743f2 Merge "Don't call hwc set() if there is nothing new to do" into ics-mr0 2011-10-18 20:23:22 -07:00
Mathias Agopian
23bf250522 Merge "Make sure set GL state properly" into ics-mr0 2011-10-18 20:23:15 -07:00
Mathias Agopian
0ab84ef507 Add a LayerScreenshot 
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.

Make sure to call compositionComplete() after rendering into a FBO.

Bug: 5446982, 5467587, 5466259
Change-Id: I5d8a1b4c327f9973d950cd4f4c0bca7f62825cd4
 2011-10-18 20:21:47 -07:00
Mathias Agopian
526f0a0e15 Fix a hang in SF caused by invalid transform matrix from the WM 
WindowManager could create by transforms because of divide by zero.

Bug: 5422468
Change-Id: I782f87ebb78b5ff23750e22837f36ca6cfed1f2f
 2011-10-18 20:21:47 -07:00
Eric Laurent
a6f4fb1fbb am ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0 
* commit 'ecfdd7ff468bfc861e84fe18992e26b89cc63126':
  Limit AudioFlinger log.
 2011-10-18 19:31:12 -07:00
Eric Laurent
ecfdd7ff46 Merge "Limit AudioFlinger log." into ics-mr0 2011-10-18 19:29:39 -07:00
Dirk Dougherty
bafa2ca4f1 am cd815fc5: Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0 
* commit 'cd815fc55bf998578461a95daf8d8fe4a6522961':
  Doc change: Add Android 4.0 Platform Highlights
 2011-10-18 18:04:33 -07:00
Dirk Dougherty
cd815fc55b Merge "Doc change: Add Android 4.0 Platform Highlights" into ics-mr0 2011-10-18 18:02:35 -07:00
Romain Guy
caabc81f0f Merge "Notify a Bitmap is has changed when calling copyPixelFromBuffer" 2011-10-18 17:57:22 -07:00
Romain Guy
2c183fa5bf Notify a Bitmap is has changed when calling copyPixelFromBuffer 
Change-Id: Ibff1a162edfe11473c5c167e764405bf83ec5822
 2011-10-18 17:56:06 -07:00
Scott Main
c06325727f am f49ee00f: Merge "docs: fix platform highlights" into ics-mr0 
* commit 'f49ee00f9e1975887142695e0040cd5dc410b9db':
  docs: fix platform highlights
 2011-10-18 17:51:42 -07:00
Jim Miller
90e4ad00a7 am 06398768: Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0 
* commit '06398768ec048cf05717ee44b81cb357fdc896dd':
  Fix 5288804: Make music trasports in lockscreen more closely match design
 2011-10-18 17:51:41 -07:00
Scott Main
f49ee00f9e Merge "docs: fix platform highlights" into ics-mr0 2011-10-18 17:49:32 -07:00
Jim Miller
06398768ec Merge "Fix 5288804: Make music trasports in lockscreen more closely match design" into ics-mr0 2011-10-18 17:49:28 -07:00
Dirk Dougherty
052ab1a5b7 Doc change: Add Android 4.0 Platform Highlights 
Change-Id: If508648991eaae02d8ee9c16626ccac3a31e6078
 2011-10-18 17:48:10 -07:00
Jason Sams
2e22144891 Merge "Add mandelbrot to compute perf" 2011-10-18 17:44:33 -07:00
Robert Ly
a94c7bdcf8 docs: fix platform highlights 
Change-Id: I876a78661f2198eb8992f0183736de454cd2c4bc
 2011-10-18 17:44:02 -07:00