Merge commit '3ed8b3dc42800068951332aea024f9737c25a0ed'
* commit '3ed8b3dc42800068951332aea024f9737c25a0ed':
If no battery stats are found, return status_unknown
If the battery files can't be found return status_unkown instead of an
error. On systems where we haven't brought up battery stats yet they
assume the battery is dead and turn off as soon as the runtime starts
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Merge commit 'f417247fa68524f2f34960f7389168eed7eb4a88'
* commit 'f417247fa68524f2f34960f7389168eed7eb4a88':
Further development of backup file handling
Merge commit 'ad5aaea2c5bda0a73c1bc0ae99f17f700e952907'
* commit 'ad5aaea2c5bda0a73c1bc0ae99f17f700e952907':
AI 148308: revise aidl support documentation -- now the same in all environments;
Merge commit '0c11b990908df26aca7f017d330535b9bf21a903' into donut
* commit '0c11b990908df26aca7f017d330535b9bf21a903':
AI 148308: revise aidl support documentation -- now the same in all environments;
Merge commit '0c0221b86b518630f8210060438bc31433e175f9'
* commit '0c0221b86b518630f8210060438bc31433e175f9':
Back-merge all changes done in master to DumpRenderTree to donut.
Author: Christopher Tate <ctate@google.com>
Date: Mon May 4 16:38:11 2009 -0700
IBackupService now passes ParcelFileDescriptors rather than int fds
The outlines of backup state file / data file handling are now in place as well
in the BackupManagerService.
Author: Christopher Tate <ctate@google.com>
Date: Thu Apr 30 12:40:19 2009 -0700
Hide the backup stuff for now
Also adjust based on comments:
+ changed service intent string to conform to usage guidelines
+ only publish the IBackupService binder when invoked with the right
intent action
+ docs tweaks
Merge commit '636274185ed5ee75faf6ef4d84bbb7d5b0371248'
* commit '636274185ed5ee75faf6ef4d84bbb7d5b0371248':
Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately.
* changes:
Fixes 1830181. Tapping disabled items in a ListView would cause the framework to take a code path that wasn't resetting the mMotionCorrection variable if it had been previously set. This would force ListView to apply a scroll to its children even though it was unnecessary. This simple fix prevents the issue by resetting mMotionCorrection appropriately.
Merge commit '1ab6e21237fc9f436be002d4f3821fce963a0a2a'
* commit '1ab6e21237fc9f436be002d4f3821fce963a0a2a':
Let screenOrientation="behind" works as expected
Merge commit '724561cc20e259888986cbb0be2fdab4d142d869'
* commit '724561cc20e259888986cbb0be2fdab4d142d869':
Fixes external #2575 (http://code.google.com/p/android/issues/detail?id=2575). HorizontalScrollView was comparing the measured height of its child to its width.
Merge commit '7ff943673e48a912eb7cc5add08e206c2c25d68e'
* commit '7ff943673e48a912eb7cc5add08e206c2c25d68e':
Debug: Add setPropertiesOn(), and @hide it for now
Merge commit '5c6f93f1422647c7f914a15bfad00992685c3eac'
* commit '5c6f93f1422647c7f914a15bfad00992685c3eac':
AI 148270: remove references to AbsoluteLayout because it's been deprecated
Merge commit '6a1ae64f7735a3817713a223096bf8034f78a620'
* commit '6a1ae64f7735a3817713a223096bf8034f78a620':
Fix another HTML formatting in android.os.AsyncTask
Merge commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18' into donut
* commit 'eb086d60b2b3425dec37d41b059d9e9cadfbbd18':
AI 148270: remove references to AbsoluteLayout because it's been deprecated
Merge commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38'
* commit '7db486058cf4fce4be04e13d1ec6b7cf404d3e38':
Config: Add ConfigBuildFlags, and change it based on TARGET_BUILD_TYPE
