drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,946 Commits 1 Branch 0 Tags
Commit Graph

22946 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
b42bc06675 am fb580943: am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide 
Merge commit 'fb580943133d3e9ad3e342b8038726b04686f283' into kraken

* commit 'fb580943133d3e9ad3e342b8038726b04686f283':
  docs: fix broken link, reduce API info about backup and point to dev guide
 2010-05-14 14:26:14 -07:00
Scott Main
fb58094313 am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide 
Merge commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49' into froyo-plus-aosp

* commit '826c9f7773188c2a7f48d5b2d1ae4612ec2bbb49':
  docs: fix broken link, reduce API info about backup and point to dev guide
 2010-05-14 14:24:44 -07:00
Scott Main
826c9f7773 docs: fix broken link, reduce API info about backup and point to dev guide 
Change-Id: If6470f1753917819e2f73fbba8947f082a26f720
 2010-05-14 14:17:04 -07:00
Dirk Dougherty
4d29493ea9 am 0d54b806: am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo 
Merge commit '0d54b806c62cbe3ae71ce21f5d8bad78b0bee279' into kraken

* commit '0d54b806c62cbe3ae71ce21f5d8bad78b0bee279':
  Doc change: adjust compatibility doc.
 2010-05-14 14:01:59 -07:00
Dirk Dougherty
0d54b806c6 am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo 
Merge commit '60026c3ab0093e6d4cd464061ab9f36d4d041532' into froyo-plus-aosp

* commit '60026c3ab0093e6d4cd464061ab9f36d4d041532':
  Doc change: adjust compatibility doc.
 2010-05-14 14:00:12 -07:00
Dirk Dougherty
60026c3ab0 Merge "Doc change: adjust compatibility doc." into froyo 2010-05-14 13:58:12 -07:00
The Android Open Source Project
12b6f6eaee am 55b7d124: merge from open-source master 
Merge commit '55b7d1243f15395a102971e8fdc57444638729ac' into kraken

* commit '55b7d1243f15395a102971e8fdc57444638729ac':
  SetLocaleByCarrier, only if its not an unknown carrier.
 2010-05-14 13:54:56 -07:00
The Android Open Source Project
55b7d1243f merge from open-source master 
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
 2010-05-14 13:52:52 -07:00
Dirk Dougherty
51d812b83b Doc change: adjust compatibility doc. 
Change-Id: I74f9fba81de4d358ecccfe1ef0c69f0e83e1a7c5
 2010-05-14 13:52:30 -07:00
Dirk Dougherty
ad8ce5346a 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
3d52305faa 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
8072bdc6e2 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
59cfe7137c Merge "Doc change: adjustments to the api changes description" into froyo 2010-05-14 13:46:42 -07:00
Dirk Dougherty
877fb9a2cb Doc change: adjustments to the api changes description 
Change-Id: I9373b424ae008face124e38a163c980608c2e4df
 2010-05-14 13:45:27 -07:00
Dirk Dougherty
cae9cfeed7 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
bba70cdba2 Merge "Doc change: add note about future instruction set support." into froyo 2010-05-14 13:43:19 -07:00
Dirk Dougherty
41a450cd8e 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
bf4cecd282 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
89969d4cda Merge "Doc change: documentation for library projects in sdk." into froyo 2010-05-14 13:38:20 -07:00
Dirk Dougherty
de98f6e397 Doc change: add note about future instruction set support. 
Change-Id: If954c1020301f5935c8d9328a531afdddbdad8db
 2010-05-14 13:37:01 -07:00
Dirk Dougherty
a3245648d6 Doc change: documentation for library projects in sdk. 
Change-Id: I615d24a046ba2858676e985072563cc90a906551
 2010-05-14 13:27:39 -07:00
James Dong
d95266c6a8 Merge "Detect and handle premature termination of a recording session" into kraken 2010-05-14 12:19:17 -07:00
Nick Kralevich
4e544e8146 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
29f5d9b61d 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
6c034325a8 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
6d8e4fd83b 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
f55e322216 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
68510e60f9 Detect and handle premature termination of a recording session 
Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
 2010-05-14 11:48:00 -07:00
Scott Main
b83a283ac1 docs: add dev guide for backup 
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
 2010-05-14 11:47:42 -07:00
Ray Chen
f75e370e12 Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes. 
Change-Id: I8a509d957a7b67ee1f59dc4ef5139c4e28adeb9c
 2010-05-14 11:43:38 -07:00
Jean-Baptiste Queru
a2adf8f394 Merge "SetLocaleByCarrier, only if its not an unknown carrier." 2010-05-14 11:39:06 -07:00
James Dong
9db798d0f0 Audio/video initial recording time synchronization 
Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
 2010-05-14 10:51:12 -07:00
James Dong
1824486e04 Handle recording file size and/or duration limit 
Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
 2010-05-14 10:46:56 -07:00
Nick Kralevich
942a2fbfdf 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
21a534d955 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
1d628c5d3d merge from open-source master 
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
 2010-05-14 09:44:36 -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
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
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
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
Jean-Baptiste Queru
75e181b633 Merge "Accept media files by file extension in case insensitive manner." 2010-05-14 09:06:43 -07: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
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
fb473bb611 Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:31:10 -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