Commit Graph

3273 Commits

Author SHA1 Message Date
Mathias Agopian
cf81c84e43 be more robust when errors occur upon EGL surface creation (ie: don't crash) 2009-07-31 14:47:00 -07:00
Android (Google) Code Review
fa170f5133 Merge change 9287
* changes:
  fixed some issues with the software renderer when surfaces are made current.
2009-07-30 18:46:48 -07:00
Mathias Agopian
cb6b904164 fixed some issues with the software renderer when surfaces are made current.
there was several issues:
- when a surface was made non-current, the last frame wasn't shown and the buffer could stay locked
- when a surface was made current the 2nd time, it would not dequeue a new buffer

now, queue/dequeue are done when the surface is made current.

for this to work, a new query() hook had to be added on android_native_window_t, it allows to retrieve some attributes of a window (currently only width and height).
2009-07-30 18:14:56 -07:00
Android (Google) Code Review
b6db63a126 Merge change 9267
* changes:
  Don't invalidate view if setEnabled doesn't change the state.
2009-07-30 16:55:04 -07:00
Android (Google) Code Review
87582aa573 am c134c281: Merge change 9265 into donut
Merge commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f'

* commit 'c134c281ca83a28deb96c7b338c48c0b0327f26f':
  Highlight IMEI-reading as part of READ_PHONE_STATE description
2009-07-30 16:20:51 -07:00
Android (Google) Code Review
740dfb83a8 Merge change 9265 into donut
* changes:
  Highlight IMEI-reading as part of READ_PHONE_STATE description
2009-07-30 16:18:21 -07:00
Android (Google) Code Review
67f3b76b83 Merge change 9260
* changes:
  Fix crash while dialing "*228;1"
2009-07-30 16:14:38 -07:00
Android (Google) Code Review
1412574a48 am 1247a644: Merge change 9243 into donut
Merge commit '1247a6444bb9f006e0b9def5cd15d626785424bb'

* commit '1247a6444bb9f006e0b9def5cd15d626785424bb':
  Clean up RIL_SIM_* in RILConstants
2009-07-30 16:07:57 -07:00
Mike LeBeau
f1f5cf4381 am c2e06072: Tell the SearchManager to stopSearch before starting an in-app voice search. Without this, because of the recent changes to how the search dialog hides and resumes, we end up re-showing the search dialog after returning to the app from voice search, obscu
Merge commit 'c2e06072051e319bc609df66f4c72b77716f4fa4'

* commit 'c2e06072051e319bc609df66f4c72b77716f4fa4':
  Tell the SearchManager to stopSearch before starting an in-app voice
2009-07-30 16:07:50 -07:00
Jaikumar Ganesh
3ebe645e3a am f4fbdfa5: Update current.xml after review comments.
Merge commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f'

* commit 'f4fbdfa53fe0497d9b1f3b9642df357bb765e84f':
  Update current.xml after review comments.
2009-07-30 16:07:30 -07:00
Android (Google) Code Review
a743a8162b Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-30 16:07:30 -07:00
Jaikumar Ganesh
77de6e058a am 0da3bdb4: Fix public API caused due to CDMA changes.
Merge commit '0da3bdb476086db02a1076780676b21e239c79d6'

* commit '0da3bdb476086db02a1076780676b21e239c79d6':
  Fix public API caused due to CDMA changes.
2009-07-30 16:07:11 -07:00
Mike Reed
5c82ba745b am 6af2552d: use safeUnref() since the other macro is not defined in donut
Merge commit '6af2552d244ff933dfd54570121db455cc7c3cda'

* commit '6af2552d244ff933dfd54570121db455cc7c3cda':
  use safeUnref() since the other macro is not defined in donut
2009-07-30 16:06:31 -07:00
Android (Google) Code Review
b5307e7e4e am 7299d6ad: Merge change 9159 into donut
Merge commit '7299d6ad9820bbb601034542c94d6dc73cc4829d'

* commit '7299d6ad9820bbb601034542c94d6dc73cc4829d':
  check for null native objects, which never happens on a real subclass (we throw in that case)
2009-07-30 16:06:21 -07:00
Android (Google) Code Review
4b9948de77 am 67fb5728: Merge change 9147 into donut
Merge commit '67fb5728332f7e3f8c11245fb9cb9d1cfe2b5607'

* commit '67fb5728332f7e3f8c11245fb9cb9d1cfe2b5607':
  Fix in-app search shortcut icons
2009-07-30 16:05:59 -07:00
Android (Google) Code Review
b5ba1545b6 am 4598d149: Merge change 9145 into donut
Merge commit '4598d149fb9c081877a214d74efadcb60d2acbb9'

* commit '4598d149fb9c081877a214d74efadcb60d2acbb9':
  Add the encryption option to PptpProfile parcel.
2009-07-30 16:05:51 -07:00
Android (Google) Code Review
7deedbd508 am b203a57d: Merge change 9114 into donut
Merge commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87'

* commit 'b203a57d1f00fe509e0d065cd928099bb7d19d87':
  Add state saving mechanism to support proc restart
2009-07-30 16:05:45 -07:00
Chung-yih Wang
c7ceaf245e am f4692640: Add unit tests for netkeystore.
Merge commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a'

* commit 'f4692640a8c40b8bbba1f00841c2f8fbe7b28d7a':
  Add unit tests for netkeystore.
2009-07-30 16:05:39 -07:00
Android (Google) Code Review
e2d245c287 am 73139aea: Merge change 9075 into donut
Merge commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1'

* commit '73139aead7203c22f3a4abb5e9fd8abd5ef249b1':
  Change the resource path for fwd locked apps when scanning the fwd locked install
2009-07-30 16:05:33 -07:00
Android (Google) Code Review
ff1dcc2cf9 am 25dff70f: Merge change 9039 into donut
Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de'

* commit '25dff70f153529b87f5ad4a92f4de21e8950b1de':
  Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
2009-07-30 16:05:27 -07:00
Android (Google) Code Review
adfbb0cb49 Merge change 9243 into donut
* changes:
  Clean up RIL_SIM_* in RILConstants
2009-07-30 15:50:49 -07:00
Android (Google) Code Review
c76696a276 Merge change 9245
* changes:
  Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.
2009-07-30 15:29:21 -07:00
Android (Google) Code Review
9ba91fe794 Merge change 9236
* changes:
  Implement bitmap resource loaders for utility.  cleanup rolloRS and checkin maps.png which was missing.
2009-07-30 14:58:14 -07:00
Android (Google) Code Review
abcfe35781 Merge change 9070
* changes:
  Adding resizeInput and setAttributes for overlay
2009-07-30 14:37:48 -07:00
Android (Google) Code Review
391aac8181 Merge change 9198
* changes:
  Fix missed Aggregate->Contact name change.
2009-07-30 13:04:33 -07:00
Android (Google) Code Review
81358e7178 Merge changes 9206,9207
* changes:
  Fix a debug statement in BufferMapper
  NPOT EGLimage without GL_ARB_texture_non_power_of_two would be improperly scalled
2009-07-30 12:31:47 -07:00
Mathias Agopian
69bdcb9b7b Fix a debug statement in BufferMapper 2009-07-30 12:24:41 -07:00
Mathias Agopian
f9cd64bc6c NPOT EGLimage without GL_ARB_texture_non_power_of_two would be improperly scalled
The current gralloc allocates buffer memory for render targets that will typically have NPOT dimensions. Assuming that the vendor driver supports converting the resulting NPOT android_native_buffer_t to a NPOT EGLImage, SurfaceFlinger calls glEGLImageTargetTexture2DOES(), and uses glGetError() to test whether the GL can support creating an EGL target texture with the specified NPOT EGLImage. If it is supported, the DIRECT_TEXTURE flag remains set, otherwise it is cleared.

Tangentially, if the driver advertises the GL_ARB_texture_non_power_of_two extension, the NPOT_EXTENSION flag is set, otherwise it is cleared.

If the driver supported creating an EGL target texture from a NPOT source EGLImage, it implicitly creates a NPOT texture. This does not need any glScalef() texture coordinate correction in LayerBase::drawWithOpenGL(). However, the same driver may not advertise the GL_ARB_texture_non_power_of_two extension nor generally support NPOT textures that were not derived from EGLImages. So SurfaceFlinger may flag only DIRECT_TEXTURE, not NPOT_EXTENSION.

Therefore, the test in LayerBase::drawWithOpenGL() should only perform the glScalef() if neither NPOT_EXTENSION or DIRECT_TEXTURE are flagged. Otherwise scaling is applied to NPOT EGL target textures when none is required.
2009-07-30 12:19:10 -07:00
Android (Google) Code Review
90771a0a57 Merge change 9175
* changes:
  Fix 2016808. We used to send the new scale/scroll info to the UI thread after WebCore finish the first layout. As the picture in the UI thread is still the previous one, if there is a UI update happened before we generate the new picture, the new scale/scroll will be applied to the old picture.
2009-07-30 12:02:45 -07:00
Android (Google) Code Review
80dc4d263e Merge change 9193
* changes:
  Remove hardcoded maximum frame rate limit from the framework bug 1993400
2009-07-30 11:34:25 -07:00
Android (Google) Code Review
7cab489fc4 am b91e2b02: Merge change 9073 into donut
Merge commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8'

* commit 'b91e2b0292f9f4f76175a18e6e3cf392f3967ae8':
  Special-case search within the browser to not show the app icon
2009-07-30 09:57:42 -07:00
Android (Google) Code Review
a028696995 am c6eb5ac9: Merge change 9071 into donut
Merge commit 'c6eb5ac988518f41938c4f021003d6c202d84819'

* commit 'c6eb5ac988518f41938c4f021003d6c202d84819':
  Fix issue #2018454: NullPointerException in ImageSpan constructor
2009-07-30 09:57:32 -07:00
Android (Google) Code Review
575cd7e5da am 9c71716e: Merge change 9063 into donut
Merge commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80'

* commit '9c71716e3de9b6a7e1830cae13da35ebdeeaaa80':
  Fixing bug #2023024 - there is an out of bounds exception that
2009-07-30 09:57:23 -07:00
Android (Google) Code Review
51b955a380 am 65e5438d: Merge change 8966 into donut
Merge commit '65e5438df929ceb8c44fd930b2a363e021914bd0'

* commit '65e5438df929ceb8c44fd930b2a363e021914bd0':
  Add tests for android.net.vpn.
2009-07-30 09:57:02 -07:00
Robert Greenwalt
d574f1b7f5 am 41c10433: Fix MulticastLock API to match WifiLock API.
Merge commit '41c104339951e0e5e78240e1f48455c21b3ba5fd'

* commit '41c104339951e0e5e78240e1f48455c21b3ba5fd':
  Fix MulticastLock API to match WifiLock API.
2009-07-30 09:56:45 -07:00
Android (Google) Code Review
5b5a61de99 Merge change 9097
* changes:
  Wifi: Add support for enabling Wifi while in airplane mode.
2009-07-30 08:35:03 -07:00
Android (Google) Code Review
3983194355 Merge change 9159 into donut
* changes:
  check for null native objects, which never happens on a real subclass (we throw in that case) but can happen because we allow the callers to create the base class from java.
2009-07-30 08:16:09 -07:00
Android (Google) Code Review
641b0d42a3 am 0067057c: Merge change 9035 into donut
Merge commit '0067057c31720f64926d6ee3d841b15dc197d2df'

* commit '0067057c31720f64926d6ee3d841b15dc197d2df':
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
2009-07-30 06:57:23 -07:00
Android (Google) Code Review
999b047cd7 am 3d716ed6: (-s ours) Merge change 9021 into donut
Merge commit '3d716ed6a3274cc49dc08029d7ace683b99200ac'

* commit '3d716ed6a3274cc49dc08029d7ace683b99200ac':
  DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-30 06:57:14 -07:00
Jean-Baptiste Queru
c684cc45fd am f4dc9da3: Merge snapshot variant of donut back into the main tree
Merge commit 'f4dc9da3724c20837e3a361060acd139775541ac'

* commit 'f4dc9da3724c20837e3a361060acd139775541ac':
  donut snapshot
2009-07-30 06:57:04 -07:00
Android (Google) Code Review
30335775d3 am 2bad713f: Merge change 8860 into donut
Merge commit '2bad713f31d642d5350949b90b3abe00fbd9ca55'

* commit '2bad713f31d642d5350949b90b3abe00fbd9ca55':
  Fix bug 2017664
2009-07-30 06:56:37 -07:00
Wink Saville
4cffc44322 am b307c894: Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
Merge commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0'

* commit 'b307c8945d4bf8d843445f3cc6d727f4e43d90f0':
  Fix bug 1994955 where PHONE_TYPE_CDMA was 0 and it should be 2 and added RILConstants.NO_PHONE.
2009-07-30 06:56:24 -07:00
Android (Google) Code Review
6e1d81b696 Merge change 9147 into donut
* changes:
  Fix in-app search shortcut icons
2009-07-30 06:06:09 -07:00
Android (Google) Code Review
3d067c43dc Merge change 9145 into donut
* changes:
  Add the encryption option to PptpProfile parcel.
2009-07-30 05:46:07 -07:00
Hung-ying Tyan
907a880fa2 Add the encryption option to PptpProfile parcel. 2009-07-30 20:36:27 +08:00
Android (Google) Code Review
61b773f342 Merge change 9114 into donut
* changes:
  Add state saving mechanism to support proc restart
2009-07-30 04:46:00 -07:00
Hung-ying Tyan
0bd458b9f5 Add state saving mechanism to support proc restart
Also...
+ stop daemons before getting server IP;
+ remove setForeground();
+ add the DBG flag for Log.d calls.

PatchSet 3:
+ add CHALLENGE_ERROR and REMOTE_HUNG_UP to VpnManager
+ broadcast new error codes in VpnService
+ check local IP change instead of dns change
+ move removeStates() to VpnService.onFinalCleanUp()

PatchSet 7:
+ add encryption flag to PptpProfile
+ PptpService and MtpdHelper are revised accordingly
2009-07-30 19:14:50 +08:00
Chung-yih Wang
ccf407f7ac Add unit tests for netkeystore.
+ some boundary checks.
2009-07-30 16:37:48 +08:00
Android (Google) Code Review
6c8991186e Merge change 9098
* changes:
  CDMA Message Waiting Indication support
2009-07-29 21:47:16 -07:00
Android (Google) Code Review
e84bee9bbf Merge change 9075 into donut
* changes:
  Change the resource path for fwd locked apps when scanning the fwd locked install directory
2009-07-29 21:14:34 -07:00