OSDN Git Service
Dianne Hackborn [Fri, 3 Jun 2016 00:15:08 +0000 (17:15 -0700)]
Fix issue #
29006049: Add logging for implicit broadcasts
We now have stats on broadcasts. We collect them over a day and
then reset, retaining the last days stats. When a checkin happens,
we return either the last day or the current stats and then clear
them. Not bothing to persist anything to storage, this data is
not that critical.
Change-Id: I1c3b331bcd03f79fa5e10575d9bc2ad7d9104f6f
TreeHugger Robot [Fri, 3 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Merge "am/UserController: Log system uptime at two 'boot complete' markers." into nyc-dev
Selim Cinek [Fri, 3 Jun 2016 20:39:23 +0000 (20:39 +0000)]
Merge "Fixed a bug where talkback couldn't scroll through notifications" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 20:00:26 +0000 (20:00 +0000)]
Merge "Delete account from DE and CE databases" into nyc-dev
Android Build Merger (Role) [Fri, 3 Jun 2016 18:57:23 +0000 (18:57 +0000)]
Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5 am:
90ee70e519" into nyc-dev
Billy Lamberta [Fri, 3 Jun 2016 18:56:53 +0000 (18:56 +0000)]
docs: Fix code sample in /work: Set up Single-Purpose Devices am:
f4973c28a5
am:
90ee70e519
* commit '
90ee70e51927a1cd764bb523f419252547739803':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: I19728a3809efb6c3341fa75678625ad0d617d4d5
TreeHugger Robot [Fri, 3 Jun 2016 18:48:56 +0000 (18:48 +0000)]
Merge "docs: Update N release notes for DP4" into nyc-dev
Billy Lamberta [Fri, 3 Jun 2016 18:32:42 +0000 (18:32 +0000)]
docs: Fix code sample in /work: Set up Single-Purpose Devices
am:
f4973c28a5
* commit '
f4973c28a513b117bed6f3b7f5e2ffbd975d4f02':
docs: Fix code sample in /work: Set up Single-Purpose Devices
Change-Id: I2e2f851ddf9208d3a734913369e8ece1fe199cfe
Billy Lamberta [Thu, 2 Jun 2016 22:52:29 +0000 (15:52 -0700)]
docs: Fix code sample in /work: Set up Single-Purpose Devices
bug:
29095115
Change-Id: I7af38925ce24124d0b48368d9a0436b2d60995b5
Wang Xiaolei [Fri, 3 Jun 2016 18:08:15 +0000 (18:08 +0000)]
Merge "New prebuilt" into nyc-dev
Wang Xiaolei [Fri, 3 Jun 2016 18:08:15 +0000 (18:08 +0000)]
Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev
Fyodor Kupolov [Fri, 3 Jun 2016 18:03:03 +0000 (11:03 -0700)]
Delete account from DE and CE databases
When authenticator no longer exists and the user is unlocked, we should
remove accounts from both tables in a single transaction.
Bug:
28910995
Change-Id: Ibabf5d3e5ba561ffb3dda03aef99e358e2f71c58
TreeHugger Robot [Fri, 3 Jun 2016 17:54:20 +0000 (17:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:53:25 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Eino-Ville Talvala [Fri, 3 Jun 2016 17:51:17 +0000 (17:51 +0000)]
Merge "Camera2: Update lensShadingMap documentation" into nyc-dev
Todd Kennedy [Fri, 3 Jun 2016 17:16:12 +0000 (10:16 -0700)]
New prebuilt
Need to target API 24 and not 'N'. Also made a small change to the docs
Bug:
29116156
Change-Id: I21c37aa04a4471ca6b3f7727e470129a78f92cf0
TreeHugger Robot [Fri, 3 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Avoid triggering support dialog in non-current user." into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 17:00:22 +0000 (17:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:58:49 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:58:26 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:57:49 +0000 (16:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:56:15 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:56 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:55:01 +0000 (16:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:54:39 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 3 Jun 2016 16:53:12 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Fri, 3 Jun 2016 16:33:00 +0000 (09:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie630e761cacbec55840a3de9439aa36835a34b38
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 16:16:16 +0000 (09:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I84e7cf1ca696555a2af6838dcae6a32df4503822
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 3 Jun 2016 15:36:10 +0000 (15:36 +0000)]
Merge "Fix BigText transitions" into nyc-dev
Sudheer Shanka [Thu, 2 Jun 2016 19:41:42 +0000 (12:41 -0700)]
Avoid triggering support dialog in non-current user.
Bug:
28953755
Change-Id: I3e23a003ec7c8c3d275fa09d6d58f59cc272f617
Julia Reynolds [Thu, 2 Jun 2016 20:04:56 +0000 (16:04 -0400)]
Don't leak guts.
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes:
29064258
Bill Yi [Fri, 3 Jun 2016 13:04:14 +0000 (06:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2fd4e7683d9c10652bacfc820593e07bd58cefc0
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 12:23:35 +0000 (05:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I733983cfcd864557c987aa746c3a3f2c249a9c12
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:52:48 +0000 (04:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic52f441a17948a9d117126b1e808d05535cc558d
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:38:00 +0000 (04:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I680d494c4670c1ae92902559bf88849f043ba501
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:27:06 +0000 (04:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2bf24aac1ece07f78ad462b670824b85945b72f0
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 11:02:53 +0000 (04:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10d88a14b6477e7ba128653756a84c56ea5034c3
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 10:46:06 +0000 (03:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifc14a8e231354fe8cbe65f22761236006de64ce5
Auto-generated-cl: translation import
Bill Yi [Fri, 3 Jun 2016 10:38:40 +0000 (03:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic23e11859d0b00fba56d8a3c93afbf86d139bcb4
Auto-generated-cl: translation import
Tony Mak [Thu, 2 Jun 2016 14:01:16 +0000 (15:01 +0100)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.
Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.
Bug:
29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
Bill Yi [Fri, 3 Jun 2016 04:18:31 +0000 (21:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I08aeb7a5fb63ed7d10a218d86365331c2ba02b4e
Auto-generated-cl: translation import
Eric Schmidt [Fri, 3 Jun 2016 02:59:57 +0000 (02:59 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8
am:
76297d719d
* commit '
76297d719d5bbe2dcce65c357591c22b1a1d3293':
docs: Fixed background optmizations code snippet
Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
Eric Schmidt [Fri, 3 Jun 2016 02:52:51 +0000 (02:52 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
am:
0b8eb8c1e8
* commit '
0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
docs: Fixed background optmizations code snippet
Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
Eric Schmidt [Fri, 3 Jun 2016 02:41:45 +0000 (02:41 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
Andrii Kulian [Fri, 3 Jun 2016 01:37:50 +0000 (01:37 +0000)]
Merge "Fix task selection logic" into nyc-dev
Pankaj Kanwar [Fri, 3 Jun 2016 00:55:48 +0000 (00:55 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
Sanket Padawe [Thu, 2 Jun 2016 23:11:21 +0000 (23:11 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
Svetoslav Ganov [Thu, 2 Jun 2016 22:36:04 +0000 (22:36 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
Selim Cinek [Thu, 2 Jun 2016 22:27:56 +0000 (15:27 -0700)]
Fixed a bug where talkback couldn't scroll through notifications
Change-Id: Idac298efe3a25be1d435776817180c3acf78bf84
Fixes:
29046169
Svetoslav Ganov [Thu, 2 Jun 2016 22:25:12 +0000 (15:25 -0700)]
Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.
bug:
28963642
Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
TreeHugger Robot [Thu, 2 Jun 2016 22:08:14 +0000 (22:08 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
Billy Lamberta [Thu, 2 Jun 2016 22:04:13 +0000 (22:04 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c
am:
84903c24ed
* commit '
84903c24ed74c75a2217648a96931cc3045143ea':
docs: work minisite post-launch fixes
Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
Billy Lamberta [Thu, 2 Jun 2016 21:59:29 +0000 (21:59 +0000)]
docs: work minisite post-launch fixes
am:
9fec73a47c
* commit '
9fec73a47c158df0a184a1f2a0301b6394cfec40':
docs: work minisite post-launch fixes
Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.
Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.
Bug:
17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
Andrii Kulian [Thu, 2 Jun 2016 20:18:01 +0000 (13:18 -0700)]
Fix task selection logic
When task was selected for activity launched with flag FLAG_ACTIVITY_NEW_TASK
first matching task was omitted if there was another match lower in stack.
This lead to task shuffling in same stack.
Bug:
28848683
Change-Id: I94e55693fc7ed926fc151ba988d257bd2417dd45
Andrew Solovay [Thu, 26 May 2016 20:33:12 +0000 (13:33 -0700)]
docs: Update N release notes for DP4
Archived the DP3 release notes, and set up the skeletal DP4 notes.
Also added information about changes to multi-window mode.
(Began this CL on mnc-io-docs, but CPing it to nyc-dev since that's
where we'll be doing the DP4 docs.)
See first comment for doc stage location.
bug:
28982873
bug:
28982952
Change-Id: I9dd8579db8b88788a89f046fe6cf2052390aade4
Eino-Ville Talvala [Thu, 2 Jun 2016 21:21:27 +0000 (14:21 -0700)]
Camera2: Update lensShadingMap documentation
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to camera
device-processed data.
Also fix a few other wording issues in the lens shading documentation.
Bug:
18175853
Change-Id: I27691925e6496afe18f3506084d89f2523b5555d
Philip P. Moltmann [Thu, 2 Jun 2016 21:18:06 +0000 (21:18 +0000)]
Merge "Move Xerox recommendation plugin to service." into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 21:05:55 +0000 (21:05 +0000)]
Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
Chong Zhang [Thu, 2 Jun 2016 20:58:05 +0000 (20:58 +0000)]
Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
Philip P. Moltmann [Tue, 31 May 2016 23:29:25 +0000 (16:29 -0700)]
Do not rotate PDFPrinter pages.
- applyPrintAttributes is only used by PDFPrinter
Fixes:
29057330
Change-Id: I883cc64039f4ca2c93810e99d758f2dceec67a8b
Chris Tate [Thu, 2 Jun 2016 20:45:14 +0000 (20:45 +0000)]
Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev
Chong Zhang [Thu, 2 Jun 2016 19:56:54 +0000 (12:56 -0700)]
Fix scroll amount calculation in ViewRootImpl
When calculating scroll amount, we should check whehter focus
is visible using before-scrolling position.
It's possible that the view is already scrolled, then visible
insets changes (eg. IME went away). Previous scroll position
still makes the focus visible, but it will leave the focus
in a bad position when it should be scrolled back.
bug:
29025892
Change-Id: I091f16bebc4c1e5ba831616c51ab2ac75d4c4b3c
Adrian Roos [Thu, 2 Jun 2016 20:15:09 +0000 (13:15 -0700)]
Fix BigText transitions
Fixes a bug where BigText would never transition
between the expanded and collapsed version because
padding was wrongly taken into account when checking
the view height.
Change-Id: I4df242b4133dacdff77b78cc2d4ff3954b75b8a7
Fixes:
29042222
Billy Lamberta [Thu, 19 May 2016 21:27:49 +0000 (14:27 -0700)]
docs: work minisite post-launch fixes
* Localization for table of contents.
* Replace occurrences of 'app restrictions' with the preferred
term 'managed configurations' (see go/afw-words). Update resource
card titles and add page redirects.
* In guide, update language for SSO with Chrome Custom Tabs.
(Cherry-picked from
1056063.)
* Add resource card for 'Your Apps at Work' video.
bug:
28378252,
27744376
Change-Id: I8bc2e87d0486159bdd6680600b783af7334c3a58
Jorim Jaggi [Thu, 2 Jun 2016 19:34:56 +0000 (19:34 +0000)]
Merge "Also update setMinLines" into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:29:16 +0000 (15:29 -0400)]
Fix memory leak via ZenModeController callbacks.
Bug:
29064258
Change-Id: Ie817ec50206ce23561775fc0ac178754b946f030
TreeHugger Robot [Thu, 2 Jun 2016 19:24:15 +0000 (19:24 +0000)]
Merge "Fix leak on density change." into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:22:35 +0000 (19:22 +0000)]
Merge "Hide alarm condition if there's no alarm." into nyc-dev
Jorim Jaggi [Thu, 2 Jun 2016 01:57:54 +0000 (18:57 -0700)]
Fix unminimizing dock stack for AppTask.moveToFront
Some apps call AppTask.moveToFront instead of startActivity from
their trampoline activity. We need to handle this case also and
need to do all the post processing after starting an activity
so the docked stack gets unminimized.
Change-Id: I8400995bf1d1a4a4467d01fd55fca7e5800b4645
Fixes:
28722017
Dianne Hackborn [Thu, 2 Jun 2016 18:31:15 +0000 (18:31 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 18:04:31 +0000 (14:04 -0400)]
Hide alarm condition if there's no alarm.
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes:
27698976
James Hawkins [Fri, 27 May 2016 18:15:06 +0000 (11:15 -0700)]
am/UserController: Log system uptime at two 'boot complete' markers.
ACTION_LOCKED_BOOT_COMPLETED and ACTION_BOOT_COMPLETED.
Bug:
28070626
Change-Id: I6ff8e840a1c1faf804d6889ac0c3ad96cca8d6f3
(cherry picked from commit
64ce4e7e810c9e002771afbe0838742a82fc4ef9)
David Brazdil [Thu, 2 Jun 2016 16:16:25 +0000 (16:16 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
Mady Mellor [Thu, 2 Jun 2016 16:09:15 +0000 (16:09 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:59:23 +0000 (15:59 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:41:19 +0000 (15:41 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:41:08 +0000 (15:41 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:08:02 +0000 (15:08 +0000)]
Merge "make the notification enqueue rate threshold a setting" into nyc-dev
Chris Wren [Tue, 31 May 2016 21:14:12 +0000 (17:14 -0400)]
make the notification enqueue rate threshold a setting
Bug:
28693065
Change-Id: I08bd2ed342d5347c0075183b239558c50ada4a0a
Julia Reynolds [Thu, 2 Jun 2016 14:57:02 +0000 (10:57 -0400)]
Fix leak on density change.
Bug:
29064258
Change-Id: I9d579cc17fe4554a6a4aa57c409cef72bdee74bd
Ricky Wai [Thu, 2 Jun 2016 14:56:50 +0000 (14:56 +0000)]
Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev
David Brazdil [Thu, 2 Jun 2016 14:31:30 +0000 (15:31 +0100)]
Do not update packages in encrypted state
SystemServer used to run PMS.updatePackagesIfNeeded even when the
device is booting in encrypted state only with core packages
available. This is redundant because the packages are prebuilts
(OAT files always up to date) and the data partition is not mounted
yet, so we are only wasting time opening the OAT files and testing
checksums. Additionally, the attempt to update these packages gets
reported to TRON stats as time spent in the Optimizing Apps dialog
and skews the results.
This patch does not call updatePackagesIfNeeded when in the device
is in encrypted state.
Bug:
28833829
Change-Id: I8641d07a8840948ffe261dfb8f99f70de7341972
Ricky Wai [Thu, 2 Jun 2016 10:42:16 +0000 (11:42 +0100)]
Do not use cached tile specs value in QSTileHost.addTile()
As addTile() can be run multiple times before listener receives
the update, addTile() should always use the latest updated value
from settings but not from the cache value.
Bug:
28185436
Change-Id: I8c840343b797b00373a6f40cc5ea125efe68a6e1
Calin Juravle [Thu, 2 Jun 2016 10:10:35 +0000 (10:10 +0000)]
Merge "Don't create or check permissions on profiles during app startup" into nyc-dev
Lajos Molnar [Wed, 1 Jun 2016 05:35:27 +0000 (22:35 -0700)]
media: fix issues with video profile levels
Support additional corner cases in level ordering:
- MPEG4Level1 only implies support for MPEG4Level0
- HEVC high tier levels are only supported by other high tier levels
H263 unusual level definitions:
- levels 45/50+ define minimum requirements that codecs can extend
- levels 10-45 define minimum size
- restrict to QCIF and CIF only if codecs only supports levels 10-40
(or 45 in profiles 0 and 2)
MPEG4 max width/height/frame rate:
- Only specified for MPEG4Level0/0b
- Using arbitrary 2:1 aspect ratio and 60fps for other levels
This is sure to include typical sizes for levels
Fix level limits:
- MPEG2LevelML max 25fps for D1 PAL
- H263Level20 max 30fps, but only 15fps for CIF
- H263Level45 max 15fps
- H263Level45+ min alignment is 4
- MPEG4Level0b max 15fps
- add support for VP9 HDR profiles
- fix HEVC overflow for Level62 calculations
Bug:
28671284
Change-Id: Ie75ae1d19f20d5c6eb40807d03c3b487854eb9a0
Jorim Jaggi [Thu, 2 Jun 2016 01:12:46 +0000 (18:12 -0700)]
Also update setMinLines
If we switch to single-line, the min lines property gets overriden
so we need to manually call setMinLines to reset the state to the
initial state.
Change-Id: I1b47a093981045c2c0d176c831e37f8e9431ae1c
Fixes:
29056442
Sergei Vasilinetc [Thu, 2 Jun 2016 01:36:34 +0000 (01:36 +0000)]
Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev
Dianne Hackborn [Thu, 2 Jun 2016 01:19:24 +0000 (18:19 -0700)]
Work on issue #
29042642: Watchdog going off
Have FastPrintWriter note all cases where an exception is
thrown, and stop trying to push more data into the output
stream when this happens.
Change-Id: I51a1eeb26578f02b2a6f45ef7bc2513dfde702a2
Philip P. Moltmann [Thu, 2 Jun 2016 00:28:50 +0000 (00:28 +0000)]
Merge "Handle the uncommon case that a name is null" into nyc-dev
Jae Seo [Thu, 2 Jun 2016 00:04:16 +0000 (00:04 +0000)]
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
Jae Seo [Thu, 2 Jun 2016 00:03:52 +0000 (00:03 +0000)]
Merge "Fix documentation for channel types" into nyc-dev
Philip P. Moltmann [Wed, 1 Jun 2016 23:57:19 +0000 (23:57 +0000)]
Merge "Use text input to deal with fullscreen IME" into nyc-dev
sergeyv [Wed, 1 Jun 2016 21:53:35 +0000 (14:53 -0700)]
HWUI: do not call glCopyTexSubImage2D on empty area.
Previous check .isEmpty() is not sufficient, because getWidth() may have
value 0.5, so technically it is not empty, but when this size is passed
to texture calls it is converted to uint_32 and it becomes zero.
bug:
28941093
Change-Id: Ia7c2bf0340466d5376f235fb5da54ad2ddfa0a03
TreeHugger Robot [Wed, 1 Jun 2016 23:29:48 +0000 (23:29 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 23:15:19 +0000 (23:15 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
Sreevani Sreejith [Wed, 1 Jun 2016 22:54:06 +0000 (22:54 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am:
2d6015b18b
am:
441209abc7
* commit '
441209abc78b8c6bcbcc6b1eb08d2f41219ce344':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I761a39db759030d4f07cb6e77326fc45db215677
sreevanis [Wed, 1 Jun 2016 22:46:44 +0000 (22:46 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs
am:
2d6015b18b
* commit '
2d6015b18ba0bf52ebe402503c7c66ddae23d8bd':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I76168738a10e3f379134a88a89667a63d818323d
David Sehr [Wed, 1 Jun 2016 22:16:03 +0000 (22:16 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev