Gloria Wang
1e04f5b26c
Merge "- Move the business rule management down to DRM agents. - Do not register DRM sniffer because drmserver is not enabled."
2010-11-01 20:38:51 -07:00
Daniel Lehmann
d6a3cddba5
Merge "Added missing label and char limits"
2010-11-01 20:25:31 -07:00
Neal Nguyen
8feb41267e
am 424963ef: am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests.
...
* commit '424963ef8d46c34d67ea24d25735944c0d87409c':
Adding some StorageManager integration test infrastructure and some basic tests.
2010-11-01 19:44:50 -07:00
Neal Nguyen
fbadab9066
am 5dda76a7: Adding some StorageManager integration test infrastructure and some basic tests.
...
* commit '5dda76a72e8bb4630fb5fd38a42e7bceb5b9c954':
Adding some StorageManager integration test infrastructure and some basic tests.
2010-11-01 19:42:22 -07:00
satok
8a219246f3
Merge "Fix a bug that enabled Subtype ID can't be saved propery."
2010-11-01 19:41:44 -07:00
Neal Nguyen
9c0a63107f
am af35b8f4: am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.
...
* commit 'af35b8f43262a27c941c396186501a9695954cd8':
Cleaning up some more flakiness in DownloadManager tests.
2010-11-01 17:44:13 -07:00
Neal Nguyen
815a6bc0cf
am bd06f02d: Cleaning up some more flakiness in DownloadManager tests.
...
* commit 'bd06f02d02e07ca15e420ee9e50e35253646ba64':
Cleaning up some more flakiness in DownloadManager tests.
2010-11-01 17:41:24 -07:00
Jamie Gennis
d17f110351
Merge "Stop using OMX_COLOR_FormatAndroidPrivateStart."
2010-11-01 17:16:50 -07:00
Nicolas Roard
7061c2493e
Merge "Update layers only"
2010-11-01 16:58:01 -07:00
Chet Haase
407da3556e
Merge "Fixed null deref when view parent null during invalidation"
2010-11-01 16:56:15 -07:00
Joe Malin
91d1744529
am ea8400b4: (-s ours) am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
...
* commit 'ea8400b448a01e417e583ef554fc2b3f3072deec':
DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
2010-11-01 16:33:56 -07:00
Joe Malin
d9f82fa280
am a7fda21c: DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
...
* commit 'a7fda21c8298d8f316564280d702206147207005':
DO NOT MERGE: Doc Change: Documentation for MonkeyRunner tool
2010-11-01 16:30:59 -07:00
Andreas Huber
bfe3783833
Merge "Notify surfaceflinger about (changes to) the crop rectangle output by the decoder."
2010-11-01 16:25:08 -07:00
Mike Lockwood
403aa9f679
Merge "MTP: Changes to support /mnt/sdcard paths from MediaProvider."
2010-11-01 16:18:29 -07:00
Xavier Ducrohet
38d0d0d110
Merge "Layoutlib Canvas and Paint implementation through native delegates"
2010-11-01 16:17:06 -07:00
Jason Sams
2be7921a43
Merge "Fix race condition in resize that was created when GetType for allocation and Types became async."
2010-11-01 16:13:55 -07:00
Dan Bornstein
8b7046eee8
am ab1b304b: am ccb75a88: Merge "Update the API file." into gingerbread
...
* commit 'ab1b304bd4cf0bb6473b21d5604596105b794362':
Update the API file.
2010-11-01 16:12:38 -07:00
Dan Bornstein
4c5bcb1892
am ccb75a88: Merge "Update the API file." into gingerbread
...
* commit 'ccb75a882f670f8928f13a485c0c29b8b8b93af3':
Update the API file.
2010-11-01 16:09:44 -07:00
Dan Bornstein
6a91efdb87
Merge "Update the API file." into gingerbread
2010-11-01 16:08:14 -07:00
Joe Malin
95ad9ac961
Merge "Doc Change: Documentation for MonkeyRunner tool"
2010-11-01 16:06:19 -07:00
Scott Main
72b14a9101
am e06bdead: am fea07c60: am eda78cea: docs: update dashboard
...
* commit 'e06bdead5decc26c7fd7ed9b10ad0f009e14d274':
docs: update dashboard
2010-11-01 16:03:14 -07:00
Scott Main
10c5f8f100
am fea07c60: am eda78cea: docs: update dashboard
...
* commit 'fea07c60963abc5caaf5a59b99936d79aa9fc1b9':
docs: update dashboard
2010-11-01 16:00:43 -07:00
Gloria Wang
1c0a8c314f
Merge "Media scanner support for FL(Forward Lock) DRM file types"
2010-11-01 15:57:47 -07:00
Scott Main
663217c6d0
am eda78cea: docs: update dashboard
...
* commit 'eda78ceaffb234c37b11e69602d020e4bb28ca83':
docs: update dashboard
2010-11-01 15:57:38 -07:00
Chris Tate
8c2a2bbc7a
Merge "Don't crash bmgr if there are no available restore sets"
2010-11-01 15:53:45 -07:00
Leon Scroggins
fbb0691d77
Merge "Merge commit '55381217' into manualmerge"
2010-11-01 15:16:24 -07:00
Jeff Brown
6bb0e226b5
Merge "Fix policy issues when screen is off."
2010-11-01 15:13:10 -07:00
Jason Sams
40492421bd
Merge "Add code to mark functions rather than whole files as threadable."
2010-11-01 15:10:09 -07:00
Jaikumar Ganesh
6d91ce50e8
Merge "Disconnect PAN and Input devices on BT disable."
2010-11-01 15:06:05 -07:00
Adam Powell
fe33dad68c
Merge "Fix a find and replace bug in Theme.IconMenu"
2010-11-01 15:02:13 -07:00
Leon Scroggins
926f9efad4
Merge commit '55381217' into manualmerge
...
Conflicts:
core/java/android/webkit/WebView.java
Change-Id: I1e93881a55c1d81c1142db03498c68196649b69c
2010-11-01 18:00:55 -04:00
Jeff Brown
fd749c63b0
Fix policy issues when screen is off.
...
Rewrote interceptKeyBeforeQueueing to make the handling more systematic.
Behavior should be identical except:
- We never pass keys to applications when the screen is off and the keyguard
is not showing (the proximity sensor turned off the screen).
Previously we passed all non-wake keys through in this case which
caused a bug on Crespo where the screen would come back on if a soft key
was held at the time of power off because the resulting key up event
would sneak in just before the keyguard was shown. It would then be
passed through to the dispatcher which would poke user activity and
wake up the screen.
- We propagate the key flags when broadcasting media keys which
ensures that recipients can tell when the key is canceled.
- We ignore endcall or power if canceled (shouldn't happen anyways).
Changed the input dispatcher to not poke user activity for canceled
events since they are synthetic and should not wake the device.
Changed the lock screen so that it does not poke the wake lock when the
grab handle is released. This fixes a bug where the screen would come
back on immediately if the power went off while the user was holding
one of the grab handles because the sliding tab would receive an up
event after screen turned off and release the grab handles.
Fixed a couple of issues where media keys were being handled inconsistently
or not at all, particularly in the case of the new PAUSE, PLAY
and RECORD keys.
Bug: 3144874
Change-Id: Ie630f5fb6f128cfdf94845f9428067045f42892c
2010-11-01 15:00:25 -07:00
Dianne Hackborn
7b425df5c1
Merge "Various PreferenceActivity and related improvement."
2010-11-01 14:54:32 -07:00
Leon Scroggins
a61c53dfe5
am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
...
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
Update insertion handler for WebTextView.
2010-11-01 14:51:00 -07:00
Leon Scroggins
fd2ddb4c43
Merge "Update insertion handler for WebTextView." into gingerbread
2010-11-01 14:49:47 -07:00
Wink Saville
6e2b38a79c
Merge "Add PhoneStateListener.onOtaspChanged."
2010-11-01 14:47:38 -07:00
Jason Sams
19adfe081e
Merge "Remove excessive logging."
2010-11-01 14:28:57 -07:00
Chet Haase
0d8aaea70d
Merge "Performance optimizations for animations and toolkit"
2010-11-01 13:53:31 -07:00
Jean-Baptiste Queru
1fbfce4244
am 41c73884: am 5b4d0e84: Merge "TabWidget orientation"
...
* commit '41c738849c1fdf29357048ec9f5e48143dbb026a':
TabWidget orientation
2010-11-01 13:33:46 -07:00
Jean-Baptiste Queru
39fc718490
am 5b4d0e84: Merge "TabWidget orientation"
...
* commit '5b4d0e84d314bd58efb9dcf4e7f23f0d0e3fc630':
TabWidget orientation
2010-11-01 13:30:49 -07:00
Jean-Baptiste Queru
86b2b99f9d
Merge "TabWidget orientation"
2010-11-01 13:19:02 -07:00
Dianne Hackborn
70be9dfbe9
am ce0f9e4e: am 42679cea: Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
...
* commit 'ce0f9e4e4f38ab2a674f3ec22c1749eddbf765ba':
Fix issue #3152415 : Various confusions in docs about Application
2010-11-01 12:52:36 -07:00
Dianne Hackborn
cc3af429d8
am 42679cea: Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
...
* commit '42679cea5d8bc4b235b290b97805b86c8c7cbca5':
Fix issue #3152415 : Various confusions in docs about Application
2010-11-01 12:49:51 -07:00
Dianne Hackborn
2ee26e2cf4
Merge "Fix issue #3152415 : Various confusions in docs about Application" into gingerbread
2010-11-01 12:47:02 -07:00
Joe Onorato
8afcfdc725
Merge "Long press on menu no longer opens the IME."
2010-11-01 12:28:19 -07:00
Ben Komalo
c054247b85
Merge "Minor Javadoc fix."
2010-11-01 12:11:26 -07:00
Jean-Baptiste Queru
7e03633841
am ce128ae6: am b6db2d51: Merge "Bluetooth OBEX timeout problem."
...
* commit 'ce128ae66dc6d430aad09ad920133bc040d834c8':
Bluetooth OBEX timeout problem.
2010-11-01 10:55:49 -07:00
Jean-Baptiste Queru
4188d55474
am b6db2d51: Merge "Bluetooth OBEX timeout problem."
...
* commit 'b6db2d5125511284ee0962dd85d9be0099e51b22':
Bluetooth OBEX timeout problem.
2010-11-01 10:53:09 -07:00
Brian Carlstrom
8603388a2b
Merge "Change SamplingProfiler to use a sampling interval instead of Hz"
2010-11-01 10:47:45 -07:00
Jean-Baptiste Queru
d37761cfd9
Merge "Bluetooth OBEX timeout problem."
2010-11-01 10:46:36 -07:00