Merge commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015'
* commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
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 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37'
* commit 'fb8910f958e93b7ad0fcea89fdd1dd579a962b37':
Don't activate keyguard if screen is turned off while proximity sensor is active.
Merge commit '3d937945a60da48a383a5a3de37583b35abf9c11'
* commit '3d937945a60da48a383a5a3de37583b35abf9c11':
Change these string constants back to match donut.
Unfortunately we are stuck with the donut ones, can't change these in Eclair
to be the more correct names.
Change-Id: Id8aaa2e90cd21631b18a36bea3755a63d0e6d577
Merge commit 'eba188e21c752d98f03215eb15822bd39c462664'
* commit 'eba188e21c752d98f03215eb15822bd39c462664':
Various tweaks to try to improve low memory behavior.
Merge commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f'
* commit 'db978b1f8ddf2afb14a4ed795895c8849fecd13f':
Change fade to use a gradient from opaque color to transparent color.
Merge commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab'
* commit '07a0ba4dc9f395fd98cc64660c44fcc0eb3286ab':
Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
Merge commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b'
* commit '6a538f3fca8ec43e641936c480d1ab48b3a9c09b':
Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.
Merge commit '561aaedc0220db09d660c29d8237eb937373a7c1'
* commit '561aaedc0220db09d660c29d8237eb937373a7c1':
make sure that the sync thread is protected by a consistent lock
- Reduce the amount that we ask processes to GC after a significant
operation occurs, but introducing a minimum time between GCs and
using this in various ways to schedule them.
- Don't spam all of the processes with onLowMemory(). Now deliver
these using the same gc facility, so we do the processes one at a
time, and don't allow the same process to get this call more than
once a minute.
- Increase the time a service must run before we will reset its
restart delay to 30 minutes (from 10).
- Increase the restart delay multiplication factor from 2 to 4.
- Ensure that we don't restart more than one service every 10 seconds
(unless some external event causes a service's process to be started
for some other reason of course).
- Increase the amount of time that a service must run before we
decide to lower it to a background process.
And some other things:
- Catch IllegalArgumentException in ViewRoot like we do for no
resources to avoid the system process crashing.
- Fix a number of places where we were missing breaks between the
activity manager's message dispatch func(!!).
- Fix reason printed for processes in the background.
- Print the list of processing waiting to GC.
Merge commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb'
* commit 'c66f5ebf4231a25a3aa735a603196e74d40824eb':
Fix rare NPE due to key being delivered after activity is stopped. #2062930
