5705 Commits

Author SHA1 Message Date
Mathias Agopian
abac01052c 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
1a20bae18c 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
5b5c914487 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
a05f75d61a 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
f0f6c51e13 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
c134c281ca 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
992c1ebda1 Merge change 9260
* changes:
  Fix crash while dialing "*228;1"
2009-07-30 16:14:38 -07:00
Amith Yamasani
a2ef00b428 Don't invalidate view if setEnabled doesn't change the state.
Check the current enabled state before setting it, in case there's
no change. Otherwise some apps are repeatedly redrawing buttons based
on validation of some text field (like gmail or mms message bodies).
Should slightly improve the performance of soft keyboard text entry.
2009-07-30 16:14:34 -07:00
Christopher Tate
f2348429bc Highlight IMEI-reading as part of READ_PHONE_STATE description 2009-07-30 16:13:03 -07:00
Android (Google) Code Review
20b8e3a347 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
0185fc570b 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
2801ac1a77 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
ae7d38ad92 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-07-30 16:07:30 -07:00
Jaikumar Ganesh
ab752276ee 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
a31ce104f5 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
93efb724ac 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
bb2e26c57c 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
04bdf2ce14 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
455266e173 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
9225dfa70c 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
cb798bcf13 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
afcf686cb0 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
1247a6444b Merge change 9243 into donut
* changes:
  Clean up RIL_SIM_* in RILConstants
2009-07-30 15:50:49 -07:00
Mike LeBeau
c2e0607205 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, obscuring the new voice search
results behind.

Fixes http://b/2025364
2009-07-30 15:48:24 -07:00
John Wang
0d45e37069 Clean up RIL_SIM_* in RILConstants
GET_SIM_STATUS now returns structure RIL_CardStatus. So RIL_SIM_* status are obsoleted.

	modified:   java/com/android/internal/telephony/RILConstants.java
2009-07-30 15:45:12 -07:00
Libin Tang
d903014c1f Fix crash while dialing "*228;1" 2009-07-30 15:44:39 -07:00
Libin Tang
d23b2cd28c Fix CDMA ERI/roaming indicator issues
- If the SID is not in NAM and PRL, the phone should use default Roaming
  Indicator
- If a system is acquired that matches the NAM but does NOT match the PRL,
  the device shall display a FLASHING roaming indicator
- Handle corner cases for PRL is not loaded / Home SID is not programmed
- Reorganize the ERI logic
2009-07-30 15:43:12 -07:00
Android (Google) Code Review
8845ea0592 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
Mike Lockwood
49f746823e Remove android:multiprocess from ShutdownActivity to ensure it runs in the system process.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-30 15:27:00 -07:00
Android (Google) Code Review
a0afa2dc86 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
Jason Sams
dba3ba5b5b Implement bitmap resource loaders for utility. cleanup rolloRS and checkin maps.png which was missing. 2009-07-30 14:56:12 -07:00
Android (Google) Code Review
e7f03253f9 Merge change 9070
* changes:
  Adding resizeInput and setAttributes for overlay
2009-07-30 14:37:48 -07:00
Jaikumar Ganesh
f4fbdfa53f Update current.xml after review comments. 2009-07-30 14:09:59 -07:00
Android (Google) Code Review
b995b21d67 Merge change 9198
* changes:
  Fix missed Aggregate->Contact name change.
2009-07-30 13:04:33 -07:00
Jaikumar Ganesh
0da3bdb476 Fix public API caused due to CDMA changes. 2009-07-30 12:37:43 -07:00
Android (Google) Code Review
af3d2be76d 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
5e631892fb Fix a debug statement in BufferMapper 2009-07-30 12:24:41 -07:00
Mathias Agopian
f293b2ff78 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
396dbf45e3 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
Evan Millar
ac39b26b51 Fix missed Aggregate->Contact name change. 2009-07-30 11:46:13 -07:00
Android (Google) Code Review
5483c50688 Merge change 9193
* changes:
  Remove hardcoded maximum frame rate limit from the framework bug 1993400
2009-07-30 11:34:25 -07:00
Grace Kloba
ef347ef910 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.

On the other hand, we do want to trigger the resize for the new page after
the first layout. e.g. The page was at nytimes.com. Now user types google.com.
google.com is first layout in the wide viewport where nytimes.com is. We dont
want to show that picture. We would like to show the fit to screen version of
google.com as the first picture.

Remove the SnapToAnchor code which is left over from previous zoom attempt.
2009-07-30 11:20:32 -07:00
James Dong
cbe7c5441c Remove hardcoded maximum frame rate limit from the framework
bug 1993400
2009-07-30 11:16:11 -07:00
Mike Lockwood
bad80e0dcc Add Activity Intent.ACTION_REQUEST_SHUTDOWN for requesting a system shutdown.
The Intent.EXTRA_KEY_CONFIRM extra can be set to require user confirmation before shutting down.
The ACTION_REQUEST_SHUTDOWN Intent is protected by android.permission.SHUTDOWN.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-30 10:16:28 -07:00
johnwang
d2fb980060 Represent SID/NID in decimal format.
Interpret SID/NID ad decimal and add try/catch block to prevent crashing in wrong format. Update SID/NID comments.

	modified:   java/com/android/internal/telephony/CommandsInterface.java
	modified:   java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
2009-07-30 10:10:19 -07:00
Android (Google) Code Review
dcfc5c2318 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
cdc50d779b 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
0c05edf0c5 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
2a8c531bac 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
0cbdb39991 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