Commit Graph

1872 Commits

Author SHA1 Message Date
Android (Google) Code Review
e05e739e71 am 722baf5e: Merge change 5014 into donut
Merge commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db'

* commit '722baf5ec47b57020ac39ec3e2b6cd1a02c3c4db':
  Fix issue #1933587.  Perform dexopt of instrumentation .apks.
2009-06-22 22:04:53 -07:00
Android (Google) Code Review
952663ef57 am 5277103d: Merge change 5035 into donut
Merge commit '5277103db9033226814edc8fcba6f4ba4e846678'

* commit '5277103db9033226814edc8fcba6f4ba4e846678':
  add glTexParameteri() and fix glTexParameteriv()
2009-06-22 22:04:12 -07:00
Android (Google) Code Review
8e3b0f15df am 11348cff: Merge change 4885 into donut
Merge commit '11348cffef46585027ba3035357370177a554826'

* commit '11348cffef46585027ba3035357370177a554826':
  Merge the output file into one.
2009-06-22 19:47:35 -07:00
Android (Google) Code Review
642875a97c am 54f156c7: Merge change 5006 into donut
Merge commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e'

* commit '54f156c7c47bd5b5f2c9675f56bddaaa43ad162e':
  Pass the originating app's versionCode along with a restore set
2009-06-22 19:47:24 -07:00
Android (Google) Code Review
5e89f2f9de am 58ee0371: Merge change 4990 into donut
Merge commit '58ee037191b5d9c2b149870868f9646bd428af2a'

* commit '58ee037191b5d9c2b149870868f9646bd428af2a':
  Fix a few more blatantly wrong date formats.
2009-06-22 19:47:21 -07:00
Android (Google) Code Review
da4e89dc31 Merge change 5014 into donut
* changes:
  Fix issue #1933587.  Perform dexopt of instrumentation .apks.
2009-06-22 18:30:05 -07:00
Android (Google) Code Review
70140c52ce Merge change 5039
* changes:
  Fix 3 bugs in fountain test.  Correctly generate the last mip level of a non-square mip chain.  Default the background to not blended and disable dither/depth.
2009-06-22 18:20:00 -07:00
Android (Google) Code Review
185a9c19b4 Merge change 5015
* changes:
  Cleanup includes so Log.h can use the tag.  rsUtils.h is the file that should be included everywhere and contain rs global defines.
2009-06-22 18:19:46 -07:00
Android (Google) Code Review
86a518e626 Merge change 4984
* changes:
  All light source objects.
2009-06-22 18:19:22 -07:00
Android (Google) Code Review
6bca3daec9 Merge change 5035 into donut
* changes:
  add glTexParameteri() and fix glTexParameteriv()
2009-06-22 18:18:39 -07:00
Mathias Agopian
b12f99b315 add glTexParameteri() and fix glTexParameteriv() 2009-06-22 18:09:09 -07:00
Android (Google) Code Review
8ae84423fd Merge change 4885 into donut
* changes:
  Merge the output file into one.
2009-06-22 17:14:59 -07:00
Android (Google) Code Review
7c4fa86d2f Merge change 5006 into donut
* changes:
  Pass the originating app's versionCode along with a restore set
2009-06-22 16:47:06 -07:00
Android (Google) Code Review
94116aeb6b Merge change 4990 into donut
* changes:
  Fix a few more blatantly wrong date formats.
2009-06-22 16:45:20 -07:00
Android (Google) Code Review
ea1e295b05 am e8a1f6af: Merge change 4961 into donut
Merge commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9'

* commit 'e8a1f6af96d09d8105621932073d6f79e24a5dc9':
  Set organizations to be null for generateKeyPair to use the default.
2009-06-22 16:24:31 -07:00
Android (Google) Code Review
6e510838fc Merge change 4961 into donut
* changes:
  Set organizations to be null for generateKeyPair to use the default.
2009-06-22 16:22:33 -07:00
Android (Google) Code Review
befa6e3727 am 2830b922: Merge change 4977 into donut
Merge commit '2830b9226bc737da970f8d20601ccde19008415c'

* commit '2830b9226bc737da970f8d20601ccde19008415c':
  Update the gservices gtalk setting for the terms and services url.
2009-06-22 15:47:26 -07:00
Android (Google) Code Review
e77efd3ea5 Merge change 4977 into donut
* changes:
  Update the gservices gtalk setting for the terms and services url.
2009-06-22 15:45:31 -07:00
Satish Sampath
1ebef2772b am 662df0b9: Launch user-entered URLs directly without a web search.
Merge commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6'

* commit '662df0b9630fd685a7cf86bbfec15ac6b6c286c6':
  Launch user-entered URLs directly without a web search.
2009-06-22 15:44:06 -07:00
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