Eric Laurent
03bb2b9651
am 10fde074: am 9f0810e8: Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken
2010-05-14 09:42:57 -07:00
Eric Laurent
10fde074f2
am 9f0810e8: Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken
2010-05-14 09:40:42 -07:00
Eric Laurent
9f0810e8c7
Merge "AudioFlinger: rename variables to clarify reference to track channel count or channel mask" into kraken
2010-05-14 09:39:12 -07:00
Nick Kralevich
7a37849761
am b9381956: am ead68d5c: Merge "Remove libdrm2. This code appears to be unused." into kraken
2010-05-14 09:36:05 -07:00
Nick Kralevich
b9381956af
am ead68d5c: Merge "Remove libdrm2. This code appears to be unused." into kraken
2010-05-14 09:34:25 -07:00
Nick Kralevich
ead68d5cd6
Merge "Remove libdrm2. This code appears to be unused." into kraken
2010-05-14 09:32:45 -07:00
The Android Open Source Project
1443eddab6
am f7c12cf5: am db20eeb2: am 9167ba50: merge from open-source master
2010-05-14 09:19:03 -07:00
The Android Open Source Project
f7c12cf542
am db20eeb2: am 9167ba50: merge from open-source master
2010-05-14 09:17:22 -07:00
Nick Kralevich
3e913014d8
am 4db8471d: am 1e4dc54d: Get rid of warnings when compiled with -Wformat-security
2010-05-14 09:16:12 -07:00
The Android Open Source Project
db20eeb246
am 9167ba50: merge from open-source master
...
Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken
* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
Corrected debug message in WindowManager
Put the wifi status icon in the right place.
2010-05-14 09:15:41 -07:00
Nick Kralevich
4db8471d9f
am 1e4dc54d: Get rid of warnings when compiled with -Wformat-security
2010-05-14 09:14:34 -07:00
The Android Open Source Project
9167ba50e4
merge from open-source master
...
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
2010-05-14 09:11:31 -07:00
Nick Kralevich
1e4dc54d56
Get rid of warnings when compiled with -Wformat-security
...
Change-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95
2010-05-14 09:06:55 -07:00
Ben Murdoch
d1f5e9e5c0
Merge changes I8da1b801,Id88446d6,I82798d5a
...
* changes:
Merge Webkit at r58956: Update User agent with new WebKit version.
Merge Webkit at r58956: Update DRT FileFilter.
Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590
2010-05-14 08:17:51 -07:00
Mike Lockwood
8d3257a7dc
Move MTP code to the android namespace
...
Change-Id: I5da48038fd5e4cdeefaeba42cdc74eb588b3448d
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-05-14 10:10:36 -04:00
Eric Laurent
b0a0147f34
AudioFlinger: rename variables to clarify reference to track channel count or channel mask
...
Some variables and structure members should be renamed to reflect the fact that they contain the
number of channels in a track (channel count) or the actual channels used by a track (channel mask).
Especially member "channels" of track control block (struct audio_track_cblk_t) is actually the
number of channels (channels count).
Change-Id: I220c8dede9fc00c8a5693389e790073b6ed307b8
2010-05-14 05:45:46 -07:00
Steve Block
77b8e6149e
Merge "Change the default JS engine for Android-specific layout test results in DRT from JSC to V8"
2010-05-14 03:11:38 -07:00
Ben Murdoch
f4442311b8
Merge Webkit at r58956: Update User agent with new WebKit version.
...
Change-Id: I8da1b80114e71d6d7b208f794ee978f88f1b4bf5
2010-05-14 10:24:56 +01:00
Ben Murdoch
543f0c9fa4
Merge Webkit at r58956: Update DRT FileFilter.
...
Change-Id: Id88446d6210da81f10d0ae26170addae6595f2a7
2010-05-14 10:24:56 +01:00
Ben Murdoch
ccee910859
Merge Webkit at r58956: Plugin code has switched to C99 integer types. See http://trac.webkit.org/changeset/58590
...
Change-Id: I82798d5af062219a73864c3c3b59a217e882e2a5
2010-05-14 10:24:45 +01:00
Steve Block
c1d8651538
Change the default JS engine for Android-specific layout test results in DRT from JSC to V8
...
Change-Id: Idaf5602d7f45533058b0f43d66377b10b1e7d708
2010-05-14 09:26:24 +01:00
Jeff Hamilton
e26867793b
Remove the unused modification APIs from MockCursor. They shouldn't have been public in the first place.
...
Change-Id: I2932e5287f838f72acdc4c0c1fd5601ffa8c3f84
2010-05-13 23:44:10 -05:00
Jeff Hamilton
7cd51efcbd
Remove the deprecated cursor methods.
...
Change-Id: Ie3571fea9f36996c31c327240b11086f8cc487f0
2010-05-13 23:44:09 -05:00
Dirk Dougherty
93f8547dcf
am e0abb37a: am bfcbd9a9: am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
2010-05-13 21:37:49 -07:00
Dirk Dougherty
e0abb37a7b
am bfcbd9a9: am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
2010-05-13 21:36:17 -07:00
Dirk Dougherty
bfcbd9a9e1
am d48e0382: am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
...
Merge commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad' into kraken
* commit 'd48e0382c3db1827ccb79fe912d271d426dd46ad':
Doc change: adjustments for ndk feature description
2010-05-13 21:34:31 -07:00
Dirk Dougherty
d48e0382c3
am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo
...
Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp
* commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
Doc change: adjustments for ndk feature description
2010-05-13 21:32:21 -07:00
Dirk Dougherty
6500837c1c
am 86c74a2f: am d91ac162: am d317edab: am a0711e7b: Doc change: Add compatibility article.
2010-05-13 21:31:54 -07:00
Dirk Dougherty
fb473bb611
Merge "Doc change: adjustments for ndk feature description" into froyo
2010-05-13 21:31:10 -07:00
Dirk Dougherty
86c74a2f9f
am d91ac162: am d317edab: am a0711e7b: Doc change: Add compatibility article.
2010-05-13 21:30:19 -07:00
Dirk Dougherty
346930b74d
Doc change: adjustments for ndk feature description
...
Change-Id: I3eb35c3d5ad756b7fa71c256b531f262e7940d90
2010-05-13 21:28:45 -07:00
Dirk Dougherty
d91ac162d1
am d317edab: am a0711e7b: Doc change: Add compatibility article.
...
Merge commit 'd317edabe158312981eb73355f77c36566d89627' into kraken
* commit 'd317edabe158312981eb73355f77c36566d89627':
Doc change: Add compatibility article.
2010-05-13 21:28:34 -07:00
Dirk Dougherty
d317edabe1
am a0711e7b: Doc change: Add compatibility article.
...
Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp
* commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
Doc change: Add compatibility article.
2010-05-13 21:26:22 -07:00
Dirk Dougherty
a0711e7b39
Doc change: Add compatibility article.
...
Change-Id: Ie6671813eb88bc8cb92575726f8fcf69eb558d08
2010-05-13 21:22:44 -07:00
Jason Sams
1be97a80fa
Merge "Rename ProgramFragmentStore to ProgramStore."
2010-05-13 18:37:17 -07:00
Jason Sams
54db59c359
Rename ProgramFragmentStore to ProgramStore.
...
Change-Id: Ia8ad9ac856944838ced38a2f1e8f07387050bdfd
2010-05-13 18:35:01 -07:00
Andrew Sapperstein
8d9db8e4c7
Added getNumColumns function to GridView.java.
...
Change-Id: I1cec19c77d0ee47278d93c6b0a112edae777e4e9
2010-05-13 17:45:50 -07:00
James Dong
76922d2ff8
am 79dfb675: am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken
2010-05-13 16:43:17 -07:00
James Dong
79dfb67531
am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken
2010-05-13 16:41:50 -07:00
James Dong
ffd104a903
Merge "Remove dummy surface in CameraSource" into kraken
2010-05-13 16:40:19 -07:00
Joe Onorato
1b44ebda70
Merge "Put the wifi status icon in the right place."
2010-05-13 16:33:22 -07:00
Suchi Amalapurapu
4952aef1c5
am 8e8bb02f: am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
2010-05-13 16:09:30 -07:00
Suchi Amalapurapu
8e8bb02f3d
am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
2010-05-13 16:07:50 -07:00
Suchi Amalapurapu
3f5ed04f7f
am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
...
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken
* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
Fix 2672155
2010-05-13 16:05:54 -07:00
Suchi Amalapurapu
b63ea5f784
am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
...
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp
* commit 'c928a11e34678296511d5ea34582292be7368618':
Fix 2672155
2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34
Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo
2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070
Fix 2672155
...
Check the code path when enabling disabling packages.
Add unit test
Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
2010-05-13 15:48:39 -07:00
Nick Kralevich
f5523645a9
am c5fdcaa2: am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-13 15:39:02 -07:00
Nick Kralevich
c5fdcaa229
am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-13 15:37:16 -07:00
Nick Kralevich
cf67d18a1d
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-13 15:35:48 -07:00
