Commit Graph

734 Commits

Author SHA1 Message Date
Android (Google) Code Review
493ab7b29c am e292086: Merge change 1391 into donut
Merge commit 'e292086e6b5124a8e6b9435609d41c9ab2ef5e22'

* commit 'e292086e6b5124a8e6b9435609d41c9ab2ef5e22':
  Fix 1799207. With the new local dns, we should allow the host without any PERIOD. Otherwise http://go won't work properly.
2009-05-11 18:26:23 -07:00
Guang Zhu
bbfd2e076a merged 25fdf35, resolved conflicts 2009-05-11 18:09:51 -07:00
Android (Google) Code Review
8ee6f8f77e Merge change 1391 into donut
* changes:
  Fix 1799207. With the new local dns, we should allow the host without any PERIOD. Otherwise http://go won't work properly.
2009-05-11 14:04:10 -07:00
Android (Google) Code Review
0e8e63ffbb Merge change 1299 into donut
* changes:
  Added Java callback for JavaScript execution timeout.
2009-05-11 14:03:56 -07:00
Android (Google) Code Review
982f6b946f am 7f2ae49: Merge change 1370 into donut
Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c'

* commit '7f2ae493c58e221b2961ccbd92de24565665633c':
  Fix a JNI layer crash due to null camera object passed to get_native_camera()
2009-05-11 12:20:20 -07:00
Android (Google) Code Review
cb069f70bc am 3b30d80: Merge change 1377 into donut
Merge commit '3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4'

* commit '3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4':
  Fix typo in javadoc
2009-05-11 12:20:20 -07:00
Android (Google) Code Review
e738108828 Merge change 1370 into donut
* changes:
  Fix a JNI layer crash due to null camera object passed to get_native_camera() The fix will check on the camera object and if it is a null object, we throw a NullPointerException; application layer should also avoid passing a null java object to MediaRecorder.setCamera().
2009-05-11 12:18:55 -07:00
Android (Google) Code Review
0b25a05c3e Merge change 1377 into donut
* changes:
  Fix typo in javadoc
2009-05-11 12:18:20 -07:00
Android (Google) Code Review
b322e9f49c am 6ee44d1: Merge change 1258 into donut
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005'

* commit '6ee44d1ff30627388bf3afa5fa542780af8f4005':
  Fix 1840639 to support overlays with zz_ZZ.
2009-05-11 11:22:25 -07:00
Android (Google) Code Review
b8673dddee Merge change 1258 into donut
* changes:
  Fix 1840639 to support overlays with zz_ZZ. Everything but strings worked fine before but a new default string would generate a build error.
2009-05-11 11:19:49 -07:00
Dianne Hackborn
24b9c7e006 am 1655be4: Fix issue #1837610 and #1753079
Merge commit '1655be46d2b7d45f071a6a1411ac8bd41c749c21'

* commit '1655be46d2b7d45f071a6a1411ac8bd41c749c21':
  Fix issue #1837610 and #1753079
2009-05-11 11:18:24 -07:00
Android (Google) Code Review
376d13c45f Merge change 720
* changes:
  Move ACTION_BATTERY_LOW logic to BatteryService (bug 1630733).
2009-05-11 10:57:23 -07:00
Android (Google) Code Review
2cda8bb632 am 5e1d8ae: Merge change 1355 into donut
Merge commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6'

* commit '5e1d8aed4a557a7c055aa4c19875df75d7e41ae6':
  GPS: Generalize SUPL support to include AGPS for CDMA
2009-05-11 10:37:20 -07:00
Android (Google) Code Review
c83a1b1a56 Merge change 1355 into donut
* changes:
  GPS: Generalize SUPL support to include AGPS for CDMA
2009-05-11 10:34:33 -07:00
Android (Google) Code Review
700f14224d Merge change 1324
* changes:
  Fix #1807059. If it is "POST", always use BasicHttpEntityEnclosingRequest even bodyProvider is null. This ensures the content-type, content-encoding and content-length are set correctly.
2009-05-11 10:11:50 -07:00
Android (Google) Code Review
fa1df1c644 am 3022a11: Merge change 1239 into donut
Merge commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472'

* commit '3022a11c4c41afa9d39b4d0d9abd7e6bcb6b8472':
  Modify camera framework to use new streamlined binder interface.
2009-05-11 10:00:49 -07:00
Android (Google) Code Review
5e7366f81d Merge change 1239 into donut
* changes:
  Modify camera framework to use new streamlined binder interface. This is the second half of bug 1837832. Modifies the camera client and camera service to use the new binder interface. Removes the old binder interface. There will be one more part to this change to surface the undefined callbacks to the Java layer so that partners can implement new features without having to touch the stack.
2009-05-11 10:00:42 -07:00
Android (Google) Code Review
bbb94372cc am 82e61c9: Merge change 1316 into donut
Merge commit '82e61c947b909bcb373aca491fe1248f23764eaf'

* commit '82e61c947b909bcb373aca491fe1248f23764eaf':
  Make in-app search have a different background resource which looks
2009-05-11 09:38:00 -07:00
Android (Google) Code Review
f76d18863e Merge change 1316 into donut
* changes:
  Make in-app search have a different background resource which looks like a slide-out drawer, to provide app context and because it is not full-screen.
2009-05-11 09:35:34 -07:00
Dave Sparks
93b94584ed Modify camera framework to use new streamlined binder interface.
This is the second half of bug 1837832. Modifies the camera client
and camera service to use the new binder interface. Removes the
old binder interface. There will be one more part to this change
to surface the undefined callbacks to the Java layer so that
partners can implement new features without having to touch the
stack.
2009-05-11 07:36:58 -07:00
Jorg Pleumann
a2de99c4c2 am b4735b6: am 25f9637: AI 148665: Disabling a test that does not work a
Merge commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c'

* commit 'b4735b6c04c6bca3219115395748a1b5ef02ff6c':
  AI 148665: Disabling a test that does not work as
2009-05-11 00:44:29 -07:00
Jorg Pleumann
acbd84df86 am 25f9637: AI 148665: Disabling a test that does not work as
Merge commit '25f963753ea762c12c74c0dcb861b023ac92177a' into donut

* commit '25f963753ea762c12c74c0dcb861b023ac92177a':
  AI 148665: Disabling a test that does not work as
2009-05-11 00:39:55 -07:00
Mathias Agopian
f1cf843deb am 8331f72: remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "
Merge commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24'

* commit '8331f72078051cdf5a26230ee819f7ef7f9fcc24':
  remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h
2009-05-08 22:51:20 -07:00
Mathias Agopian
f30de0048b am 2accb31: this should fix the build
Merge commit '2accb31239cf7a3cad77b51baed4b23934636e5b'

* commit '2accb31239cf7a3cad77b51baed4b23934636e5b':
  this should fix the build
2009-05-08 22:51:16 -07:00
Mathias Agopian
7a456e0706 am 778fb15: should fix the build.
Merge commit '778fb15a010bdac0a3721193ff125fcec8e7312c'

* commit '778fb15a010bdac0a3721193ff125fcec8e7312c':
  should fix the build.
2009-05-08 22:51:16 -07:00
Android (Google) Code Review
10994fb891 am 3a04bd3: Merge change 1289 into donut
Merge commit '3a04bd324aa0d29d0adb9d3fbb9c60b7e1694a28'

* commit '3a04bd324aa0d29d0adb9d3fbb9c60b7e1694a28':
  only export the GL entry-points, hide everything else.
2009-05-08 22:51:15 -07:00
Dianne Hackborn
3030a6dd3a am 851a541: Implement targetSdkVersion and maxSdkVersion, plus version c
Merge commit '851a54143c15a1c33361efae2db3f7f45059b472'

* commit '851a54143c15a1c33361efae2db3f7f45059b472':
  Implement targetSdkVersion and maxSdkVersion, plus version code names.
2009-05-08 22:51:10 -07:00
Android (Google) Code Review
f83795145e am ed3b804: Merge change 1276 into donut
Merge commit 'ed3b804f2cc61029cf2969cbfa499ea230c22bb0'

* commit 'ed3b804f2cc61029cf2969cbfa499ea230c22bb0':
  Define mime type for shortcut validation path.
2009-05-08 22:51:09 -07:00
Android (Google) Code Review
cfa7a79c94 am c39aae0: Merge change 1278 into donut
Merge commit 'c39aae0ee060b4ff54ba0ab37fd1925ce191f013'

* commit 'c39aae0ee060b4ff54ba0ab37fd1925ce191f013':
  Squashed commit of the following:
2009-05-08 22:51:07 -07:00
Android (Google) Code Review
7bf1a18b6c am 7b59fe3: Merge change 1275 into donut
Merge commit '7b59fe316e23e05ef33648a855c2280dd8fad981'

* commit '7b59fe316e23e05ef33648a855c2280dd8fad981':
  Make the internal storage monitor work correctly when internal storage is very large.
2009-05-08 22:51:06 -07:00
Mike LeBeau
41c8ca73ff merged 98acd54, resolved conflicts 2009-05-08 17:59:05 -07:00
Mathias Agopian
d373c6348a remove the gl{Vertex|Color|TexCoord|Normal}PointerBounds() "extension" fro eglext.h 2009-05-08 17:18:55 -07:00
Mathias Agopian
94aa09680a should fix the build. 2009-05-08 16:05:23 -07:00
Android (Google) Code Review
f241d55c20 Merge change 1289 into donut
* changes:
  only export the GL entry-points, hide everything else.
2009-05-08 15:51:01 -07:00
Mathias Agopian
48685c45bb only export the GL entry-points, hide everything else.
Conflicts:

	opengl/libagl/Android.mk
	opengl/libs/Android.mk
	opengl/libs/egl_impl.h
2009-05-08 15:23:38 -07:00
Android (Google) Code Review
4047ff2ca0 Merge change 1276 into donut
* changes:
  Define mime type for shortcut validation path.
2009-05-08 14:55:39 -07:00
Android (Google) Code Review
635646b3ce Merge change 1278 into donut
* changes:
  Squashed commit of the following:
2009-05-08 14:46:41 -07:00
Android (Google) Code Review
530b0521d5 Merge change 1275 into donut
* changes:
  Make the internal storage monitor work correctly when internal storage is very large.
2009-05-08 14:46:21 -07:00
The Android Open Source Project
6396c51e67 merge 55280a9
Merge commit '55280a9'
2009-05-08 13:33:21 -07:00
Android (Google) Code Review
a1b9b6a529 am 672f1e2: Merge change 1192 into donut
Merge commit '672f1e2b07d985526bfd5606e6a888005fdcb70c'

* commit '672f1e2b07d985526bfd5606e6a888005fdcb70c':
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 12:25:06 -07:00
The Android Open Source Project
d56e9daff7 manual merge 3a6645a
Merge commit '3a6645a'
2009-05-08 12:16:40 -07:00
Android (Google) Code Review
0960c1d35f Merge change 1192 into donut
* changes:
  Fix 1825581 - device restarts when using A2DP.
2009-05-08 11:41:47 -07:00
Android (Google) Code Review
3398aa6c7d Merge change 1114 into donut
* changes:
  Fix keyboard redraw bug on long-press of CapsLock.
2009-05-08 11:31:03 -07:00
Android (Google) Code Review
d2d304e104 am 17a5e5d: Merge change 1217 into donut
Merge commit '17a5e5de3d864842b723efe24650863db0656a14'

* commit '17a5e5de3d864842b723efe24650863db0656a14':
  Sketch out the IBackupTransport api
2009-05-08 11:12:34 -07:00
Android (Google) Code Review
5a49d8c25d Merge change 1217 into donut
* changes:
  Sketch out the IBackupTransport api
2009-05-08 11:10:34 -07:00
Joe Onorato
11c2776591 am c825d3e: fix the sim build. disables the tests for now.
Merge commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22'

* commit 'c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22':
  fix the sim build.  disables the tests for now.
2009-05-08 09:35:32 -07:00
Joe Onorato
2a98fb9fb1 fix the sim build. disables the tests for now. 2009-05-08 09:33:19 -07:00
The Android Open Source Project
0ced3f709d manual merge of 1e09a72
Merge commit '1e09a72'
2009-05-08 07:23:54 -07:00
The Android Open Source Project
ecfb57f4f6 am 60f3eb5: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd'

* commit '60f3eb54a01d30882dfab5e66318d8fdd9aab1dd':
  Define the URI path, columns and constants for shortcut validation.
2009-05-08 07:22:45 -07:00
The Android Open Source Project
13bfa901be am b59f23d: Merge branch \'donut\' of ssh://android-git.corp.google.com:29
Merge commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db'

* commit 'b59f23d4de77caeb0a79d7f1d5cd927772b489db':
  Require native-order direct buffers for glXXXPointer APIs.
2009-05-08 07:22:45 -07:00