ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
15,510 Commits 2 Branches 0 Tags 54 MiB
302beca3a5
Commit Graph

15510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
302beca3a5 am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo 2010-05-14 13:51:42 -07:00
Dirk Dougherty
078418eccd am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo 
Merge commit '3d52305faa682366eb34c30892ddd2b390940048' into kraken

* commit '3d52305faa682366eb34c30892ddd2b390940048':
  Doc change: adjustments to the api changes description
 2010-05-14 13:49:56 -07:00
Dirk Dougherty
4505e88a52 am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo 2010-05-14 13:48:56 -07:00
Dirk Dougherty
1e588cfedc am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo 
Merge commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp

* commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e':
  Doc change: adjustments to the api changes description
 2010-05-14 13:48:04 -07:00
Dirk Dougherty
e5588e132b am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo 
Merge commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b' into kraken

* commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b':
  Doc change: add note about future instruction set support.
 2010-05-14 13:47:07 -07:00
Dirk Dougherty
2363a9d496 Merge "Doc change: adjustments to the api changes description" into froyo 2010-05-14 13:46:42 -07:00
Dirk Dougherty
b7a9cbc7e1 am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo 
Merge commit 'bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp

* commit 'bba70cdba284c3d76cab9843e44097d664882938':
  Doc change: add note about future instruction set support.
 2010-05-14 13:45:17 -07:00
Dirk Dougherty
a24ec92408 am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo 2010-05-14 13:43:39 -07:00
Dirk Dougherty
c04d390b92 Merge "Doc change: add note about future instruction set support." into froyo 2010-05-14 13:43:19 -07:00
Dirk Dougherty
7e54c66fa9 am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo 
Merge commit 'bf4cecd2822ff74c8c246d2595a836b5f1130ad8' into kraken

* commit 'bf4cecd2822ff74c8c246d2595a836b5f1130ad8':
  Doc change: documentation for library projects in sdk.
 2010-05-14 13:41:46 -07:00
Dirk Dougherty
4d8158737f am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo 
Merge commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp

* commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d':
  Doc change: documentation for library projects in sdk.
 2010-05-14 13:40:19 -07:00
Dirk Dougherty
a3f10c57af Merge "Doc change: documentation for library projects in sdk." into froyo 2010-05-14 13:38:20 -07:00
James Dong
e030a99e2e am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken 2010-05-14 12:21:03 -07:00
James Dong
00fe5059ca Merge "Detect and handle premature termination of a recording session" into kraken 2010-05-14 12:19:17 -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
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
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
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
James Dong
c80beac3f2 am 9db798d0: Audio/video initial recording time synchronization 2010-05-14 10:54:23 -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
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
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
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
d258045541 am db20eeb2: am 9167ba50: merge from open-source master 2010-05-14 09:17:22 -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
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
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
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
Dirk Dougherty
706ca4bcea 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
James Dong
14eec478aa am ffd104a9: Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:41:50 -07:00
James Dong
8fd8b84f5a Merge "Remove dummy surface in CameraSource" into kraken 2010-05-13 16:40:19 -07:00
Joe Onorato
0edd269995 Merge "Put the wifi status icon in the right place." 2010-05-13 16:33:22 -07:00