Merge commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837' into eclair-plus-aosp
* commit 'fe225e25bda5d48eaa67d1fd3fb877de6c40e837':
Fix the selection of locale from SIM mcc.
Merge commit '090c60bb9d6608df4a8d753fc91974fe2c49c262' into eclair-plus-aosp
* commit '090c60bb9d6608df4a8d753fc91974fe2c49c262':
AudioFlinger: delete Track object when createTrack() fails due to lack of tracks in AudioMixer.
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-plus-aosp
* commit '2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Merge commit '93572eef41f94f023037482f194db0ab07d0c33a' into eclair-plus-aosp
* commit '93572eef41f94f023037482f194db0ab07d0c33a':
More log for issue 2242381.
Merge commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f' into eclair-plus-aosp
* commit 'ba8eb1efefdc98c016b64e10c26f9729697f254f':
Use SystemClock.elapsedRealtime() instead of sensor timestamp
Merge commit '17479ebe90a5ebd17ee386b8fd83256765afce0b' into eclair-plus-aosp
* commit '17479ebe90a5ebd17ee386b8fd83256765afce0b':
Ignore the light sensor if the screen is turning off.
Merge commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc' into eclair-plus-aosp
* commit '3f857b78fc68e5d700139bdc6078c5333b62a9bc':
Allow a GLThread to release and reacquire the EGL Surface as needed.
Merge commit '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-plus-aosp
* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
Do not apply light sensor debounce logic while the light sensor is still warming up.
when processing light and proximity events.
This should fix loss of 2 second hysterisis for light sensor (b/2243521)
Change-Id: Ia3ce331e67d803eb5e51810cb7161b7c528312d7
Signed-off-by: Mike Lockwood <lockwood@android.com>
Fixes bug b/2202165. The light sensor was interfering with the screen off animation.
Change-Id: I1bc566a164af689b60b066e6cb3dcbf7959bc50a
Signed-off-by: Mike Lockwood <lockwood@android.com>
To prevent buggy command implementations from poisoning binder threads'
scheduling class & priority for future command execution, we now reset the
cgroup and thread priority to foreground/normal when a binder service thread
finishes executing the designated command.
Change-Id: Ibc0ab2485751453f6dc96fdb4eb877fd02796e3f
We currently only allow one GLThread to have an active EGL Surface at a
time.(This may be lifted in the future, when EGL and GL are reentrant.)
Prior to this change we would enforce this rule by having older GLThreads
quit when a new GLThread started. That had the drawback of leaving the
older GLSurfaceViews in a zombie state -- their GLThreads would be
gone.
We now enforce this rule by just releasing and reacquiring the EGL surface
context as needed.
Specific changes to the code:
created private helper methods - startEgl and stopEgl to help manage
starting and stopping EGL.
Move the calls to sGLThreadManager start and end from the outermost run
method into the startEgl / stopEgl methods.
Reworked the wait loop to handle starting and stopping EGL as needed.
needToWait() gets simpler -- just looks at current status.
sGLThreadManager.shouldQuit was replaced by shouldHaveEgl.
This is another step in fixing bug 2228262.
This allows us to adjust immediately when we receive a correct light sensor reading
after the screen turns on.
Change-Id: I627047365640761727348e577c9164a6d6be2772
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-plus-aosp
* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
Remove "@hide pending API council" in webkit to expose
the apis to SDK.
Remove @hide in GeolocationPermissions and WebStorage
to expose them to the SDK users.
Remove @hide for freeMemory() in WebView.
Remove @hide comment in CallbackProxy and
GoogleLocationSettingManager as they are not public class.
Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-plus-aosp
* commit '638d86535264b24b54698fca7e18e68571fe0bad':
Expose WallpaperSettingsActivity in the public API.
Merge commit '45dd12cb0834ea5d72872a6d5b3095f3af152434' into eclair-plus-aosp
* commit '45dd12cb0834ea5d72872a6d5b3095f3af152434':
fix [2243164] live wallpaper screen artifacts at end of boot
The code intended to copy the old value of a field, before the
field was updated. However, what the code was actually doing was
copying the new value of the field, after the field was updated.
The fix was to move the copy to before the update.
This is work towards fixing bug 2228262
Merge commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b' into eclair-plus-aosp
* commit '1edbc1a12c7ecff267e4b94b74222f980af9de6b':
docs: add new document for the win usb driver;
Merge commit '0e08055aa31c752732005fc48b09ee470a2c4822' into eclair
* commit '0e08055aa31c752732005fc48b09ee470a2c4822':
docs: add new document for the win usb driver;
Merge commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3' into eclair-plus-aosp
* commit '7ab900edd69324e5eeb2c6b01ef3ef5e836689a3':
Hold a lock while we access the preview heap.
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-plus-aosp
* commit '2b3970a2956152a508254aa2675b68df363d46c1':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.