Merge commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4'
* commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4':
Add some C++ code to do raw files for backup
Merge commit 'e556248e859e7197d5f97c6c0724806d5913da24'
* commit 'e556248e859e7197d5f97c6c0724806d5913da24':
Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
* changes:
Changes in mediaframework test for the OpenCore 2.0 integration. Changes included: 1) The default value for the metatData 2) Add the videoSizedChange callback to get the video dimension Added the test cases for the async reset callback test case for the Qualcomm new realease.
1) The default value for the metatData
2) Add the videoSizedChange callback to get the video dimension
Added the test cases for the async reset callback test case for the Qualcomm new realease.
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
The previous implementation used a database for storing all of its state, which could cause
a significant amount of IO activity as its tables were updated through the stages of a sync.
This new implementation replaces that in-memory data structures, with hand-written code
for writing them to persistent storage.
There are now 4 files associated with this class, holding various pieces of its state that
should be consistent. These are everything from a main XML file of account information that
must always be retained, to a binary file of per-day statistics that can be thrown away at
any time. Writes of these files as scheduled at various times based on their importance of
the frequency at which they change.
Because the database no longer exists, there needs to be a new explicit interface for
interacting with the sync manager database. This is provided by new APIs on IContentService,
with a hidden method on ContentResolver to retrieve the IContentService so that various
system entities can use it. Other changes in other projects are required to update to the
new API.
The goal here is to have as little an impact on the code and functionality outside of
SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
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.
