Christopher Tate
2f5f3b00d3
am 3a31a93b: Add some global metadata to the restore set
...
Merge commit '3a31a93b8a195ae2d0180e6dfbf292da2e581f50'
* commit '3a31a93b8a195ae2d0180e6dfbf292da2e581f50':
Add some global metadata to the restore set
2009-06-22 15:19:51 -07:00
Android (Google) Code Review
9660487797
am e146d824: Merge change 4965 into donut
...
Merge commit 'e146d824785078fed578f88b11ff47a7390d27c5'
* commit 'e146d824785078fed578f88b11ff47a7390d27c5':
Fix bugs 1827027, 1808979, 1820700.
2009-06-22 14:32:54 -07:00
Android (Google) Code Review
cc33ce7046
Merge change 4965 into donut
...
* changes:
Fix bugs 1827027, 1808979, 1820700.
2009-06-22 14:31:21 -07:00
Android (Google) Code Review
d056f2d087
am 72be4049: Merge change 4910 into donut
...
Merge commit '72be40490951d3f9d0ada16fcf5288d0c3306d88'
* commit '72be40490951d3f9d0ada16fcf5288d0c3306d88':
fix warnings that will show up with GCC 4.4 (in master)
2009-06-22 14:03:17 -07:00
Android (Google) Code Review
cfb991d1f8
Merge change 4910 into donut
...
* changes:
fix warnings that will show up with GCC 4.4 (in master)
2009-06-22 14:01:25 -07:00
Android (Google) Code Review
fe3c1e0ba0
am bbf78137: Merge change 4947 into donut
...
Merge commit 'bbf781379b134812458591722c986cb29c396a5b'
* commit 'bbf781379b134812458591722c986cb29c396a5b':
Yet another round of trying to get the date formats right.
2009-06-22 13:50:27 -07:00
Android (Google) Code Review
7412caaa8c
Merge change 4947 into donut
...
* changes:
Yet another round of trying to get the date formats right.
2009-06-22 13:48:02 -07:00
Android (Google) Code Review
729809e1a2
Merge change 4926
...
* changes:
Renamed all android.hardware.IMedia* strings to android.media.IMedia*
2009-06-22 13:44:30 -07:00
Android (Google) Code Review
e02bc92dca
am cde13e6b: Merge change 4954 into donut
...
Merge commit 'cde13e6bfa6465d5770755892e2ee234a1f85d5c'
* commit 'cde13e6bfa6465d5770755892e2ee234a1f85d5c':
gps: Check for null APN name to avoid a runtime restart.
2009-06-22 13:24:50 -07:00
Android (Google) Code Review
1c34a75937
Merge change 4954 into donut
...
* changes:
gps: Check for null APN name to avoid a runtime restart.
2009-06-22 13:22:48 -07:00
Android (Google) Code Review
2a84f2e369
am 856dd8a6: Merge change 4952 into donut
...
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'
* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
Helper API cleanup. Allows multiple helpers to function,
2009-06-22 13:20:31 -07:00
Android (Google) Code Review
2e69f210fd
Merge change 4952 into donut
...
* changes:
Helper API cleanup. Allows multiple helpers to function, because they'll always go in the same order, and this lets us not have to write headers to keep them paired.
2009-06-22 13:18:09 -07:00
Android (Google) Code Review
924852ec65
am eb717b9c: Merge change 4477 into donut
...
Merge commit 'eb717b9c4337e5b88664802b0804f4cb48758120'
* commit 'eb717b9c4337e5b88664802b0804f4cb48758120':
BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
2009-06-22 13:04:50 -07:00
Android (Google) Code Review
149b67dd30
Merge change 4477 into donut
...
* changes:
BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
2009-06-22 13:02:36 -07:00
Joe Onorato
9cda3e02c6
Helper API cleanup. Allows multiple helpers to function,
...
because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.
2009-06-22 13:02:24 -07:00
Android (Google) Code Review
e471dfdc31
am ecfb9f91: Merge change 4940 into donut
...
Merge commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01'
* commit 'ecfb9f91afa49df7b9b62526dcaca431b5ff1e01':
Fixes #1933585 . Don't dismiss ACTV's drop down when it's set to alwaysVisible.
2009-06-22 11:19:08 -07:00
Android (Google) Code Review
8b81ce105d
Merge change 4940 into donut
...
* changes:
Fixes #1933585 . Don't dismiss ACTV's drop down when it's set to alwaysVisible.
2009-06-22 11:17:13 -07:00
Android (Google) Code Review
9e4ee0cc92
Merge change 4932
...
* changes:
In WebView, fix calcVisibleRect bugs
2009-06-22 11:01:50 -07:00
Android (Google) Code Review
20f31024ea
am 07a5f126: Merge change 4754 into donut
...
Merge commit '07a5f126df2cf0dbeb7096535ae634ea8eaeb306'
* commit '07a5f126df2cf0dbeb7096535ae634ea8eaeb306':
At boot time, add additional per-device information to the
2009-06-22 10:56:47 -07:00
Android (Google) Code Review
f91e77622f
Merge change 4754 into donut
...
* changes:
At boot time, add additional per-device information to the kernel randomness pool. This helps increase the quality / uniqueness of the random numbers, and is especially important during the device's first boot, when insufficient randomness is available.
2009-06-22 10:55:25 -07:00
Android (Google) Code Review
ce9a5b8d37
am d6dd686b: Merge change 4805 into donut
...
Merge commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f'
* commit 'd6dd686bc7adba448af1bc36a022cddba9f9561f':
add GServices settings for Google Talk privacy and legal urls.
2009-06-22 10:45:28 -07:00
Android (Google) Code Review
0404a4a26e
Merge change 4805 into donut
...
* changes:
add GServices settings for Google Talk privacy and legal urls.
2009-06-22 10:43:11 -07:00
Android (Google) Code Review
8f6ff0f7b5
Merge change 4922
...
* changes:
Enable storage tests in Dump Render Tree so we can run Database and DOM Storage layout tests.
2009-06-22 10:41:52 -07:00
Android (Google) Code Review
97c0ce6d73
am 6bf1208c: Merge change 4827 into donut
...
Merge commit '6bf1208c58ab2c39f95c733a22df882c7a59f4fc'
* commit '6bf1208c58ab2c39f95c733a22df882c7a59f4fc':
Fix issue with shared user permissions.
2009-06-22 10:41:07 -07:00
Android (Google) Code Review
7a0d859187
Merge change 4827 into donut
...
* changes:
Fix issue with shared user permissions. just look in the requested permissions of packages within shared user setting rather than the granted permissions
2009-06-22 10:39:15 -07:00
jsh
c6ab6bc543
am be7f0f78: Add remaining retry count to response for PIN/PUK commands.
...
Merge commit 'be7f0f78afde931ce6ea2d4ba61c340fac5722f6'
* commit 'be7f0f78afde931ce6ea2d4ba61c340fac5722f6':
Add remaining retry count to response for PIN/PUK commands.
2009-06-22 10:05:31 -07:00
Bjorn Bringert
0730146c77
am eed76b2a: Remove test for SearchManager activity context restriction.
...
Merge commit 'eed76b2a8ddc41af01cd3ae87c4722f3784c975c'
* commit 'eed76b2a8ddc41af01cd3ae87c4722f3784c975c':
Remove test for SearchManager activity context restriction.
2009-06-22 09:56:43 -07:00
Leon Scroggins
3fe15ea84c
resolved conflicts for merge of 9336f5d9 to master
2009-06-22 12:44:31 -04:00
Android (Google) Code Review
292ae4f642
Merge change 4775 into donut
...
* changes:
Make browser bookmarks permissions part of the public API.
2009-06-22 08:01:58 -07:00
Android (Google) Code Review
02f6bd03a0
am 2c10b5f4: Merge change 4914 into donut
...
Merge commit '2c10b5f483f832523305c11d44035fc7f5d9a54b'
* commit '2c10b5f483f832523305c11d44035fc7f5d9a54b':
Make all static methods in SearchManager non-static.
2009-06-22 07:26:36 -07:00
Android (Google) Code Review
efc227f74a
Merge change 4914 into donut
...
* changes:
Make all static methods in SearchManager non-static.
2009-06-22 07:19:49 -07:00
Android (Google) Code Review
919d27e9ed
am 7306d248: Merge change 4913 into donut
...
Merge commit '7306d248feb2e52593e51944bcaf98c11974e988'
* commit '7306d248feb2e52593e51944bcaf98c11974e988':
Add non-static version of SearchManager.getSuggestions().
2009-06-22 05:55:59 -07:00
Android (Google) Code Review
bdc8ed576e
Merge change 4913 into donut
...
* changes:
Add non-static version of SearchManager.getSuggestions().
2009-06-22 05:53:04 -07:00
Android (Google) Code Review
5678fa46b5
am 9c1b1872: Merge change 4908 into donut
...
Merge commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a'
* commit '9c1b1872faf028bcd70fb3e17eeb29d86ce6bd9a':
Remove checks for Activity Context when creating SearchManager
2009-06-22 04:48:12 -07:00
Android (Google) Code Review
259da697b7
Merge change 4908 into donut
...
* changes:
Remove checks for Activity Context when creating SearchManager
2009-06-22 04:45:23 -07:00
Android (Google) Code Review
57cac3e88e
am 766d7236: Merge change 4737 into donut
...
Merge commit '766d7236c84f636b816d71189e309e67db1f593a'
* commit '766d7236c84f636b816d71189e309e67db1f593a':
Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995 .
2009-06-22 03:50:23 -07:00
Android (Google) Code Review
6ba2b1b2e5
Merge change 4737 into donut
...
* changes:
Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995 .
2009-06-22 03:48:29 -07:00
Android (Google) Code Review
6b6c9874a1
am 8570e5fc: Merge change 4907 into donut
...
Merge commit '8570e5fcf15f6b7c22c3023e8b4757c6a880a598'
* commit '8570e5fcf15f6b7c22c3023e8b4757c6a880a598':
Add more debug messages for CameraService.
2009-06-22 03:44:04 -07:00
Android (Google) Code Review
84159b508f
Merge change 4907 into donut
...
* changes:
Add more debug messages for CameraService.
2009-06-22 03:41:19 -07:00
Mathias Agopian
52ed26a78b
fix warnings that will show up with GCC 4.4 (in master)
2009-06-22 02:35:32 -07:00
Chih-Chung Chang
d98c516d28
Add more debug messages for CameraService.
2009-06-22 17:06:32 +08:00
Daisuke Miyakawa
ab436aee3d
am 3e3324ba: Merge the change in cupcake_dcm so that Contacts app is able to use it.
...
Merge commit '3e3324bae45ff21615c07507e6918ad21681a6a2'
* commit '3e3324bae45ff21615c07507e6918ad21681a6a2':
Merge the change in cupcake_dcm so that Contacts app is able to use it.
2009-06-21 21:44:01 -07:00
Android (Google) Code Review
132fed07ef
am 77c5c405: Merge change 4894 into donut
...
Merge commit '77c5c405486548fcb3e02f67cfd23117ae78fb85'
* commit '77c5c405486548fcb3e02f67cfd23117ae78fb85':
Set the search bar's AutoCompleteTextView to ellipsize=end.
2009-06-20 23:45:54 -07:00
Android (Google) Code Review
4f15f7a3f5
Merge change 4894 into donut
...
* changes:
Set the search bar's AutoCompleteTextView to ellipsize=end. After Romain's change 4829, we can set this to make hint text ellipsize (and thus not line wrap) in the search dialog.
2009-06-20 23:43:09 -07:00
Android (Google) Code Review
f4991d2226
am 4da7dff5: Merge change 4731 into donut
...
Merge commit '4da7dff5e79e57494b58a97b285c53c111b18c82'
* commit '4da7dff5e79e57494b58a97b285c53c111b18c82':
gsm: Remove PppLink since pppd_gprs service does not exist.
2009-06-20 14:51:26 -07:00
Android (Google) Code Review
5fff2075c4
Merge change 4731 into donut
...
* changes:
gsm: Remove PppLink since pppd_gprs service does not exist.
2009-06-20 14:48:33 -07:00
Android (Google) Code Review
029bbbd810
Merge change 4881
...
* changes:
implement modeview matrix sliding from within scripts.
2009-06-19 18:34:17 -07:00
Android (Google) Code Review
981d285f9d
am 9e71b07c: Merge change 4829 into donut
...
Merge commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94'
* commit '9e71b07cfe88cdb1abf4a01077ca263d7f957c94':
Fixes #1926784 . Setting android:ellipsize on an EditText now ellipsizes the hint.
2009-06-19 18:20:16 -07:00
Android (Google) Code Review
c560b62cf3
Merge change 4829 into donut
...
* changes:
Fixes #1926784 . Setting android:ellipsize on an EditText now ellipsizes the hint.
2009-06-19 18:18:42 -07:00
Android (Google) Code Review
f84dda74d5
am 79ac8770: Merge change 4834 into donut
...
Merge commit '79ac87704d2e38afb06356704e4b52c739237f40'
* commit '79ac87704d2e38afb06356704e4b52c739237f40':
Fix a bug where wrong variable was used for comparison.
2009-06-19 17:25:55 -07:00