OSDN Git Service
Jinsuk Kim [Wed, 10 Sep 2014 00:24:48 +0000 (00:24 +0000)]
am
a8c43b25: Merge "CEC: Stub MHL Controller" into lmp-dev
* commit '
a8c43b254104ead2c465544efb88ec8de6f9f462':
CEC: Stub MHL Controller
Robert Ly [Wed, 10 Sep 2014 00:18:04 +0000 (00:18 +0000)]
am
bb6ede49: am
0cb4c738: am
9f60bc3f: am
52a18161: docs: update api dashboard for september
* commit '
bb6ede49f4378feb261a577a74ee0532a9b3f4f0':
docs: update api dashboard for september
Jeff Tinker [Wed, 10 Sep 2014 00:17:58 +0000 (00:17 +0000)]
am
50bb6215: Merge "Add support for max-res decode" into lmp-dev
* commit '
50bb621501fafc85be31e2039a43e6bbe93344bd':
Add support for max-res decode
Adam Lesinski [Wed, 10 Sep 2014 00:17:53 +0000 (00:17 +0000)]
am
38bd55ff: Merge changes I79ba54d7,I224fb4b6 into lmp-dev
* commit '
38bd55ffd7084d744e4e814593056e1e12ebfb00':
Make UsageStats API default on only for the system
ActivityManager shouldn't return null for getCurrentUser
Tsuwei Chen [Wed, 10 Sep 2014 00:17:43 +0000 (00:17 +0000)]
am
5675ab1b: Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug:
17288144" into lmp-dev
* commit '
5675ab1b691f2dc2b94bbdd78bbdbba90896cb01':
Move carrier-specific GPS parameters out of framework/base directory. Bug:
17288144
Adam Lesinski [Wed, 10 Sep 2014 00:17:39 +0000 (00:17 +0000)]
am
799dc748: Merge "AAPT: Don\'t crash on illegal symbol name" into lmp-dev
* commit '
799dc7483f6c6a4b554f2a3dad4b801371347cea':
AAPT: Don't crash on illegal symbol name
Alan Viverette [Wed, 10 Sep 2014 00:17:35 +0000 (00:17 +0000)]
am
b7afde5c: Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev
* commit '
b7afde5c05fa7bc37aa8cdd58b55b298dbeca004':
Bring up the IME when TextView receives ACTION_CLICK
Adam Powell [Wed, 10 Sep 2014 00:17:31 +0000 (00:17 +0000)]
am
8197da77: Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev
* commit '
8197da7703d0753d29b3ab5fda8771ef9d165d40':
ActionMenuViews always reserve overflow when creating their own menus
Christopher Tate [Wed, 10 Sep 2014 00:17:26 +0000 (00:17 +0000)]
am
3b9417ff: Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev
* commit '
3b9417ff52248190fa324eef87bec8ab050e42f4':
Fix BackupManager.isBackupEnabled()
Winson Chung [Wed, 10 Sep 2014 00:17:22 +0000 (00:17 +0000)]
am
b68c78bd: Announcing the task list as you scroll. (Bug
15699050)
* commit '
b68c78bdec4f680e4b5536a7f8df90513cc5aba7':
Announcing the task list as you scroll. (Bug
15699050)
Winson Chung [Wed, 10 Sep 2014 00:17:19 +0000 (00:17 +0000)]
am
5ec5fa49: Fixing issue with Recents showing blank. (Bug
16987565)
* commit '
5ec5fa491c6cba8a6bb451d0aa121318df927ffd':
Fixing issue with Recents showing blank. (Bug
16987565)
Winson Chung [Wed, 10 Sep 2014 00:17:15 +0000 (00:17 +0000)]
am
d7a863be: Fixing issue with touch events not being forwarded to task switch fling detector. (Bug
16656169)
* commit '
d7a863be76afb458cb59472ad02d49568ada6e04':
Fixing issue with touch events not being forwarded to task switch fling detector. (Bug
16656169)
Winson Chung [Wed, 10 Sep 2014 00:16:42 +0000 (00:16 +0000)]
am
7d631483: Adding task switching animation xmls for further tweaking. (Bug
16656169)
* commit '
7d631483fc22a2d66f2510c93be8387d6c2bbdca':
Adding task switching animation xmls for further tweaking. (Bug
16656169)
Winson Chung [Wed, 10 Sep 2014 00:16:39 +0000 (00:16 +0000)]
am
b754940a: Fixing weird highlight on dismiss button ripple. (Bug
17420495)
* commit '
b754940a89eea209763b564325e100f45bd1c0c3':
Fixing weird highlight on dismiss button ripple. (Bug
17420495)
Jeff Sharkey [Wed, 10 Sep 2014 00:16:35 +0000 (00:16 +0000)]
am
c5d4ebd6: Merge "Missing manifest error should be NO_CERTIFICATES." into lmp-dev
* commit '
c5d4ebd640a0bca62fb52a42830c8646316ee386':
Missing manifest error should be NO_CERTIFICATES.
Jinsuk Kim [Wed, 10 Sep 2014 00:16:14 +0000 (00:16 +0000)]
Merge "CEC: Stub MHL Controller" into lmp-dev
Yin-Chia Yeh [Wed, 10 Sep 2014 00:16:07 +0000 (00:16 +0000)]
am
916d8faf: Merge "camera2: make 3A regions null when not available" into lmp-dev
* commit '
916d8fafe6b61b7499cc8d41331adfb11d2136fa':
camera2: make 3A regions null when not available
Eino-Ville Talvala [Wed, 10 Sep 2014 00:16:03 +0000 (00:16 +0000)]
am
28312293: Merge "Camera2: Add frameNumber to CaptureCallback#onCaptureStarted" into lmp-dev
* commit '
28312293a2dfab504e5d1e6102c5392d652b6981':
Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
vandwalle [Wed, 10 Sep 2014 00:15:55 +0000 (00:15 +0000)]
am
5e811150: Merge "make autojoin associated scan period a config opttion" into lmp-dev
* commit '
5e811150b9d538d0e59a367d8d75a20d85a12549':
make autojoin associated scan period a config opttion
Svetoslav [Wed, 10 Sep 2014 00:15:50 +0000 (00:15 +0000)]
am
3f49b128: Merge "Trim unnecessary pages when printing." into lmp-dev
* commit '
3f49b128bc94c1b1e66decf96d46a83bcdb9a62b':
Trim unnecessary pages when printing.
Lajos Molnar [Wed, 10 Sep 2014 00:15:41 +0000 (00:15 +0000)]
am
adbca3e5: Merge "initialize codec list before MediaCodec.getCodecInfo()" into lmp-dev
* commit '
adbca3e552abc358326b4245a4fc4b8761e79b7e':
initialize codec list before MediaCodec.getCodecInfo()
Guang Zhu [Wed, 10 Sep 2014 00:15:38 +0000 (00:15 +0000)]
am
a3cd7592: Merge "add some assert messages to download manager test" into lmp-dev
* commit '
a3cd75926fd65afee93305ebe88f01c05a27be96':
add some assert messages to download manager test
John Spurlock [Wed, 10 Sep 2014 00:15:22 +0000 (00:15 +0000)]
am
7fa27583: Merge "QS: Fix tile padding on dual tile first lines." into lmp-dev
* commit '
7fa275831652f2fcaf6df2d10264f2c9b8ae0346':
QS: Fix tile padding on dual tile first lines.
Alan Viverette [Wed, 10 Sep 2014 00:15:18 +0000 (00:15 +0000)]
am
ba2ce6fa: Merge "Update alert dialog styling to match Material spec" into lmp-dev
* commit '
ba2ce6fa080df627646501f58bab5fde76b0f2c2':
Update alert dialog styling to match Material spec
Philip Milne [Wed, 10 Sep 2014 00:15:07 +0000 (00:15 +0000)]
am
2a95b928: Fix for b/
16400888 - API Review: GridLayout attributes
* commit '
2a95b928c8fbe326d79776fa30d0d18809a0dd45':
Fix for b/
16400888 - API Review: GridLayout attributes
John Spurlock [Wed, 10 Sep 2014 00:15:03 +0000 (00:15 +0000)]
am
0b7a5768: Merge "On db upgrade, reset ringer mode to normal." into lmp-dev
* commit '
0b7a576895b15d19fd0b1880ccba633ea1d6010a':
On db upgrade, reset ringer mode to normal.
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
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
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
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
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
Jean-Michel Trivi [Tue, 9 Sep 2014 20:57:26 +0000 (20:57 +0000)]
am
013279ac: Merge "Prevent NotificationManagerService from using bad stream type" into lmp-dev
* commit '
013279ac439d3a4acb7e53a8af1ff8cd146543fa':
Prevent NotificationManagerService from using bad stream type
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:46:59 +0000 (20:46 +0000)]
am
cdc2b578: Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev
* commit '
cdc2b578ac80aad887745896b689bda4442a1028':
Zen: Map transition to ringer-mode silent to "priority".
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
Amith Yamasani [Tue, 9 Sep 2014 20:38:39 +0000 (20:38 +0000)]
am
7a9f541e: Merge "User restriction to disallow outgoing NFC beam" into lmp-dev
* commit '
7a9f541e596b4db8824969678896161c8e06d6bc':
User restriction to disallow outgoing NFC beam
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
Jeff Sharkey [Tue, 9 Sep 2014 20:30:41 +0000 (20:30 +0000)]
am
b8d727ec: Merge "Use sscanf() for parsing tag values." into lmp-dev
* commit '
b8d727ec928c77d4131a5f90995f29b829443b57':
Use sscanf() for parsing tag values.
John Spurlock [Tue, 9 Sep 2014 20:30:38 +0000 (20:30 +0000)]
am
d09f0b6b: Merge "Doze: Wake up on touch, fade between states." into lmp-dev
* commit '
d09f0b6b2c599ea05172c20404a2009dec61a7e9':
Doze: Wake up on touch, fade between states.
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:04:56 +0000 (20:04 +0000)]
am
e46cfca2: Merge "hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D" into lmp-dev
* commit '
e46cfca2a778cdcd0081afa2fc4177094c26e5d8':
hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D
Riley Andrews [Tue, 9 Sep 2014 20:04:53 +0000 (20:04 +0000)]
am
4b7c14bf: Merge "Use surfaceflinger for recents thumbnail rotations." into lmp-dev
* commit '
4b7c14bf1cb62c806223b12fdf3c5ba1d48908e7':
Use surfaceflinger for recents thumbnail rotations.
Alan Viverette [Tue, 9 Sep 2014 20:04:49 +0000 (20:04 +0000)]
am
e74dff14: Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev
* commit '
e74dff14dc6e075e372aeedb6610243c28884610':
Use correct row/column order in list and grid CollectionItems
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
Alan Viverette [Tue, 9 Sep 2014 19:57:08 +0000 (19:57 +0000)]
Merge "Use correct row/column order in list and grid CollectionItems" into lmp-dev
Wink Saville [Sat, 6 Sep 2014 00:48:21 +0000 (17:48 -0700)]
Unhide SubscriptionManager and SubInfoRecord
Change-Id: I1e6efb4442f0400d404d725c7db5020a26c00f98
Eino-Ville Talvala [Mon, 8 Sep 2014 21:30:50 +0000 (14:30 -0700)]
Camera2: Add frameNumber to CaptureCallback#onCaptureStarted
Otherwise, cannot reliably match up capture progressed and failure callbacks
with the start callback.
Bug:
17421092
Change-Id: I91d92be70a15536b215bac330370ce37e426ec26
Jeff Sharkey [Tue, 9 Sep 2014 19:29:41 +0000 (12:29 -0700)]
Use sscanf() for parsing tag values.
Neither strtoll() nor strtoull() can parse the %llx formatted tag
values coming from the kernel. We know the lowest 32 bits will never
be set, so fast-path the 3-character case as 0x0.
Bug:
17365163
Change-Id: I238bbd2830c9335e7ab7a53362d6e12b46e0bcb3
Amith Yamasani [Tue, 9 Sep 2014 16:57:27 +0000 (09:57 -0700)]
User restriction to disallow outgoing NFC beam
This can be controlled by MDMs via DPM.
Also fixes:
- javadoc for restrictions
- persisting of cross profile copy/paste restriction
Bug:
17387303
Change-Id: Ie148f56189181d2a4c6345c0823d417ab13a94a3
Griff Hazen [Tue, 9 Sep 2014 18:54:36 +0000 (18:54 +0000)]
am
df35ac5f: Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev
* commit '
df35ac5fab51383099a2f8e5206202af58ef79bf':
Remove reference to StatusBarNotification after the value is accessed.
Chris Craik [Tue, 9 Sep 2014 18:54:33 +0000 (18:54 +0000)]
am
c9071002: Merge "Fix tessellation bounds computation" into lmp-dev
* commit '
c907100262b423e28dfd7258cb86c515c421a5d0':
Fix tessellation bounds computation
Winson Chung [Tue, 9 Sep 2014 18:54:29 +0000 (18:54 +0000)]
am
3d0581d0: Merge "Fixing issue with screen pinning not working. (Bug
17436123)" into lmp-dev
* commit '
3d0581d0c3a88b95760bec6fbbf4df033b6f239f':
Fixing issue with screen pinning not working. (Bug
17436123)
Winson Chung [Tue, 9 Sep 2014 18:54:26 +0000 (18:54 +0000)]
am
2d6118a1: Merge "Separating the notion of transposed search vs nav bar. (Bug
17402331)" into lmp-dev
* commit '
2d6118a1821a882cfad600d78ef3de34800148ba':
Separating the notion of transposed search vs nav bar. (Bug
17402331)
Griff Hazen [Tue, 9 Sep 2014 18:54:22 +0000 (18:54 +0000)]
am
c06b7a78: Copy visibility docs from support version to base Notification.
* commit '
c06b7a78433830308ac62be25b3a13d6415e3699':
Copy visibility docs from support version to base Notification.
Jason Monk [Tue, 9 Sep 2014 18:54:06 +0000 (18:54 +0000)]
am
76779dbc: Merge "Add user-specific playSoundEffect and use in NavBar" into lmp-dev
* commit '
76779dbc3f743aada5c1f0c545dbf90722249511':
Add user-specific playSoundEffect and use in NavBar
Vineeta Srivastava [Tue, 9 Sep 2014 18:54:03 +0000 (18:54 +0000)]
am
a66c2cd1: Merge "Set MTU size to 1410 for Telus." into lmp-dev
* commit '
a66c2cd18b668b8c692b2c632ec260e4b7fdb46f':
Set MTU size to 1410 for Telus.
Alexandra Gherghina [Tue, 9 Sep 2014 18:53:50 +0000 (18:53 +0000)]
am
c3b392d0: Merge "Removing the NO_CROSS_PROFILE flag for intent forwarding" into lmp-dev
* commit '
c3b392d02693f8236fdc6ebc90412e3c4aaa5843':
Removing the NO_CROSS_PROFILE flag for intent forwarding
Griff Hazen [Tue, 9 Sep 2014 18:35:53 +0000 (18:35 +0000)]
Merge "Remove reference to StatusBarNotification after the value is accessed." into lmp-dev
Chris Craik [Tue, 9 Sep 2014 18:34:06 +0000 (18:34 +0000)]
Merge "Fix tessellation bounds computation" into lmp-dev
Winson Chung [Tue, 9 Sep 2014 18:33:17 +0000 (18:33 +0000)]
Merge "Fixing issue with screen pinning not working. (Bug
17436123)" into lmp-dev
Winson Chung [Tue, 9 Sep 2014 18:33:06 +0000 (18:33 +0000)]
Merge "Separating the notion of transposed search vs nav bar. (Bug
17402331)" into lmp-dev
Adam Lesinski [Tue, 9 Sep 2014 00:50:03 +0000 (17:50 -0700)]
ActivityManager shouldn't return null for getCurrentUser
There was a race where ActivityManager would return null
for getCurrentUser() when switching between guest accounts.
This is because the Guest account was marked for deletion
while it was still active.
Bug:
17290209
Change-Id: I224fb4b6836380e5acb7dbeb8f3343d74505f88a