Michael Jurka
c77ffe608d
Merge "fixing bug where changing alpha on one textview changed alpha on all other textviews with the same drawable"
2010-09-15 19:44:29 -07:00
Andreas Huber
216e344130
am f8297ba0: am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread
...
Merge commit 'f8297ba011af959331873e09612665a486e1a1a7'
* commit 'f8297ba011af959331873e09612665a486e1a1a7':
Upgrade to the latest .webm project code.
2010-09-15 19:11:10 -07:00
Wu-cheng Li
606c3de595
am d63d7474: am 3fd5fa4c: Fix the runtime restart due to name change.
...
Merge commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f'
* commit 'd63d74749f068f93ead2f8c37ad3fe025dfd312f':
Fix the runtime restart due to name change.
2010-09-15 19:11:05 -07:00
Erik
ffc9bf68d6
am bfbab8ca: am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
...
Merge commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38'
* commit 'bfbab8ca36ed62a71118b355f2b8d8985bdb9d38':
b/3004029 Fixed content resolver loss
2010-09-15 19:10:10 -07:00
Erik
d0f81ea95c
am 42e72e57: am 344d9663: Merge "Close tz query cursor when done." into gingerbread
...
Merge commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6'
* commit '42e72e570b66c3bed316a9e7a766d2f8fc986ae6':
Close tz query cursor when done.
2010-09-15 19:10:04 -07:00
Chet Haase
44d9dad190
am 5ae52f68: (-s ours) am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
...
Merge commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267'
* commit '5ae52f68cfda6629ab55de313ec5e45f34f8a267':
Add new/changed drawable assets from design team
2010-09-15 19:09:59 -07:00
Wu-cheng Li
16d508acb3
am 4db458b4: am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
...
Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'
* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
Update camera API and javadoc for API review comments.
2010-09-15 19:03:01 -07:00
James Dong
3dee32bfcd
am 0cd2472b: am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread
...
Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f'
* commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f':
Add some explicit error log messages
2010-09-15 19:02:45 -07:00
James Dong
6918ab4a05
am beb55f57: am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
...
Merge commit 'beb55f572fd217174ebf8f6679792a6b22896645'
* commit 'beb55f572fd217174ebf8f6679792a6b22896645':
Fix audio input sample timestamp when audio driver loses audio samples
2010-09-15 19:02:39 -07:00
Michael Jurka
406f0522e5
fixing bug where changing alpha on one textview
...
changed alpha on all other textviews with the
same drawable
Change-Id: I19c808c59654da9ed907d1356bbefe3d9926add0
2010-09-15 18:51:22 -07:00
Romain Guy
857d7cf80e
Merge "Fix 9patch rendering."
2010-09-15 18:15:10 -07:00
Romain Guy
6820ac8b14
Fix 9patch rendering.
...
Change-Id: Ic4c18ff483cca95fbabcb10843f7714efe488adb
2010-09-15 18:11:50 -07:00
Hung-ying Tyan
03df1b5da6
am 1e563f91: am 968735e5: Merge "Fixing the NPE in SipPhone bug id: http://b/2987816 " into gingerbread
...
Merge commit '1e563f91183d95f5ad2461b7bca864e8f223ef71'
* commit '1e563f91183d95f5ad2461b7bca864e8f223ef71':
Fixing the NPE in SipPhone
2010-09-15 17:54:01 -07:00
Hung-ying Tyan
3cd497ce00
am 6962aff3: am 698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread
...
Merge commit '6962aff36be9d91ad40ead326bd54fc90965f6f0'
* commit '6962aff36be9d91ad40ead326bd54fc90965f6f0':
Fix links in SIP API javadoc.
2010-09-15 17:53:53 -07:00
Mathias Agopian
6704d310f9
am 310da64d: am f182e8a8: fix a typo where the eventtags code were wrong
...
Merge commit '310da64d78750cdba4349d7cc0a268c07155569d'
* commit '310da64d78750cdba4349d7cc0a268c07155569d':
fix a typo where the eventtags code were wrong
2010-09-15 17:53:43 -07:00
Andreas Huber
4d8024c498
am 7ff94577: am 9909b948: Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread
...
Merge commit '7ff945775210c60e6f113fb00903449cbb05c68a'
* commit '7ff945775210c60e6f113fb00903449cbb05c68a':
Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting.
2010-09-15 17:53:17 -07:00
David Brown
b6f8989385
am 0237cf2e: am 8626d1a3: Merge "Mark MODIFY_PHONE_STATE permission as signatureOrSystem" into gingerbread
...
Merge commit '0237cf2eace5d35410e95f586fd40c3068c94582'
* commit '0237cf2eace5d35410e95f586fd40c3068c94582':
Mark MODIFY_PHONE_STATE permission as signatureOrSystem
2010-09-15 17:43:34 -07:00
Andreas Huber
f8297ba011
am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread
...
Merge commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d' into gingerbread-plus-aosp
* commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d':
Upgrade to the latest .webm project code.
2010-09-15 17:24:53 -07:00
Wu-cheng Li
d63d74749f
am 3fd5fa4c: Fix the runtime restart due to name change.
...
Merge commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5' into gingerbread-plus-aosp
* commit '3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5':
Fix the runtime restart due to name change.
2010-09-15 17:24:40 -07:00
James Dong
06fb6e0765
Merge "Fix potential unintialized variable yuvformat"
2010-09-15 17:04:15 -07:00
James Dong
5d1d920be1
Fix potential unintialized variable yuvformat
...
Change-Id: If0a77855d98b45769a154b25d6535f30cd41536a
2010-09-15 16:58:44 -07:00
Hung-ying Tyan
3e5246b2eb
am 8a33e964: am 5306e0a8: Merge "SIP: add PEER_NOT_REACHABLE error feedback." into gingerbread
...
Merge commit '8a33e964c48d22469487c8ec1d951826b7e3e562'
* commit '8a33e964c48d22469487c8ec1d951826b7e3e562':
SIP: add PEER_NOT_REACHABLE error feedback.
2010-09-15 16:47:30 -07:00
Hung-ying Tyan
bb5fb60c7c
am 8d9e8de2: am 096df819: Merge "SipService: send SERVER_ERROR if server doesn\'t provide nonce" into gingerbread
...
Merge commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9'
* commit '8d9e8de2c920e8c9dc2da33410780ec739076bb9':
SipService: send SERVER_ERROR if server doesn't provide nonce
2010-09-15 16:47:22 -07:00
Kenny Root
6545fcfd96
am 79a1ee42: am cee0b97e: Merge "Free AssetManager weak refs before unmounting" into gingerbread
...
Merge commit '79a1ee4249aadc84558dad2e275b8edde198da76'
* commit '79a1ee4249aadc84558dad2e275b8edde198da76':
Free AssetManager weak refs before unmounting
2010-09-15 16:32:45 -07:00
Steve Howard
e28d80a80a
am d2de99e3: am 536ee090: Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread
...
Merge commit 'd2de99e377408dc28dca5e4c61a816879595fbf3'
* commit 'd2de99e377408dc28dca5e4c61a816879595fbf3':
Fix name shadowing bug with revoking URI permissions.
2010-09-15 16:32:30 -07:00
Chris Palmer
4b4f6a3661
am c5e2e26b: (-s ours) am 5bade703: Merge "DO NOT MERGE Correct the PackageManager.checkSignatures documentation." into gingerbread
...
Merge commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051'
* commit 'c5e2e26b9da40dc0941d0a6a33a82d8923924051':
DO NOT MERGE Correct the PackageManager.checkSignatures documentation.
2010-09-15 16:32:18 -07:00
Andreas Huber
24a2c2b596
Merge "Upgrade to the latest .webm project code." into gingerbread
2010-09-15 16:23:06 -07:00
Wu-cheng Li
3fd5fa4ca9
Fix the runtime restart due to name change.
...
bug:3001395
bug:3001399
Change-Id: I73fd1a63fea0807531b01ae2a754b32efffd41b1
2010-09-15 16:08:57 -07:00
Erik
bfbab8ca36
am a8cc20e5: Merge "b/3004029 Fixed content resolver loss" into gingerbread
...
Merge commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b' into gingerbread-plus-aosp
* commit 'a8cc20e5fb3d3f34dc2ab1c3f31d348b19afa87b':
b/3004029 Fixed content resolver loss
2010-09-15 15:54:27 -07:00
Erik
42e72e570b
am 344d9663: Merge "Close tz query cursor when done." into gingerbread
...
Merge commit '344d96635ec40e0c541f32064f42c8ad38e4505a' into gingerbread-plus-aosp
* commit '344d96635ec40e0c541f32064f42c8ad38e4505a':
Close tz query cursor when done.
2010-09-15 15:54:22 -07:00
Erik
a8cc20e5fb
Merge "b/3004029 Fixed content resolver loss" into gingerbread
2010-09-15 15:51:53 -07:00
Erik
344d96635e
Merge "Close tz query cursor when done." into gingerbread
2010-09-15 15:51:37 -07:00
Erik
09bd4bf85e
b/3004029 Fixed content resolver loss
...
We were creating a static AsyncQueryHandler which only held a
weak reference to the content resolver. This caused db updates
to be dropped once the original context had been gc'd. This
fix creates a new handler for each update to ensure we have a
valid resolver.
Change-Id: I049d8390ac0215e12e63d57b0bae4d3f6df64b6a
2010-09-15 15:45:19 -07:00
Chet Haase
5ae52f68cf
am 8f385aff: Merge "Add new/changed drawable assets from design team" into gingerbread
...
Merge commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9' into gingerbread-plus-aosp
* commit '8f385affafddc1147b9dc4f0c4f49449ebf477c9':
Add new/changed drawable assets from design team
2010-09-15 15:36:58 -07:00
Chet Haase
8f385affaf
Merge "Add new/changed drawable assets from design team" into gingerbread
2010-09-15 15:33:31 -07:00
Vasu Nori
5e89ae29f0
fix compiled statement bugs, synchronization bugs
...
1. when LRU cache wants to remove the eldest entry, it may be finalizing
a statement that is still in use
2. a couple of synchronization issues.
3. a bit code refactoring in SQLiteCompiledSql
4. remove a bunch of unsed debug code from SQLiteDatabase
Change-Id: I45454dc2dbadd7d8842ba77dd2b0e9ff138ec6f4
2010-09-15 15:30:24 -07:00
Chet Haase
0183e3bd5d
Add new/changed drawable assets from design team
...
Change-Id: I8b2274357e41093e120bee42272026446e94872d
2010-09-15 15:27:25 -07:00
Andreas Huber
e5f853911c
Upgrade to the latest .webm project code.
...
Change-Id: I645eff9b7c10bf33144977e6093663407af402e2
2010-09-15 15:13:16 -07:00
Wu-cheng Li
4db458b4f7
am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
...
Merge commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57' into gingerbread-plus-aosp
* commit 'a6f41495962c6427cfb3976daeb7f7b4df63ac57':
Update camera API and javadoc for API review comments.
2010-09-15 15:01:09 -07:00
Wu-cheng Li
a6f4149596
Merge "Update camera API and javadoc for API review comments." into gingerbread
2010-09-15 14:57:59 -07:00
James Dong
0cd2472bf8
am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread
...
Merge commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e' into gingerbread-plus-aosp
* commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e':
Add some explicit error log messages
2010-09-15 14:55:46 -07:00
James Dong
beb55f572f
am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
...
Merge commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp
* commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24':
Fix audio input sample timestamp when audio driver loses audio samples
2010-09-15 14:55:38 -07:00
Jim Miller
e216dac4d1
Merge "Add new Carousel callbacks to RecentApplicationsActivity."
2010-09-15 14:53:05 -07:00
James Dong
82a39f4aab
Merge "Add some explicit error log messages" into gingerbread
2010-09-15 14:51:57 -07:00
James Dong
9f882c0b10
Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread
2010-09-15 14:51:49 -07:00
Wu-cheng Li
7836660f5e
Update camera API and javadoc for API review comments.
...
bug:3001395
bug:3001399
Change-Id: I7030c4eff94ab11f44b862e8c206fb69a4e5c428
2010-09-15 14:47:37 -07:00
Adam Powell
0b2d306e70
Style new popup widgets.
...
Change-Id: I208ed292afd9919071778baa9ea61d7ca9e7743c
2010-09-15 14:39:48 -07:00
Paul Westbrook
a29d8394f1
Merge "Enable downloads of https urls"
2010-09-15 14:23:28 -07:00
Paul Westbrook
86a6019f02
Enable downloads of https urls
...
Bug: 3001890
Change-Id: Ibb2bc5c8efe90744a3b6f76bd31c3199a7365827
2010-09-15 13:37:46 -07:00
Erik
5ba5de93c7
Close tz query cursor when done.
...
Change-Id: I9cb30539b12121f01e093985985e3c802f7a9e8c
2010-09-15 13:37:19 -07:00