Commit Graph

1561 Commits

Author SHA1 Message Date
Android (Google) Code Review
54f2422b48 am fd445d3: Merge change 1095 into donut
Merge commit 'fd445d3510cddc7a67cf7720935626684a2f3011'

* commit 'fd445d3510cddc7a67cf7720935626684a2f3011':
  gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 15:48:58 -07:00
The Android Open Source Project
56b7eeaa01 manual merge f3af740bdf
Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
2009-05-06 15:48:33 -07:00
The Android Open Source Project
761daf7550 manual merge for b9c9d260f2
Merge commit 'b9c9d260f21b321527c4622a123af9767630d94d'
2009-05-06 15:43:48 -07:00
Android (Google) Code Review
fd445d3510 Merge change 1095 into donut
* changes:
  gps: Move GPS scheduling from libgps to GpsLocationProvider.
2009-05-06 11:58:27 -07:00
Mike Lockwood
29c84340a1 gps: Move GPS scheduling from libgps to GpsLocationProvider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-06 14:52:25 -04:00
Eric Laurent
f3af740bdf Fixed issue 1709450: Requirements for CDMA Tone Generator
Added new tone types for CDMA IS-95 specific tones.
Automatic selection between IS-95, CEPT and JAPAN version base on operator
country code for call supervisory tones.
Also improved tone generator capabilities:
- Each tone segment can now generate its own set of frequencies
- A tone does not have to be a succession of alternating ON/OFF segments
- The sequence repetition does not have to start from first segment
2009-05-06 11:35:46 -07:00
Android (Google) Code Review
d5aa122b37 Merge change 1079
* changes:
  Fix [Issue 1835218]
2009-05-06 11:31:10 -07:00
Android (Google) Code Review
1be24353ef Merge change 1058
* changes:
  Put three tests in ignore test list.
2009-05-06 10:56:45 -07:00
Dianne Hackborn
534032610c Fix [Issue 1835218]
IllegalStateException already initialized in SyncStorageEngine.init
I used the wrong column name for the new account type.
2009-05-06 10:53:37 -07:00
Eric Laurent
b9c9d260f2 fix issue 1713090: After a Bluetooth call, MusicPlayer starts playing on speaker rather than wired external audio.
Temporary fix until audio routing is refactored in Eclair release:
- centralized and synchronized all audio routing control in AudioService.setRouting()
- deprecated AudioManager.setRouting() and AudioManager.getRouting() methods
2009-05-06 10:52:19 -07:00
Android (Google) Code Review
8f0e556bb4 Merge change 1074
* changes:
  fix the sim build.  disables the tests for now.
2009-05-06 09:56:55 -07:00
Joe Onorato
7fca565135 fix the sim build. disables the tests for now. 2009-05-06 12:55:46 -04:00
Android (Google) Code Review
f722b32822 Merge change 645
* changes:
  Allow ViewStub to be used in AdapterView.setEmptyView() (bug 1803058)
2009-05-06 09:38:37 -07:00
Android (Google) Code Review
f431b4b3ee am c770ed8: Merge change 1069 into donut
Merge commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95'

* commit 'c770ed8a6bb7614ed4a85a672e4e6830bed19a95':
  GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
2009-05-06 08:20:03 -07:00
Android (Google) Code Review
c770ed8a6b Merge change 1069 into donut
* changes:
  GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
2009-05-06 08:06:35 -07:00
Mike Lockwood
b7c4ae91d9 GpsStatus: Increase NUM_SATELLITES to 255 for future compatibility.
64 satellties are required for NavStar, WAAS, EGNOS, and GLONASS satellites.
Increasing to 255 allows for future compatibility with Galileo.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-06 10:48:30 -04:00
Mihai Preda
b6af533114 Allow ViewStub to be used in AdapterView.setEmptyView() (bug 1803058) 2009-05-06 11:48:11 +02:00
Tammo Spalink
84c9097d5b am d2b124f: new cdma sms unit tests (from QC on-site test)
Merge commit 'd2b124f97c52c566b68aff9fa58306f461686af0'

* commit 'd2b124f97c52c566b68aff9fa58306f461686af0':
  new cdma sms unit tests (from QC on-site test)
2009-05-06 01:31:33 -07:00
Android (Google) Code Review
0f2200ec68 am be3ac2d: Merge change 1040 into donut
Merge commit 'be3ac2d5ba8ef93c3cbf4d05edaf3434a14df2c9'

* commit 'be3ac2d5ba8ef93c3cbf4d05edaf3434a14df2c9':
  Add a test app for the backup
2009-05-06 01:31:32 -07:00
Android (Google) Code Review
b61381bc94 am 4488b11: Merge change 1039 into donut
Merge commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4'

* commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4':
  Add some C++ code to do raw files for backup
2009-05-06 01:31:32 -07:00
Android (Google) Code Review
0d8f5a3f4f am e556248: Merge change 1017 into donut
Merge commit 'e556248e859e7197d5f97c6c0724806d5913da24'

* commit 'e556248e859e7197d5f97c6c0724806d5913da24':
  Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
2009-05-06 01:31:31 -07:00
The Android Open Source Project
2e74b159f5 merge dccc39b to make automerger happy, original change 231cc6 was already merged
Merge commit 'dccc39b'
2009-05-06 01:27:30 -07:00
Dianne Hackborn
7a13559501 merged 231cc608d0 2009-05-06 00:28:37 -07:00
Tammo Spalink
d2b124f97c new cdma sms unit tests (from QC on-site test) 2009-05-06 15:05:45 +08:00
Feng Qian
89ac33b621 Put three tests in ignore test list.
Two are very slow regexp tests, one always causes OOM.
2009-05-05 22:53:42 -07:00
Android (Google) Code Review
be3ac2d5ba Merge change 1040 into donut
* changes:
  Add a test app for the backup
2009-05-05 18:58:05 -07:00
Android (Google) Code Review
4488b11c51 Merge change 1039 into donut
* changes:
  Add some C++ code to do raw files for backup
2009-05-05 18:58:01 -07:00
Android (Google) Code Review
e556248e85 Merge change 1017 into donut
* 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.
2009-05-05 18:46:51 -07:00
Joe Onorato
f9225f89aa Add a test app for the backup 2009-05-05 18:34:31 -07:00
Yu Shan Emily Lau
c1b80cb7e3 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.
2009-05-05 17:29:53 -07:00
Android (Google) Code Review
39a8bb2632 am 3ed8b3d: Merge change 1018 into donut
Merge commit '3ed8b3dc42800068951332aea024f9737c25a0ed'

* commit '3ed8b3dc42800068951332aea024f9737c25a0ed':
  If no battery stats are found, return status_unknown
2009-05-05 16:18:25 -07:00
Android (Google) Code Review
dccc39b17a Merge change 777 into donut
* changes:
  Rewrite SyncStorageEngine to use flat files and in-memory data structures.
2009-05-05 16:17:25 -07:00
Android (Google) Code Review
3ed8b3dc42 Merge change 1018 into donut
* changes:
  If no battery stats are found, return status_unknown
2009-05-05 16:15:53 -07:00
Rebecca Schultz Zavin
e7e6fa3fbf 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>
2009-05-05 16:15:36 -07:00
Christopher Tate
17ac18e280 am f417247: Further development of backup file handling
Merge commit 'f417247fa68524f2f34960f7389168eed7eb4a88'

* commit 'f417247fa68524f2f34960f7389168eed7eb4a88':
  Further development of backup file handling
2009-05-05 16:14:39 -07:00
Christopher Tate
f417247fa6 Further development of backup file handling
Put backup data in flight into /cache
    Close the files and delete the intermediates after backup pass
2009-05-05 15:50:03 -07:00
Dianne Hackborn
231cc608d0 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
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.
2009-05-05 15:40:53 -07:00
Android (Google) Code Review
f8e0169b78 am 06d9602: Merge change 1000 into donut
Merge commit '06d96020c35dac2bf1651cb8bd4cfced911f1142'

* commit '06d96020c35dac2bf1651cb8bd4cfced911f1142':
  Ignore layout bin directories in git.
2009-05-05 13:47:39 -07:00
Joe Onorato
3ad977b41c Add some C++ code to do raw files for backup 2009-05-05 13:45:25 -07:00
Android (Google) Code Review
06d96020c3 Merge change 1000 into donut
* changes:
  Ignore layout bin directories in git.
2009-05-05 13:45:05 -07:00
Raphael
33fbd3bee0 Ignore layout bin directories in git. 2009-05-05 12:39:28 -07:00
Scott Main
092578c8c1 am ad5aaea: am 0c11b99: AI 148308: revise aidl support documentation --
Merge commit 'ad5aaea2c5bda0a73c1bc0ae99f17f700e952907'

* commit 'ad5aaea2c5bda0a73c1bc0ae99f17f700e952907':
  AI 148308: revise aidl support documentation -- now the same in all environments;
2009-05-05 11:28:30 -07:00
Scott Main
ad5aaea2c5 am 0c11b99: AI 148308: revise aidl support documentation -- now the same
Merge commit '0c11b990908df26aca7f017d330535b9bf21a903' into donut

* commit '0c11b990908df26aca7f017d330535b9bf21a903':
  AI 148308: revise aidl support documentation -- now the same in all environments;
2009-05-05 11:25:38 -07:00
Scott Main
0c11b99090 AI 148308: revise aidl support documentation -- now the same in all environments;
also added a table of contents and tweaked the markup for the anchor links
  BUG=1760241

Automated import of CL 148308
2009-05-05 11:23:54 -07:00
Android (Google) Code Review
449ea2b628 am 0c0221b: Merge change 972 into donut
Merge commit '0c0221b86b518630f8210060438bc31433e175f9'

* commit '0c0221b86b518630f8210060438bc31433e175f9':
  Back-merge all changes done in master to DumpRenderTree to donut.
2009-05-05 11:16:46 -07:00
Android (Google) Code Review
0c0221b86b Merge change 972 into donut
* changes:
  Back-merge all changes done in master to DumpRenderTree to donut.
2009-05-05 11:16:17 -07:00
Christopher Tate
3cbab32afe am 22b8787: Squashed commit of the following:
Merge commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425'

* commit '22b8787ed4be8d4b7ed5d54802f9913fedb41425':
  Squashed commit of the following:
2009-05-05 10:51:45 -07:00
Android (Google) Code Review
545ac3a040 Merge change 970
* changes:
  fix the bug of testStartupTime in MediaPlayerPerformance test throws exception for an existing table
2009-05-05 10:23:05 -07:00
Guang Zhu
b933f669e2 Back-merge all changes done in master to DumpRenderTree to donut. 2009-05-05 01:02:14 -07:00
Xia Wang
568d91bddc fix the bug of testStartupTime in MediaPlayerPerformance test throws exception for an existing table 2009-05-04 20:30:04 -07:00