OSDN Git Service
Selim Cinek [Wed, 10 Sep 2014 15:08:32 +0000 (15:08 +0000)]
Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev
Jason Monk [Wed, 10 Sep 2014 15:00:53 +0000 (15:00 +0000)]
Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev
Jason Monk [Wed, 10 Sep 2014 15:00:30 +0000 (15:00 +0000)]
Merge "Update zen mode and qs strings on locale change" into lmp-dev
Jason Monk [Wed, 10 Sep 2014 15:00:19 +0000 (15:00 +0000)]
Merge "Move zen mode constants and code to framework" into lmp-dev
John Spurlock [Wed, 10 Sep 2014 14:46:19 +0000 (14:46 +0000)]
Merge "Zen: make Condition available over @SystemApi" into lmp-dev
John Spurlock [Wed, 10 Sep 2014 14:42:13 +0000 (10:42 -0400)]
Zen: make Condition available over @SystemApi
Fix build.
Bug:
16819503
Change-Id: I011723a770a9a8b7fc8124defd56137ec5f1704e
Selim Cinek [Wed, 10 Sep 2014 14:39:01 +0000 (16:39 +0200)]
Fixed unnecessary layer creations in the pin unlock method
This was especially noticible when double tapping a notification
because of the staggered appearing.
Bug:
17287256
Change-Id: I8f39892fa122bb8b7b6f2a7b1e7be8a9570e661e
George Mount [Wed, 10 Sep 2014 14:30:15 +0000 (14:30 +0000)]
Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev
George Mount [Wed, 10 Sep 2014 14:29:58 +0000 (14:29 +0000)]
Merge "Fix fade transition not working with Activity Transitions." into lmp-dev
John Spurlock [Wed, 10 Sep 2014 13:38:08 +0000 (13:38 +0000)]
Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev
Selim Cinek [Wed, 10 Sep 2014 13:36:17 +0000 (13:36 +0000)]
Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev
Jason Monk [Mon, 8 Sep 2014 14:13:59 +0000 (10:13 -0400)]
Move zen mode constants and code to framework
This allows the strings and code to be shared with settings.
Bug:
15454830
Change-Id: I9300af4f8b6d80042452b75db3418b20c5c5cc81
John Spurlock [Wed, 10 Sep 2014 13:10:00 +0000 (09:10 -0400)]
Zen: Make condition providers available via @SystemApi.
Bug:
16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
Jorim Jaggi [Wed, 10 Sep 2014 13:03:29 +0000 (13:03 +0000)]
Merge "Use simpler layout for auto-redacted notifications" into lmp-dev
Jorim Jaggi [Wed, 10 Sep 2014 13:03:05 +0000 (13:03 +0000)]
Merge "Inflate guts only when needed" into lmp-dev
Jorim Jaggi [Mon, 8 Sep 2014 17:55:17 +0000 (19:55 +0200)]
Inflate guts only when needed
This saves us a ton of views.
Bug:
17346296
Change-Id: I3eafd6703d19704dc8b108c1034266f38cf77f7b
Selim Cinek [Wed, 10 Sep 2014 12:41:58 +0000 (14:41 +0200)]
Fixed a bug where text could overlap in Quick settings
Bug:
17434395
Change-Id: I001f54586666e2e575b0295315f7b2181c25a1e9
Adrian Roos [Wed, 10 Sep 2014 11:24:07 +0000 (11:24 +0000)]
Merge "Only unbind agents of the user that is being refreshed" into lmp-dev
Adrian Roos [Wed, 10 Sep 2014 11:23:37 +0000 (11:23 +0000)]
Merge "Add system trust agents on first boot or when adding user" into lmp-dev
Kenny Guy [Wed, 10 Sep 2014 11:14:57 +0000 (11:14 +0000)]
Merge "Remember userId when stripping / rebuilding notification." into lmp-dev
Christoph Studer [Wed, 10 Sep 2014 11:14:32 +0000 (11:14 +0000)]
Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev
Christoph Studer [Wed, 10 Sep 2014 11:14:07 +0000 (11:14 +0000)]
Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev
Adam Connors [Wed, 10 Sep 2014 10:07:13 +0000 (10:07 +0000)]
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
Yohei Yukawa [Wed, 10 Sep 2014 08:29:29 +0000 (08:29 +0000)]
Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev
Jessica Hummel [Wed, 10 Sep 2014 08:08:47 +0000 (08:08 +0000)]
Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev
Jessica Hummel [Wed, 20 Aug 2014 14:20:11 +0000 (15:20 +0100)]
Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:
17152955
Yohei Yukawa [Wed, 10 Sep 2014 05:10:30 +0000 (14:10 +0900)]
Use public APIs to instantiate InputMethodSubtype
This is a groundwork for subsequent CLs that are
supposed to improve default input method selection
logics.
Historically we have had a @hide constructor of
InputMethodSubtype. However, this contructor is
a bit obsolete because we can not specify some
parameters that were added in recent platform
releases. We should use InputMethodSubtypeBuilder
instead.
BUG:
17347871
Change-Id: I72ad79682a58344e14380eb20e26edf98aee37cd
Vinit Deshpande [Wed, 10 Sep 2014 06:34:23 +0000 (06:34 +0000)]
Merge "Secure access to WifiScanner" into lmp-dev
Zhijun He [Wed, 10 Sep 2014 05:12:25 +0000 (05:12 +0000)]
Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
Eric Rowe [Wed, 10 Sep 2014 02:43:21 +0000 (02:43 +0000)]
Merge "Allow protected wifi in connectivity tests" into lmp-dev
Lajos Molnar [Wed, 10 Sep 2014 02:38:49 +0000 (02:38 +0000)]
Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev
Eric Rowe [Wed, 10 Sep 2014 02:25:55 +0000 (19:25 -0700)]
Allow protected wifi in connectivity tests
Change-Id: I31285572f90bfb46cc28fb04e79cb9b407477a7d
Robert Shih [Fri, 5 Sep 2014 20:33:31 +0000 (13:33 -0700)]
MediaPlayer/SubtitleController:fix add/select timed text on start
- scan internal tracks when necessary
- fix overflow in addTimedTextSource
- do not hide timed text track in doSelectDefaultTrack; i.e. apply
hiding logic to subtitle tracks only
- do not notify stop in scheduleUpdate; it will be fired in onStopped
if necessary
Bug:
17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
Alan Viverette [Wed, 10 Sep 2014 01:27:56 +0000 (01:27 +0000)]
Merge "Improve dialog padding when title or body text are missing" into lmp-dev
Alan Viverette [Wed, 10 Sep 2014 01:24:52 +0000 (18:24 -0700)]
Improve dialog padding when title or body text are missing
BUG:
17446820
Change-Id: I20ace8660da90e6722e55978a3ce49eeafcd1220
Eric Laurent [Wed, 10 Sep 2014 00:52:59 +0000 (00:52 +0000)]
Merge "SoundTriggerHelper: handle media server death" into lmp-dev
Junda Liu [Sat, 6 Sep 2014 00:31:08 +0000 (17:31 -0700)]
Add ForSubscriber suffix to APIs w/ subId argument.
Bug: b/
17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
Dianne Hackborn [Wed, 10 Sep 2014 00:40:54 +0000 (00:40 +0000)]
Merge "Fix build." into lmp-dev
Dianne Hackborn [Wed, 10 Sep 2014 00:38:34 +0000 (17:38 -0700)]
Fix build.
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
Lajos Molnar [Tue, 9 Sep 2014 23:17:02 +0000 (16:17 -0700)]
MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
Bug:
17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
Eric Laurent [Tue, 9 Sep 2014 22:52:25 +0000 (15:52 -0700)]
SoundTriggerHelper: handle media server death
Retry to attach sound trigger module when startRecognition() is called.
Bug:
17373746.
Change-Id: I5b2f806b6cab47741d345be1cde73a84f5a62590
Amit Mahajan [Wed, 10 Sep 2014 00:23:48 +0000 (00:23 +0000)]
Merge "Support to load default voicemail number from the configuration." into lmp-dev
wsmlby [Wed, 10 Sep 2014 00:21:26 +0000 (00:21 +0000)]
Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev
Jinsuk Kim [Wed, 10 Sep 2014 00:16:14 +0000 (00:16 +0000)]
Merge "CEC: Stub MHL Controller" into lmp-dev
Xia Ying [Thu, 4 Sep 2014 22:12:25 +0000 (17:12 -0500)]
Support to load default voicemail number from the configuration.
If there is no preload VM number in the sim card, carriers such as
Verizon require to load a default vm number from the configurantion.
Define config_default_vm_number for this purpose. And there are two
optional formats for this configuration, example as below:
(1)<item>voicemail number</item>
(2)<item>voicemail number;gid</item>
Bug:
17209959
Change-Id: Ia4e78ad7265e73bb4e4a823dbaeb606935d39f46
George Mount [Mon, 8 Sep 2014 20:23:36 +0000 (13:23 -0700)]
Use intrinsic size for path animation in AnimatedVectorDrawable
Bug
16984007
Animated Vector Drawables were using the viewport dimensions for
calculating the allowable animation error. Instead of using viewport
dimensions, it is better to use the intrinsic dimensions. Using
the viewport dimensions meant that a small viewport (e.g. 1x1)
would mean that animation paths within would only have an accuracy
of 50% of the dimensions of the drawable.
Change-Id: Id0152eabb4effd1e50c644eea7a371b38baeb7c1
Robert Ly [Wed, 10 Sep 2014 00:02:31 +0000 (00:02 +0000)]
am
0cb4c738: am
9f60bc3f: am
52a18161: docs: update api dashboard for september
* commit '
0cb4c738fba92671dc3a1a75917259f09532a9e4':
docs: update api dashboard for september
Jeff Tinker [Tue, 9 Sep 2014 23:56:10 +0000 (23:56 +0000)]
Merge "Add support for max-res decode" into lmp-dev
Robert Ly [Tue, 9 Sep 2014 23:51:10 +0000 (23:51 +0000)]
am
9f60bc3f: am
52a18161: docs: update api dashboard for september
* commit '
9f60bc3f129037f2f1b05a09902c8e97d66322f3':
docs: update api dashboard for september
Adam Lesinski [Tue, 9 Sep 2014 23:50:02 +0000 (23:50 +0000)]
Merge changes I79ba54d7,I224fb4b6 into lmp-dev
* changes:
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
Robert Ly [Tue, 9 Sep 2014 23:40:51 +0000 (23:40 +0000)]
am
52a18161: docs: update api dashboard for september
* commit '
52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
docs: update api dashboard for september
Tsuwei Chen [Tue, 9 Sep 2014 23:29:13 +0000 (23:29 +0000)]
Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug:
17288144" into lmp-dev
Robert Ly [Tue, 9 Sep 2014 22:40:50 +0000 (15:40 -0700)]
docs: update api dashboard for september
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
Zhijun He [Tue, 9 Sep 2014 22:52:35 +0000 (15:52 -0700)]
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
Bug:
17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
Adam Lesinski [Tue, 9 Sep 2014 23:15:07 +0000 (23:15 +0000)]
Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev
wsmlby [Tue, 9 Sep 2014 23:06:50 +0000 (16:06 -0700)]
Fix AppCompatibility test for different process name of one package.
Change-Id: Ic30e5ee81fe6ea82e88d2c5541dc9fa9eba71043
Adam Lesinski [Tue, 9 Sep 2014 23:05:10 +0000 (16:05 -0700)]
AAPT: Don't crash on illegal symbol name
We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.
External bug: https://code.google.com/p/android/issues/detail?id=75876
Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
Alan Viverette [Tue, 9 Sep 2014 22:58:27 +0000 (22:58 +0000)]
Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev
Adam Powell [Tue, 9 Sep 2014 22:56:19 +0000 (22:56 +0000)]
Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
Christopher Tate [Tue, 9 Sep 2014 22:51:25 +0000 (22:51 +0000)]
Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
Winson Chung [Tue, 9 Sep 2014 14:12:59 +0000 (16:12 +0200)]
Announcing the task list as you scroll. (Bug
15699050)
Change-Id: I7453f41a2c87241e538cdc7281cdc20a8710ebbb
Winson Chung [Tue, 9 Sep 2014 17:12:14 +0000 (19:12 +0200)]
Fixing issue with Recents showing blank. (Bug
16987565)
Winson Chung [Tue, 9 Sep 2014 16:02:06 +0000 (18:02 +0200)]
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug
16656169)
Change-Id: Id8f96455f6e11a13a8ac12d341464bca4419d7c5
Winson Chung [Tue, 9 Sep 2014 15:54:51 +0000 (17:54 +0200)]
Adding task switching animation xmls for further tweaking. (Bug
16656169)
Change-Id: I472116cb3d86a3f90a935b2a3ac058ffc2ac1b5d
Winson Chung [Mon, 8 Sep 2014 20:03:37 +0000 (22:03 +0200)]
Fixing weird highlight on dismiss button ripple. (Bug
17420495)
Change-Id: I769c0647417efeda9b39913c01c62be0d6ff7887
Jeff Sharkey [Tue, 9 Sep 2014 22:44:51 +0000 (22:44 +0000)]
Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
Christopher Tate [Tue, 9 Sep 2014 22:10:56 +0000 (15:10 -0700)]
Fix BackupManager.isBackupEnabled()
It wasn't properly lazy-initializing the service binder, so it always
thought the backend service didn't exist, and so always returned false.
Also directly validated that every usage of sService in the module is
now correctly lazy-initialized.
Bug
16661321
Change-Id: If5fbb18aef81bfa8fd70eb40a1f6af54cc96d804
Tsuwei Chen [Tue, 9 Sep 2014 22:09:57 +0000 (15:09 -0700)]
Move carrier-specific GPS parameters out of framework/base directory.
Bug:
17288144
All carrier values has been moved to device only directory, in this change:
https://googleplex-android-review.git.corp.google.com/#/c/543322
Change-Id: Idb958a75edc612dc83c8382fa6546c3588889e39
Yin-Chia Yeh [Tue, 9 Sep 2014 22:24:42 +0000 (22:24 +0000)]
Merge "camera2: make 3A regions null when not available" into lmp-dev
Eino-Ville Talvala [Tue, 9 Sep 2014 22:20:57 +0000 (22:20 +0000)]
Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
vandwalle [Tue, 9 Sep 2014 22:12:05 +0000 (22:12 +0000)]
Merge "make autojoin associated scan period a config opttion" into lmp-dev
Svetoslav [Tue, 9 Sep 2014 22:11:19 +0000 (22:11 +0000)]
Merge "Trim unnecessary pages when printing." into lmp-dev
George Mount [Tue, 9 Sep 2014 22:04:31 +0000 (15:04 -0700)]
Fix fade transition not working with Activity Transitions.
Bug
17440475
transitionAlpha must be set when using Transition.forceVisibility,
but shouldn't be set when views initially come into the scene.
Change-Id: Icc61c83c701508d09dadb074c86094171dcce78a
Adrian Roos [Fri, 5 Sep 2014 16:22:28 +0000 (18:22 +0200)]
Add system trust agents on first boot or when adding user
While we're in there also call listeners when they're added
so they know the state immediately.
Bug:
17258031
Change-Id: I5f1186314795f3fafd78e1b3e2d5102cdaec65d6
Jorim Jaggi [Tue, 9 Sep 2014 21:56:09 +0000 (23:56 +0200)]
Use simpler layout for auto-redacted notifications
Saves us some views.
Bug:
17346296
Change-Id: I024f566354db2b6b93d50fcfb15f8434a1c2976b
Jeff Sharkey [Tue, 9 Sep 2014 21:57:26 +0000 (14:57 -0700)]
Missing manifest error should be NO_CERTIFICATES.
When META-INF/MANIFEST.MF is missing, treat as NO_CERTIFICATES
instead of CERTIFICATE_ENCODING. Also remove redundant layer of
debugging details when wrapping exceptions.
Bug:
15667982
Change-Id: I6e8216d5bf6e42da1feb70c89f991001380305be
Lajos Molnar [Tue, 9 Sep 2014 21:55:42 +0000 (21:55 +0000)]
Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
Guang Zhu [Tue, 9 Sep 2014 21:51:15 +0000 (21:51 +0000)]
Merge "add some assert messages to download manager test" into lmp-dev
John Spurlock [Tue, 9 Sep 2014 21:47:52 +0000 (21:47 +0000)]
Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev
Adrian Roos [Mon, 8 Sep 2014 12:03:47 +0000 (14:03 +0200)]
Only unbind agents of the user that is being refreshed
Follow-up to I470261f659a573400b2eb1421eeb953c87e58b66.
Bug:
17416492
Change-Id: If0da5f163049540476d84d147c0e733fab1ae6d5
Guang Zhu [Tue, 9 Sep 2014 21:44:17 +0000 (14:44 -0700)]
add some assert messages to download manager test
Change-Id: If2e1bdd115eddeeb7bdebf0fab29a3756fee4ceb
Alan Viverette [Tue, 9 Sep 2014 21:43:32 +0000 (21:43 +0000)]
Merge "Update alert dialog styling to match Material spec" into lmp-dev
Lajos Molnar [Tue, 9 Sep 2014 21:33:57 +0000 (14:33 -0700)]
initialize codec list before MediaCodec.getCodecInfo()
Bug:
17374217
Change-Id: I8e8fc3a34ec01afdf5fc577979010183971c878b
John Spurlock [Tue, 9 Sep 2014 21:33:01 +0000 (17:33 -0400)]
QS: Fix tile padding on dual tile first lines.
Now that the caret is not being set, update the padding to
handle this case.
Bug:
17421027
Change-Id: Iaacf60df6e39801a27dad054f2d42c99b85c46cd
Philip Milne [Tue, 9 Sep 2014 17:37:31 +0000 (10:37 -0700)]
Fix for b/
16400888 - API Review: GridLayout attributes
Column weights specify the relative proportions of space distribution
within a *row*. With that in mind, I flipped the vertical and horizontal
axes in the docs - but that was a mistake. This CL flips the docs back.
The code works the right way around so doesn't need to be modified.
Change-Id: I1a36882eee8d1b9bd7b8ef10e03cbf66de0ac261
(cherry picked from commit
4ae5f5ee917b2014abe3b6e0b99451693cd2b896)
John Spurlock [Tue, 9 Sep 2014 21:20:27 +0000 (21:20 +0000)]
Merge "On db upgrade, reset ringer mode to normal." into lmp-dev
John Spurlock [Tue, 9 Sep 2014 21:05:54 +0000 (17:05 -0400)]
On db upgrade, reset ringer mode to normal.
When users upgrade to L, don't restore into a state that would force
zen mode to follow suit. A user's first encounter with zen mode
should be via the UI.
Bug:
16826161
Change-Id: I4eb63dce37d88f3a91b5034b3393eed2b768562c
Adam Powell [Tue, 9 Sep 2014 20:51:16 +0000 (13:51 -0700)]
ActionMenuViews always reserve overflow when creating their own menus
ActionMenuViews work in two modes: hosting another Menu instance or
creating their own. The former is used when an action bar is
displaying a window's options menu. The latter is used when an
ActionMenuView (or Toolbar) is placed within an arbitrary layout and
the getMenu method is called.
When showing a window's options menu, ActionMenuPresenter calls into
the ActionBarPolicy to determine if we should reserve an overflow
button or if overflow will be presented by the window instead. Always
reserve overflow if the ActionMenuView is presenting its own menu.
Bug
17381966
Change-Id: I17c495986994d421bf6276ae39ba233243432e97
Jean-Michel Trivi [Tue, 9 Sep 2014 20:49:49 +0000 (20:49 +0000)]
Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev
John Spurlock [Tue, 9 Sep 2014 20:40:02 +0000 (20:40 +0000)]
Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev
Alan Viverette [Sun, 7 Sep 2014 22:49:49 +0000 (15:49 -0700)]
Bring up the IME when TextView receives ACTION_CLICK
Simulates the relevant portions of a DOWN/UP event pair to request focus
and bring up the IME.
BUG:
8213791
Change-Id: Idb32d81552ecbbdefc64686c914eba6d8e28b0b8
John Spurlock [Tue, 9 Sep 2014 20:32:42 +0000 (16:32 -0400)]
Zen: Map transition to ringer-mode silent to "priority".
Instead of "none".
Bug:
16875664
Change-Id: I2a425663f08f35854e7e857330afc20eef01ef2e
Adam Lesinski [Tue, 9 Sep 2014 01:31:21 +0000 (18:31 -0700)]
Make UsageStats API default on only for the system
This changes the PACKAGE_USAGE_STATS permission to be
a signature only permission, meaning that only apps
signed with the system signature have access to the
UsageStats API enabled by default.
Bug:
17428130
Change-Id: I79ba54d7102c770ea2490f014a1f6736f0f46b3a
Amith Yamasani [Tue, 9 Sep 2014 20:29:38 +0000 (20:29 +0000)]
Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
Jeff Sharkey [Tue, 9 Sep 2014 20:29:34 +0000 (20:29 +0000)]
Merge "Use sscanf() for parsing tag values." into lmp-dev
John Spurlock [Tue, 9 Sep 2014 20:24:03 +0000 (20:24 +0000)]
Merge "Doze: Wake up on touch, fade between states." into lmp-dev
John Spurlock [Tue, 9 Sep 2014 15:54:11 +0000 (11:54 -0400)]
Doze: Wake up on touch, fade between states.
- When dozing, the first motion event triggers a wake up.
- Fade the backgrounds to ease the transition out of doze.
Bug:
17167296
Change-Id: I5615ca0839dfa3ed2cf3001baf407c707f0676d5
Chris Craik [Tue, 9 Sep 2014 20:03:08 +0000 (20:03 +0000)]
Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev
Fred Fettinger [Fri, 29 Aug 2014 19:02:31 +0000 (14:02 -0500)]
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
bug:
17441218
GLConsumer uses glBindTexture() directly instead of going through
Caches::bindTexture(). This can cause libhwui to draw with the wrong
texture bound in the following case which involves 2 TextureViews:
Frame 1:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
Frame 2:
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 1)
GLConsumer::updateTexImage() calls glBindTexture(GL_TEXTURE_EXTERNAL_OES, 2)
HWUI renders TextureView A:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 1) and draws
HWUI renders TextureView B:
calls Caches::bindTexture(GL_TEXTURE_EXTERNAL_OES, 2) and draws
In this case, HWUI will incorrectly draw TextureView A using texture 2 on
frame 2, because mBoundTextures[0]=1, even though the texture currently
bound to GL_TEXTURE_EXTERNAL_OES is 2.
Since GLConsumer is always used with a target of GL_TEXTURE_EXTERNAL_OES,
work around this problem by having mBoundTextures[] store only the
textures bound to the target GL_TEXTURE_2D. This is the common case
where the extra performance is needed. Since it's legal to have
different textures bound to GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES
on one texture unit, Caches::bindTexture() does not need to clear
mBoundTextures[mTextureUnit] when target != GL_TEXTURE_2D.
Change-Id: I8bc54ab8adcfacad7f3ed17a31236dc7a86c967a
Signed-off-by: Fred Fettinger <fred.fettinger@motorola.com>
Riley Andrews [Tue, 9 Sep 2014 19:59:14 +0000 (19:59 +0000)]
Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev