Commit Graph

5648 Commits

Author SHA1 Message Date
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
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
Android (Google) Code Review
ba272be725 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
c17ae711e9 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
0d39ce852e 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
95528d4384 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
cdc0d941e8 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
98ad09880b 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
1d359556d8 Merge change 9098
* changes:
  CDMA Message Waiting Indication support
2009-07-29 21:47:16 -07:00
Mike Lockwood
bd5ddf01e4 Wifi: Add support for enabling Wifi while in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-29 21:37:14 -07:00
Android (Google) Code Review
6502a380ad Merge change 9090
* changes:
  Simplify image loading.  Use common internal format.
2009-07-29 21:06:23 -07:00
Jason Sams
0ea8c8a7c0 Simplify image loading. Use common internal format. 2009-07-29 21:05:11 -07:00
Android (Google) Code Review
7518f16793 Merge change 9089
* changes:
  Filmstrip work and boxed bitmap load bugfixes.
2009-07-29 20:57:02 -07:00
Jason Sams
faf1520be7 Filmstrip work and boxed bitmap load bugfixes. 2009-07-29 20:55:44 -07:00
yong liu
c84401fb8b CDMA Message Waiting Indication support
Add support for Message Waiting Info Record defined in 3GPP2 C.S-0005
and used for voice mail count by some CDMA networks
2009-07-29 20:54:03 -07:00
Yong Zhang
96f2747dd6 Fix wrong Singal Strength interpretation.
The issue this change fixes is that phone status bar shows full
signal strength bar even when phone is in bad signal area. The
root cause is that the signal strenth  is incorrectly interpreted.
2009-07-29 20:39:52 -07:00
Android (Google) Code Review
206b7b1709 Merge change 8974
* changes:
  Fix OOB in arraycopy.
2009-07-29 18:28:12 -07:00
Android (Google) Code Review
b91e2b0292 Merge change 9073 into donut
* changes:
  Special-case search within the browser to not show the app icon to the left of the search field. Also, because this removes context about whether you're in browser search or global search, we make sure to clear any entered text if you jump out to global search from within browser search.
2009-07-29 18:20:18 -07:00
Mike LeBeau
5a7d752b65 Special-case search within the browser to not show the app icon
to the left of the search field. Also, because this removes context
about whether you're in browser search or global search, we make
sure to clear any entered text if you jump out to global search from
within browser search.

This is a really ugly hack, but was required by the UI team. We will
find a better way to reconcile in Eclair.
2009-07-29 18:17:13 -07:00
Android (Google) Code Review
c6eb5ac988 Merge change 9071 into donut
* changes:
  Fix issue #2018454: NullPointerException in ImageSpan constructor
2009-07-29 18:09:28 -07:00
Dianne Hackborn
0cd6376fa1 Fix issue #2018454: NullPointerException in ImageSpan constructor 2009-07-29 17:55:58 -07:00
Android (Google) Code Review
9c71716e3d Merge change 9063 into donut
* changes:
  Fixing bug #2023024 - there is an out of bounds exception that can happen if services are going away as the AccessibilityManagerService is trying to dispatch notifications to these services. Catching this exception and bailing because having this exception means that there are no more services around that need to get this notification.
2009-07-29 17:48:56 -07:00
Android (Google) Code Review
75ac5fb875 Merge change 9065
* changes:
  Checkin art assets for film test app and change loading of icons to 8888.
2009-07-29 17:43:05 -07:00
Jason Sams
31b532ee9e Checkin art assets for film test app and change loading of icons to 8888. 2009-07-29 17:39:45 -07:00
Charles Chen
85b598beda Fixing bug #2023024 - there is an out of bounds exception that
can happen if services are going away as the AccessibilityManagerService
is trying to dispatch notifications to these services. Catching this
exception and bailing because having this exception means that there
are no more services around that need to get this notification.
2009-07-29 17:23:50 -07:00
Android (Google) Code Review
65e5438df9 Merge change 8966 into donut
* changes:
  Add tests for android.net.vpn.
2009-07-29 17:16:13 -07:00
Android (Google) Code Review
fc6627a892 Merge change 9054
* changes:
  Increase waiting time for data disable action in setPowerStateToDesired().
2009-07-29 17:03:04 -07:00
Yong Zhang
6afac8b292 Increase waiting time for data disable action in setPowerStateToDesired().
The issue this change fixes is that phone did not send MIP deregisteration
and LCP termination message when user powered down phone while data call was
in dormant state.  The root cause is Framework Telephony did not wait long
enough before it sent the request to power off the radio. The fix is to
increase the waiting timer.
2009-07-29 17:01:24 -07:00
Jinghui Guo
79ef673d56 Disable data call in emergency call 2009-07-29 16:58:11 -07:00
Android (Google) Code Review
977e67bb50 am 0869f7ef: Merge change 8962 into donut
Merge commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa'

* commit '0869f7ef1efa9fe2e26b20e525952ad611d379aa':
  Log uid and package name when launching intents from search
2009-07-29 16:48:40 -07:00
Android (Google) Code Review
26e287ccb5 Merge change 9040
* changes:
  Don't offer to add numbers to the dictionary.
2009-07-29 16:48:34 -07:00
Android (Google) Code Review
ba58c6f228 am ad346278: Merge change 8208 into donut
Merge commit 'ad346278fe129a341543d4a75bf9cc08c50742f8'

* commit 'ad346278fe129a341543d4a75bf9cc08c50742f8':
  Removing MD2
2009-07-29 16:45:22 -07:00
Android (Google) Code Review
cda5ad5b70 am 9b91d78a: Merge change 8911 into donut
Merge commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8'

* commit '9b91d78a21f6e66f571169f2c6f2f94e638511e8':
  Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden
2009-07-29 16:45:14 -07:00
Android (Google) Code Review
d1399070b9 Merge change 9052
* changes:
  Less log spew.
2009-07-29 16:43:38 -07:00
Joe Onorato
2d9c9e3f67 Less log spew. 2009-07-29 16:43:06 -07:00
Android Git Automerger
ce41050023 resolved conflicts for merge of 4d4229e4 to master 2009-07-29 16:42:09 -07:00
Robert Greenwalt
41c1043399 Fix MulticastLock API to match WifiLock API.
Adds option to make lock refcounted or not.  Fixes 2017680.
2009-07-29 16:30:23 -07:00
Joe Onorato
e712ee3fe1 Take ctate's suggestions from 9008. 2009-07-29 16:23:58 -07:00
Eric Fischer
56cf7889d2 Don't offer to add numbers to the dictionary.
Only show the "add to dictionary" context menu item if the current word
contains at least one letter.

Bug 1877803
2009-07-29 15:52:44 -07:00
Android (Google) Code Review
0067057c31 Merge change 9035 into donut
* changes:
  Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes.
2009-07-29 15:27:55 -07:00
Jack Veenstra
5d5cd178e3 Fix the TabWidget to display custom views for the tabs better when the tabs have different sizes. 2009-07-29 15:19:23 -07:00
Android (Google) Code Review
3d716ed6a3 Merge change 9021 into donut
* changes:
  DO NOT MERGE - Fix CNAP-related NullPointerException
2009-07-29 14:52:11 -07:00
Wink Saville
9953eb27ed DO NOT MERGE - Fix CNAP-related NullPointerException
This will fix a CNAP-related bug where missing a call from a party with an
"Unknown" number presentation and then trying to log that call will cause
a NullPointerException to be thrown.

This was already merged into master so marked will not be merged.
2009-07-29 14:51:26 -07:00
Android (Google) Code Review
bbdf3cafe9 am 67897b1a: (-s ours) Merge change 8884 into donut
Merge commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d'

* commit '67897b1af7ab7bea1dc3f9caf5f3ee5c026a179d':
  DO NOT MERGE. Already in master. Fix calendar test.
2009-07-29 14:47:50 -07:00