Dianne Hackborn
0ba3f30655
am a982ad19: Merge "Fix issue #5173952 : Opening a Notification From Lock Screen..."
...
* commit 'a982ad19d2aee54f714fa3ad9ee4ddbac08dc0fe':
Fix issue #5173952 : Opening a Notification From Lock Screen...
2011-09-23 14:56:48 -07:00
Dianne Hackborn
a982ad19d2
Merge "Fix issue #5173952 : Opening a Notification From Lock Screen..."
2011-09-23 14:54:26 -07:00
John Reck
76d4fda68c
am 6c984bcb: Merge "Add detail to restorePicture deprecation"
...
* commit '6c984bcb179c74c2fa3c814596792629d1005355':
Add detail to restorePicture deprecation
2011-09-23 14:50:39 -07:00
John Reck
6c984bcb17
Merge "Add detail to restorePicture deprecation"
2011-09-23 14:48:52 -07:00
Eric Laurent
c318cd339b
am 65837ced: Merge "Fix issue 5355047: Automated effect tests fail."
...
* commit '65837cede462b551742f900f2e2f5a1d5dd576a2':
Fix issue 5355047: Automated effect tests fail.
2011-09-23 14:44:38 -07:00
Eric Laurent
65837cede4
Merge "Fix issue 5355047: Automated effect tests fail."
2011-09-23 14:43:12 -07:00
Fabrice Di Meglio
3201668bfd
am 651e4667: Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
...
* commit '651e46679b2d5dc7809fdb2b57e15a9ba2992db4':
Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits
2011-09-23 14:07:29 -07:00
Svetoslav Ganov
88226bf0da
am 83a559e7: Merge "Scroll accessibility events should not populate text."
...
* commit '83a559e78f57703645066c822a1ec7257c06ba56':
Scroll accessibility events should not populate text.
2011-09-23 14:07:22 -07:00
Amith Yamasani
7583ac63d7
am e7d70563: Merge "Launch nested preferences with the same theme as parent activity."
...
* commit 'e7d70563839bbf0ce8d548fe7223229ec2ecd635':
Launch nested preferences with the same theme as parent activity.
2011-09-23 14:07:19 -07:00
Christopher Tate
a0cd7ad6c6
am 54303e6b: am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
...
* commit '54303e6b2361e2fbfe889f4464074c89763f7ab1':
Don't crash during full backup when CheckJNI is enabled
2011-09-23 14:07:16 -07:00
Scott Main
2d31058424
am c86bc42c: Merge "docs: a few additions and revisions to action bar docs"
...
* commit 'c86bc42cb1b910c1150c8f5aa74c1c160c1359e3':
docs: a few additions and revisions to action bar docs
2011-09-23 14:07:14 -07:00
Dianne Hackborn
90c52de286
Fix issue #5173952 : Opening a Notification From Lock Screen...
...
...Should Skip Unsecure Lockscreen (ICS)
Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).
Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
2011-09-23 13:39:33 -07:00
Fabrice Di Meglio
651e46679b
Merge "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
2011-09-23 13:30:41 -07:00
Svetoslav Ganov
83a559e78f
Merge "Scroll accessibility events should not populate text."
2011-09-23 13:26:18 -07:00
Amith Yamasani
e7d7056383
Merge "Launch nested preferences with the same theme as parent activity."
2011-09-23 13:24:38 -07:00
Christopher Tate
54303e6b23
am b20d378c: Merge "Don\'t crash during full backup when CheckJNI is enabled" into ics-factoryrom
...
* commit 'b20d378cec09da18301eb9c33bc88251beb81042':
Don't crash during full backup when CheckJNI is enabled
2011-09-23 13:21:07 -07:00
Christopher Tate
b20d378cec
Merge "Don't crash during full backup when CheckJNI is enabled" into ics-factoryrom
2011-09-23 13:19:33 -07:00
Scott Main
c86bc42cb1
Merge "docs: a few additions and revisions to action bar docs"
2011-09-23 13:13:13 -07:00
Christopher Tate
ca1605e6e3
Don't crash during full backup when CheckJNI is enabled
...
It's not okay to pass null to JNI methods and trust that it will just
back off and return a null result cleanly. Fixes bug 5361822 .
Change-Id: Id8a17b958fd183d55cb6475f394e158c13aae2ea
2011-09-23 13:12:49 -07:00
Dianne Hackborn
04d98fb638
am 67c5b125: Merge "Fix issue #5321282 : Force Stop Button in Battery Screen Not disabled correctly"
...
* commit '67c5b1251178532726964c2e0f4229d079ff0a3e':
Fix issue #5321282 : Force Stop Button in Battery Screen Not disabled correctly
2011-09-23 12:58:33 -07:00
Dianne Hackborn
67c5b12511
Merge "Fix issue #5321282 : Force Stop Button in Battery Screen Not disabled correctly"
2011-09-23 12:56:42 -07:00
Scott Main
e797ed6a74
docs: a few additions and revisions to action bar docs
...
Change-Id: I12c24e5d4ed49d8f9822050d330f617bd614b7b9
2011-09-23 12:56:20 -07:00
Kenny Root
e327fe4611
am 3f816086: Merge "Less verbose message when dexopt non-APK"
...
* commit '3f8160868003eb2525e5a69ed6b0a1790a30cd1b':
Less verbose message when dexopt non-APK
2011-09-23 12:51:17 -07:00
Kenny Root
3f81608680
Merge "Less verbose message when dexopt non-APK"
2011-09-23 12:49:44 -07:00
Adam Powell
0cdb24da5b
am 90d33ccd: Merge "Remove unnecessary parameter"
...
* commit '90d33ccd16cf909ac4920a593772204d7bcf45db':
Remove unnecessary parameter
2011-09-23 12:47:03 -07:00
Adam Powell
90d33ccd16
Merge "Remove unnecessary parameter"
2011-09-23 12:45:13 -07:00
Andreas Huber
6677ea6161
am 7fa3b435: Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
...
* commit '7fa3b435d67e3ba2c879431f44e262c40716ebd8':
Add an option to dump the raw stream to a file in the stagefright cmdline tool.
2011-09-23 11:36:49 -07:00
David Brown
812a837bc5
am e45beeb7: Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers."
...
* commit 'e45beeb7493070f3a2b9ff90f42009288e1372b2':
Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers.
2011-09-23 11:36:47 -07:00
Adam Powell
4f4b7fbf3c
am 5c267ece: Merge "Fix leaky view tags"
...
* commit '5c267ecec6529a384e76a8b4a261b73aadaf1130':
Fix leaky view tags
2011-09-23 11:36:31 -07:00
Andreas Huber
7fa3b435d6
Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
2011-09-23 11:27:51 -07:00
David Brown
e45beeb749
Merge "Temp fix to the problem of incorrectly classifying Brazilian local numbers as emergency numbers."
2011-09-23 11:25:57 -07:00
Adam Powell
2b2f6d6c54
Remove unnecessary parameter
...
Change-Id: I32810a31140263a996d4f600fa53db5f29e60f42
2011-09-23 11:15:39 -07:00
Adam Powell
5c267ecec6
Merge "Fix leaky view tags"
2011-09-23 11:05:25 -07:00
Amith Yamasani
72e6bece43
Launch nested preferences with the same theme as parent activity.
...
Bug: 5351628
Change-Id: Id67b81558bc6e010d6f024cdb8117424aa6b62f0
2011-09-23 10:43:40 -07:00
Andreas Huber
a17545339b
Add an option to dump the raw stream to a file in the stagefright cmdline tool.
...
Change-Id: Ie19eca2cdf162d6973037ec554ef5916243ea7d7
2011-09-23 10:25:32 -07:00
Eric Laurent
5e7acae2c3
Fix issue 5355047: Automated effect tests fail.
...
Fixed several regressions in automated audio effect tests due
to changes in effect framework and visualizer FFT output range.
- Do not suspend Volume effect on session 0 when effects are
enabled on specific sessions.
- Adapt energy detection thresholds to new visualizer FFT range.
- Leave more time for BassBoost and Virtualizer effects to ramp up
before measuring the effect.
- Removed second insert reverb left by mistake on the player session
in preset reverb test.
Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
2011-09-23 10:15:05 -07:00
Kenny Root
fec5e75c96
Less verbose message when dexopt non-APK
...
The message when something is not an APK that is submitted for dexopt is
not extremely helpful. Make it more precise and remove the useless
traceback.
Change-Id: Ibb34b2b2c10ee28ea98662c3f6fd070529cf8c4f
2011-09-23 10:13:06 -07:00
Wei Huang
68d7e0d2ab
am e448f557: am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
...
* commit 'e448f557f620ae30dcead7a4423059dfb7d70add':
Update camera javadoc about AE and AWB lock.
2011-09-23 10:07:33 -07:00
Wei Huang
e448f557f6
am 3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
...
* commit '3d9a9e55df85c720573e69ec3062efc331ea69bb':
Update camera javadoc about AE and AWB lock.
2011-09-23 10:05:22 -07:00
Wei Huang
3d9a9e55df
Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
2011-09-23 10:04:02 -07:00
Eric Fischer
55df8eac24
am ec26232d: am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom
...
* commit 'ec26232d70a342aa88e8190818b1b2973b20186e':
Delete translations of files that no longer exist.
2011-09-23 09:47:38 -07:00
Eric Fischer
ec26232d70
am c4517842: Merge "Delete translations of files that no longer exist." into ics-factoryrom
...
* commit 'c4517842ee2a641342f151ecafb797080b9ed84d':
Delete translations of files that no longer exist.
2011-09-23 09:45:50 -07:00
Eric Fischer
c4517842ee
Merge "Delete translations of files that no longer exist." into ics-factoryrom
2011-09-23 09:43:55 -07:00
Daniel Sandler
a399b03d09
am a8c46b1d: Merge "Put the correct background behind largeIcons."
...
* commit 'a8c46b1dc47f0fa92f41c6311ca6131d18efbcd4':
Put the correct background behind largeIcons.
2011-09-23 09:35:18 -07:00
Daniel Sandler
a8c46b1dc4
Merge "Put the correct background behind largeIcons."
2011-09-23 09:33:18 -07:00
John Reck
2df8f425f6
Add detail to restorePicture deprecation
...
Bug: 5361506
Change-Id: I4bf6583170df50b218051f4700700ff1b8874d17
2011-09-23 09:27:01 -07:00
Pannag Sanketi
f5e4892e5f
am 91d34137: am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
...
* commit '91d34137903c278e5e077fa1edef9bbbcdd140f7':
Returning EOS in SurfaceMediaSource:read
2011-09-23 09:10:41 -07:00
Pannag Sanketi
91d3413790
am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
...
* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
2011-09-23 09:08:11 -07:00
Pannag Sanketi
1d71c7b40a
Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
2011-09-23 09:06:55 -07:00
Mike Lockwood
78b19b4307
Merge "Add SerialPort.sendBreak()" into ics-aah
2011-09-23 09:02:20 -07:00