ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
16,293 Commits 2 Branches 0 Tags 54 MiB
81b8296fe7
Commit Graph

16293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
3e4afc7874 am 9efc829e: am 4e544e81: Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken 2010-05-14 12:11:13 -07:00
Nick Kralevich
7d99042a0e am 4e544e81: Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken 2010-05-14 12:09:02 -07:00
Chih-Chung Chang
fedb03960d am 9c192e44: am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken 2010-05-14 12:08:24 -07:00
Nick Kralevich
d76c034794 Merge "Forgot to fix one -Wformat-security in my previous change. Fixed." into kraken 2010-05-14 12:07:05 -07:00
Chih-Chung Chang
47b94d977e am 29f5d9b6: Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken 2010-05-14 12:06:16 -07:00
Chih-Chung Chang
1a03efaa17 Merge "Fix deadlock if the last reference of ICameraClient is removed in ICamera::connect()" into kraken 2010-05-14 12:05:06 -07:00
Scott Main
f29ba85b53 am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 2010-05-14 11:59:04 -07:00
Scott Main
6a0be217df am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 2010-05-14 11:57:46 -07:00
Scott Main
c297cbfb2b am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken

* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
  docs: add dev guide for backup
 2010-05-14 11:56:14 -07:00
Scott Main
62cabab267 am b83a283a: docs: add dev guide for backup 
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp

* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
  docs: add dev guide for backup
 2010-05-14 11:53:44 -07:00
Ray Chen
b6670aade5 am f4ca2ad0: am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/sdcard\' in camera related codes." into kraken 2010-05-14 11:51:38 -07:00
Ray Chen
a7d6a6e1b3 am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded \'/sdcard\' in camera related codes." into kraken 2010-05-14 11:50:19 -07:00
Ray Chen
c58bb54070 Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes." into kraken 2010-05-14 11:48:45 -07:00
Jean-Baptiste Queru
d181206cab Merge "SetLocaleByCarrier, only if its not an unknown carrier." 2010-05-14 11:39:06 -07:00
Dianne Hackborn
7a791bd896 Merge "More fragment stuff:" 2010-05-14 11:26:40 -07:00
Adam Powell
f6de5cdda0 Merge "ActionBar - custom navigation views" 2010-05-14 11:03:58 -07:00
James Dong
070dba59e8 am 612058d1: am 9db798d0: Audio/video initial recording time synchronization 2010-05-14 10:55:52 -07:00
James Dong
c80beac3f2 am 9db798d0: Audio/video initial recording time synchronization 2010-05-14 10:54:23 -07:00
James Dong
d2d01a5450 am 8b3611ee: am 1824486e: Handle recording file size and/or duration limit 2010-05-14 10:53:02 -07:00
James Dong
9f67e297d7 am 1824486e: Handle recording file size and/or duration limit 2010-05-14 10:51:35 -07:00
Nick Kralevich
e8de8f47c6 Forgot to fix one -Wformat-security in my previous change. Fixed. 
Change-Id: Ice7459b30e1d7dbfe400b68d27ebc04fcca78bae
 2010-05-14 10:29:13 -07:00
The Android Open Source Project
098874ee4a am 63c93077: am 21a534d9: am 1d628c5d: merge from open-source master 2010-05-14 09:49:52 -07:00
The Android Open Source Project
32d00cb4a4 am 21a534d9: am 1d628c5d: merge from open-source master 2010-05-14 09:48:12 -07:00
The Android Open Source Project
5b803f0865 am 1d628c5d: merge from open-source master 
Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken

* commit '1d628c5d3dd7998b29c339292a2dc391015d0782':
  Accept media files by file extension in case insensitive manner.
 2010-05-14 09:46:11 -07:00
The Android Open Source Project
f614ba9a79 merge from open-source master 
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
 2010-05-14 09:44:36 -07:00
Eric Laurent
39cdd9c194 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
39ca34479d 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
9f6d082b43 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
4bfd3a78fe 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
8d95f81e7a am ead68d5c: Merge "Remove libdrm2. This code appears to be unused." into kraken 2010-05-14 09:34:25 -07:00
Nick Kralevich
a60221223a Merge "Remove libdrm2. This code appears to be unused." into kraken 2010-05-14 09:32:45 -07:00
The Android Open Source Project
0a2f333fcf am f7c12cf5: am db20eeb2: am 9167ba50: merge from open-source master 2010-05-14 09:19:03 -07:00
The Android Open Source Project
d258045541 am db20eeb2: am 9167ba50: merge from open-source master 2010-05-14 09:17:22 -07:00
Nick Kralevich
9d7e73ce18 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
f2abe4c093 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
5fdc799559 am 1e4dc54d: Get rid of warnings when compiled with -Wformat-security 2010-05-14 09:14:34 -07:00
The Android Open Source Project
d69ec09f47 merge from open-source master 
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
 2010-05-14 09:11:31 -07:00
Nick Kralevich
df325c5325 Get rid of warnings when compiled with -Wformat-security 
Change-Id: Ibd814d894ff0eba26b01932b9865098b7bb26f95
 2010-05-14 09:06:55 -07:00
Jean-Baptiste Queru
a7b36de932 Merge "Accept media files by file extension in case insensitive manner." 2010-05-14 09:06:43 -07:00
Ben Murdoch
322d5a04aa 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
Eric Laurent
e151216d38 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
598372ea03 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
Dirk Dougherty
3ea3aa2984 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
ec8de64c62 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
73e1599b0e 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
dee7dcb4c3 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
5d7fd1ae90 am 86c74a2f: am d91ac162: am d317edab: am a0711e7b: Doc change: Add compatibility article. 2010-05-13 21:31:54 -07:00
Dirk Dougherty
32374efa5f Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:31:10 -07:00
Dirk Dougherty
9346c1a4bd am d91ac162: am d317edab: am a0711e7b: Doc change: Add compatibility article. 2010-05-13 21:30:19 -07:00
Dirk Dougherty
fbbeb9b62b 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