Jason Sams
255eda40ce
Merge "Change RS to use the passed surface size rather than EGL size. Its possible that during a resize the EGL information could be stale so caching this is bad. The surface size should always be correct."
2010-05-14 16:00:04 -07:00
Konstantin Lopyrev
11ca9ebd0c
Merge "Fix 2571606: Correct message after too many failed attempts for password and pin."
2010-05-14 15:52:55 -07:00
Nick Kralevich
15cb231c7d
resolved conflicts for merge of cbf26fd3 to master
...
Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6
2010-05-14 15:49:42 -07:00
Nick Kralevich
744790dbb9
am bfb776ac: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-14 15:30:15 -07:00
Nick Kralevich
cf44a76d7f
Merge "Get rid of warnings when compiled with -Wformat-security" into kraken
2010-05-14 15:28:09 -07:00
The Android Open Source Project
995fc3866a
am a8e0f75b: am 7450c02a: am 900b6157: merge from open-source master
2010-05-14 15:15:36 -07:00
The Android Open Source Project
92e388ceb0
am 7450c02a: am 900b6157: merge from open-source master
2010-05-14 15:14:04 -07:00
The Android Open Source Project
0259a7534f
am 900b6157: merge from open-source master
...
Merge commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff' into kraken
* commit '900b6157f5dee2ed7b2c73cf320b2baf293230ff':
Only hold a weak pointer on SurfaceComposerClients
2010-05-14 15:12:17 -07:00
The Android Open Source Project
4c53558835
merge from open-source master
...
Change-Id: I0249c6d796b35af9ba08cbccd463a1f5cf779ecd
2010-05-14 15:04:52 -07:00
Scott Main
70640a1dbb
am b73179c7: am b42bc066: am fb580943: am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
2010-05-14 14:30:00 -07:00
Scott Main
1f11ed1c46
am b42bc066: am fb580943: am 826c9f77: docs: fix broken link, reduce API info about backup and point to dev guide
2010-05-14 14:28:11 -07:00
Scott Main
58e1173cf0
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
cf6dd9bdef
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
Dirk Dougherty
9908241441
am 9d6bdc53: am 4d29493e: am 0d54b806: am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 14:05:26 -07:00
Dirk Dougherty
8ff11fa15c
am 4d29493e: am 0d54b806: am 60026c3a: Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 14:03:46 -07:00
Dirk Dougherty
0f27e3d642
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
d1ad52a21f
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
The Android Open Source Project
2872bbd8be
am 658b7a5a: am 12b6f6ea: am 55b7d124: merge from open-source master
2010-05-14 13:58:26 -07:00
Dirk Dougherty
9b0f549757
Merge "Doc change: adjust compatibility doc." into froyo
2010-05-14 13:58:12 -07:00
The Android Open Source Project
8c4874eb11
am 12b6f6ea: am 55b7d124: merge from open-source master
2010-05-14 13:56:41 -07:00
The Android Open Source Project
50c434ca21
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
Dirk Dougherty
171f2d0fa5
am cb0bdf19: am ad8ce534: am 3d52305f: am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo
2010-05-14 13:53:33 -07:00
The Android Open Source Project
4dd72e10ee
merge from open-source master
...
Change-Id: I3e36061d7ba4b8a3962bf8391d663b861a4ede38
2010-05-14 13:52:52 -07:00
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
81a2b68dcb
am af4dbcd8: am 8072bdc6: am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
2010-05-14 13:50:46 -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
553f9c7dff
am e2fb67d4: am 41a450cd: am bf4cecd2: am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo
2010-05-14 13:45:28 -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
Jean-Baptiste Queru
6b4a87862e
Merge "Only hold a weak pointer on SurfaceComposerClients"
2010-05-14 13:39:48 -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
0216e5527c
am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken
2010-05-14 12:22:18 -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
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
