Merge commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909'
* commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909':
add an accessor for Context for use by subclasses
Merge commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6' into eclair-plus-aosp
* commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6':
add an accessor for Context for use by subclasses
* Other changes
+ Re-assign err codes in VpnManager.
+ Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
+ Delete the state file only if it exists (to prevent logging an
unable-to-unlink error).
+ Extend timeout to 40 seconds.
Merge commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015'
* commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
Merge commit '1005569fbb459007ff9d9fddbfa6e49947166166' into eclair-plus-aosp
* commit '1005569fbb459007ff9d9fddbfa6e49947166166':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
Merge commit '1a66583feafb2cdb90d23306dd7bbd4f2539d389'
* commit '1a66583feafb2cdb90d23306dd7bbd4f2539d389':
Apparently setting the preferred role of the OMX component is now required on this platform.
Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp
* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
Apparently setting the preferred role of the OMX component is now required on this platform.
Add new manifest/aapt support for specifying device features an application
requires. The aapt badging now returns these (as well as uses-permission since
I need to look for those anyway); if an app doesn't explicitly request the
camera feature but does request the permission, then aapt will say that it has
requested both the basic camera feature as well as the autofocus feature.
Here's what you put in your manifest to say you need a camera but don't need
autofocus:
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
Here's what will be seen from aapt:
uses-permission:'android.permission.CAMERA'
uses-feature:'android.hardware.camera'
uses-feature-not-required:'android.hardware.camera.autofocus'
Change-Id: I4dd19cee0486cc54771f5bf14fc9db0e892115d5
Merge commit 'd5181adf0f6da705a39987f3271d2833f2136a08'
* commit 'd5181adf0f6da705a39987f3271d2833f2136a08':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit 'bfa1d083aac92a8fc315e18a381287108b138baf' into eclair-plus-aosp
* commit 'bfa1d083aac92a8fc315e18a381287108b138baf':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit '6f664bd89da4c9a3fdbee7ad784750cd868e4b41'
* commit '6f664bd89da4c9a3fdbee7ad784750cd868e4b41':
Fix issue #2069662: The wallpaper doesn't move along with the home screen
Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp
* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
Squashed commit of the following:
Merge commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5' into eclair-plus-aosp
* commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5':
Fix issue #2069662: The wallpaper doesn't move along with the home screen
commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:48:54 2009 -0700
Getting rid of more code now obsolete with the departure of OMXDecoder.
commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date: Thu Aug 27 14:33:06 2009 -0700
Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
Merge commit 'fa5260290f3c19988c292f21845a948374c3c31d' into eclair-plus-aosp
* commit 'fa5260290f3c19988c292f21845a948374c3c31d':
Final Donut API list.
Merge commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37'
* commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37':
Don't activate keyguard if screen is turned off while proximity sensor is active.
Merge commit '1305547fc59120b281609f7d68d8ff21af66df5a'
* commit '1305547fc59120b281609f7d68d8ff21af66df5a':
Don't activate keyguard if screen is turned off while proximity sensor is active.
Merge commit '38c00992e083d73b5c0ead154c6a1b5add42661d'
* commit '38c00992e083d73b5c0ead154c6a1b5add42661d':
Increase vibrate duration on vkey haptics so they can be felt.
Merge commit '6391830d103ccb19465c69660065c22c2711dcfd' into eclair-plus-aosp
* commit '6391830d103ccb19465c69660065c22c2711dcfd':
Don't activate keyguard if screen is turned off while proximity sensor is active.
Merge commit 'e1ecb7dfe976080ae2b8fef26e1e68668c7ca8fb'
* commit 'e1ecb7dfe976080ae2b8fef26e1e68668c7ca8fb':
Only allow system code to call LocationManager.sendNiResponse()
