OSDN Git Service

android-x86/frameworks-base.git
8 years agoStop user faster and clear stale broadcasts
Amith Yamasani [Tue, 26 Apr 2016 21:35:54 +0000 (14:35 -0700)]
Stop user faster and clear stale broadcasts

Moved several USER_STOPPING registered receivers to listen
to USER_STOPPED, since they don't need to be blocking the
shutdown of the user.

Clear all stale broadcasts when stopping a user, so that we
don't unnecessarily start up processes and deliver stale
broadcasts. This was causing code to run when the user was
already stopped and resulted in crashes when other providers
and services couldn't be started anymore. Hopefully this fixes
many of those races.

Bug: 28371487
Change-Id: Ic35a7a23fa8fe009a53f8bf7545d4dad5fa34134

8 years agoMerge "Prevent pinned stack from having extra elevation" into nyc-dev
Jaewan Kim [Thu, 28 Apr 2016 15:10:01 +0000 (15:10 +0000)]
Merge "Prevent pinned stack from having extra elevation" into nyc-dev

8 years agoZipUtils: Fix wrong timestamps when getEntryInfo
Shammi Khattar [Wed, 6 Apr 2016 22:33:03 +0000 (15:33 -0700)]
ZipUtils: Fix wrong timestamps when getEntryInfo

"tm_mon" format should align with "ZipEntry::setModWhen" in aapt.
"tm_isdst" should be initialized, or it will because random value
and cause error in function mktime().

BUG:28021145

(cherry picked from commit bb0eb3f4cb33c077b296a18555a9a1a966ff696b)

Change-Id: Ia39cf63fcd4bb39c24af080562960279106f526c

8 years agoMerge "Properly parcel HdrCapabilities." into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 15:01:30 +0000 (15:01 +0000)]
Merge "Properly parcel HdrCapabilities." into nyc-dev

8 years agoMerge "Document behavior of object references in Animator classes" into nyc-dev
Chet Haase [Thu, 28 Apr 2016 14:33:33 +0000 (14:33 +0000)]
Merge "Document behavior of object references in Animator classes" into nyc-dev

8 years agoMerge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs am: c89d507...
Cheryl Potter [Thu, 28 Apr 2016 14:17:51 +0000 (14:17 +0000)]
Merge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs am: c89d507 am: 86a5d82
am: f83ba97

* commit 'f83ba97ef13333052d96d6d0ce11f84eba750762':
  docs: Polish Android Monitor pages b/26279420

Change-Id: Ib6e9d893f4310ec561143929d14f0fc41cbdb4f0

8 years agoMerge "Move allowGeneratedReplies to Action" into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 13:41:47 +0000 (13:41 +0000)]
Merge "Move allowGeneratedReplies to Action" into nyc-dev

8 years agoPrevent pinned stack from having extra elevation
Jaewan Kim [Wed, 27 Apr 2016 01:36:35 +0000 (10:36 +0900)]
Prevent pinned stack from having extra elevation

Pinned stack doesn't have focus, so there's no need for setting extra
elevation to show shadow for focused case.

This removes extra eleavtion for pinned stack, and improves the PIP
animation quality by preventing extra surface size change
at the end of animation.

Bug: 27364161
Change-Id: Id099a78de48b2e038a69600c94454b5cbfe0628f

8 years agoMerge "Don't count vm_map_ram as used memory in vmallocinfo." into nyc-dev
Martijn Coenen [Thu, 28 Apr 2016 09:40:11 +0000 (09:40 +0000)]
Merge "Don't count vm_map_ram as used memory in vmallocinfo." into nyc-dev

8 years agoMerge "IpManager: add distinct DhcpActionTimeoutAlarm" into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 09:30:02 +0000 (09:30 +0000)]
Merge "IpManager: add distinct DhcpActionTimeoutAlarm" into nyc-dev

8 years agoMerge "Fix ListView losing scroll position" into nyc-dev
Clara Bayarri [Thu, 28 Apr 2016 09:20:45 +0000 (09:20 +0000)]
Merge "Fix ListView losing scroll position" into nyc-dev

8 years agoIpManager: add distinct DhcpActionTimeoutAlarm
Erik Kline [Thu, 28 Apr 2016 05:46:39 +0000 (14:46 +0900)]
IpManager: add distinct DhcpActionTimeoutAlarm

Track provisioning timeouts separately from "DHCP action" timeouts.

Bug: 17733693
Bug: 24837343
Change-Id: I6071699692e7d375155a4c4fe61c7ec0d89396c0

8 years agoMerge "Notify success before configuring the IP address." into nyc-dev
Lorenzo Colitti [Thu, 28 Apr 2016 07:02:06 +0000 (07:02 +0000)]
Merge "Notify success before configuring the IP address." into nyc-dev

8 years agoFix IME adjustment for voice interaction windows
Jorim Jaggi [Thu, 28 Apr 2016 01:44:08 +0000 (18:44 -0700)]
Fix IME adjustment for voice interaction windows

Bug: 28344950
Change-Id: I42fa7abe28a693bc22c878c75839af4ef03e5e8a

8 years agoFix regression with docking from recents transition
Jorim Jaggi [Wed, 27 Apr 2016 02:51:20 +0000 (19:51 -0700)]
Fix regression with docking from recents transition

Because we move the task to the front in startRecentsActivity, we
always overrode the app transition type. Instead, we should remove
this logic and keep a flag whether the animation was prolonging was
finished already. If it was finished already, don't start the
prolonging when starting the transition.

Bug: 27154882
Change-Id: I1cd9e323867726ebd4b131ed5c13c3834d0f1107

8 years agoMerge "Clean up updating bounds after config/display info change" into nyc-dev
Jorim Jaggi [Thu, 28 Apr 2016 06:03:49 +0000 (06:03 +0000)]
Merge "Clean up updating bounds after config/display info change" into nyc-dev

8 years agoMerge "Fix API review comments, add remove callback." into nyc-dev
Martijn Coenen [Thu, 28 Apr 2016 05:34:03 +0000 (05:34 +0000)]
Merge "Fix API review comments, add remove callback." into nyc-dev

8 years agoNotify success before configuring the IP address.
Lorenzo Colitti [Thu, 28 Apr 2016 04:52:56 +0000 (13:52 +0900)]
Notify success before configuring the IP address.

This ensures that IpManager has a complete copy of DHCP state
before configuring the IPv4 address. That way, when the netlink
notification of the IPv4 address arrives, we are guaranteed to
have all DHCP information (including DNS servers and routes)
available and we will never send the IPv4 address before the DNS
servers.

Bug: 27605330
Change-Id: I732424dfe2408be9e40028563e99d610b541e12d

8 years agoMerge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs am: c89d507
Cheryl Potter [Thu, 28 Apr 2016 04:21:57 +0000 (04:21 +0000)]
Merge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs am: c89d507
am: 86a5d82

* commit '86a5d8229794579fff375f2a2c2b9809136903a0':
  docs: Polish Android Monitor pages b/26279420

Change-Id: Ibe642578c042dae3f4d6738d6b68f63ed7f4063d

8 years agoMerge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs
Cheryl Potter [Thu, 28 Apr 2016 04:19:00 +0000 (04:19 +0000)]
Merge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs
am: c89d507

* commit 'c89d5078e79460d081eb09f5fe141a5ba7ad7e64':
  docs: Polish Android Monitor pages b/26279420

Change-Id: Ic47fd05fa40a6c6b2b0cba9cade8ab51ef72cd65

8 years agoMerge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs
Cheryl Potter [Thu, 28 Apr 2016 04:12:42 +0000 (04:12 +0000)]
Merge "docs: Polish Android Monitor pages b/26279420" into mnc-mr-docs

8 years agoMerge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 04:01:09 +0000 (04:01 +0000)]
Merge "Make isCaptivePortal perform both HTTP and HTTPS probes." into nyc-dev

8 years agoMerge changes Idb555b01,If8acf31b into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 03:58:45 +0000 (03:58 +0000)]
Merge changes Idb555b01,If8acf31b into nyc-dev

* changes:
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

8 years agoClean up updating bounds after config/display info change
Jorim Jaggi [Thu, 28 Apr 2016 03:37:45 +0000 (20:37 -0700)]
Clean up updating bounds after config/display info change

We always update the display info before handling the configuration
change. Thus, we remove this weird interleaving asynchronous beast
of code and handle rotation and density in updateBoundsAfterConfigChange
and everything else in updateDisplayInfo.

Sending an asynchronous message to resize the stack only causes race
condition and issues.

Change-Id: Ifa86f62e816917822a8c1d42d13d4bf1ad9bc5bf
Fixes: 28316517
Bug: 28184044

8 years agoMerge "Don't wait for visible if there is no running activity left." into nyc-dev
Chong Zhang [Thu, 28 Apr 2016 03:40:59 +0000 (03:40 +0000)]
Merge "Don't wait for visible if there is no running activity left." into nyc-dev

8 years agoMerge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev
Chong Zhang [Thu, 28 Apr 2016 03:25:48 +0000 (03:25 +0000)]
Merge "Do not add duplicates to mWaitingVisibleActivities" into nyc-dev

8 years agoShow forced resizable based on top activity
Jorim Jaggi [Wed, 27 Apr 2016 22:40:20 +0000 (15:40 -0700)]
Show forced resizable based on top activity

Also don't show it for noDisplay activities.

Bug: 28223489
Change-Id: Idb555b019b5cebdcf16a0cfaa19d64263874735f

8 years agoMake isCaptivePortal perform both HTTP and HTTPS probes.
Lorenzo Colitti [Tue, 19 Apr 2016 12:57:31 +0000 (21:57 +0900)]
Make isCaptivePortal perform both HTTP and HTTPS probes.

Also a couple of minor cleanups and logging tweaks.

Bug: 26075613
Change-Id: I67b09e96d72764179339b616072bb2ce06aabf33

8 years agoDon't move forced resizable info activity to the front
Jorim Jaggi [Wed, 27 Apr 2016 05:41:06 +0000 (22:41 -0700)]
Don't move forced resizable info activity to the front

If we start the forced resizable activity with an existing task,
avoid moving that task to the front. This can cause that a previous
task that was moved to the back gets moved to the front again just
because we started that activity. That's not good.

Bug: 28223489
Change-Id: If8acf31b8be98b82665de1015d5621331c37fb64

8 years agoMerge "Fix contrast enforcement for RemoteInputView" into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 01:33:41 +0000 (01:33 +0000)]
Merge "Fix contrast enforcement for RemoteInputView" into nyc-dev

8 years agoMerge "Some cleanup for <uses-library> change." into nyc-dev
Jeff Hao [Thu, 28 Apr 2016 01:31:14 +0000 (01:31 +0000)]
Merge "Some cleanup for <uses-library> change." into nyc-dev

8 years agoDon't wait for visible if there is no running activity left.
Chong Zhang [Wed, 27 Apr 2016 21:11:12 +0000 (14:11 -0700)]
Don't wait for visible if there is no running activity left.

We could run into this situation on some devices (eg. clockworks),
the next activity doesn't get launched until we destroy this one.

allResumedActivitiesVisible() will return false if there is no other
activity running at all. Check top running activity and it's visibility
instead.

bug: 28400334
Change-Id: Ib8957e499580a10206fdd4e27da19fbc2bdb5843

8 years agoMerge "Fix docs build by adding include <endian.h>" into nyc-dev
Peng Xu [Thu, 28 Apr 2016 01:13:43 +0000 (01:13 +0000)]
Merge "Fix docs build by adding include <endian.h>" into nyc-dev

8 years agoMerge "Fix issue #28431297: Crash in system process" into nyc-dev
Dianne Hackborn [Thu, 28 Apr 2016 01:07:24 +0000 (01:07 +0000)]
Merge "Fix issue #28431297: Crash in system process" into nyc-dev

8 years agoMerge "Fixed a crash when the transformed view was updated while dragging" into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 01:05:23 +0000 (01:05 +0000)]
Merge "Fixed a crash when the transformed view was updated while dragging" into nyc-dev

8 years agoMerge "Apply restored wallpaper via API rather than rename-into-place" into nyc-dev
Chris Tate [Thu, 28 Apr 2016 00:56:00 +0000 (00:56 +0000)]
Merge "Apply restored wallpaper via API rather than rename-into-place" into nyc-dev

8 years agoMerge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev
Chris Tate [Thu, 28 Apr 2016 00:40:59 +0000 (00:40 +0000)]
Merge "Make sure FIRST_LAUNCH is after PACKAGE_ADDED" into nyc-dev

8 years agoDo not add duplicates to mWaitingVisibleActivities
Chong Zhang [Thu, 28 Apr 2016 00:29:28 +0000 (17:29 -0700)]
Do not add duplicates to mWaitingVisibleActivities

processStoppingActivitiesLocked() only removes one record each time, so
instead of stopping on the next window visible (or next idle), it now
requires two such calls to move the app to destroyed, if there's only
one report, the app never gets removed.

bug: 28417200

Change-Id: I7c5eac240074ed0434a72643a8d52f1726ab906c

8 years agoMerge "Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true" into nyc-dev
Jaewan Kim [Thu, 28 Apr 2016 00:10:59 +0000 (00:10 +0000)]
Merge "Fix NPE when WindowManagerDebugConfig.DEBUG_SCREENSHOT is true" into nyc-dev

8 years agoFix contrast enforcement for RemoteInputView
Adrian Roos [Wed, 27 Apr 2016 23:34:35 +0000 (16:34 -0700)]
Fix contrast enforcement for RemoteInputView

Previously, the disabled color was used for the contrast
calculations, which resulted in too dark RemoteInputView
backgrounds.

Change-Id: I99e8b2fa64a22a59fdc5d1be8a6aff5af3523a27
Fixes: 28429720

8 years agoMerge "Add a security warning to PdfRenderer doc." into nyc-dev
TreeHugger Robot [Thu, 28 Apr 2016 00:06:02 +0000 (00:06 +0000)]
Merge "Add a security warning to PdfRenderer doc." into nyc-dev

8 years agoFix issue #28431297: Crash in system process
Dianne Hackborn [Thu, 28 Apr 2016 00:03:52 +0000 (17:03 -0700)]
Fix issue #28431297: Crash in system process

Don't allow null URIs to get put into the notification path.

Change-Id: I4f68f438960c8a90c7b417feaa2e19968a3a200a

8 years agoMerge "RemoteInput: add logging and metrics" into nyc-dev
Adrian Roos [Thu, 28 Apr 2016 00:03:01 +0000 (00:03 +0000)]
Merge "RemoteInput: add logging and metrics" into nyc-dev

8 years agoMerge "Prevent dismissal on RemoteInputView" into nyc-dev
Adrian Roos [Thu, 28 Apr 2016 00:02:43 +0000 (00:02 +0000)]
Merge "Prevent dismissal on RemoteInputView" into nyc-dev

8 years agoMerge "Fixes 2 race conditions in MetricsLoggerService" into nyc-dev
Hugo Benichi [Wed, 27 Apr 2016 23:50:45 +0000 (23:50 +0000)]
Merge "Fixes 2 race conditions in MetricsLoggerService" into nyc-dev

8 years agoMerge "zygote: Remove NativeLoader initialization step" into nyc-dev
Dimitry Ivanov [Wed, 27 Apr 2016 23:37:10 +0000 (23:37 +0000)]
Merge "zygote: Remove NativeLoader initialization step" into nyc-dev

8 years agoMerge "Add low power stats to batteryhistory" into nyc-dev
Badhri Jagan Sridharan [Wed, 27 Apr 2016 23:32:16 +0000 (23:32 +0000)]
Merge "Add low power stats to batteryhistory" into nyc-dev

8 years agoProperly parcel HdrCapabilities.
Michael Wright [Wed, 27 Apr 2016 23:26:16 +0000 (19:26 -0400)]
Properly parcel HdrCapabilities.

Since the field might be null, we can't just read and write the
object directly. Use Parcel's convenience methods to do so safely
instead.

Bug: 28427070
Change-Id: I6460c9cb43dc6da97d5fd9edeaa78bdaaf105446

8 years agoFixed a crash when the transformed view was updated while dragging
Selim Cinek [Wed, 27 Apr 2016 01:17:57 +0000 (18:17 -0700)]
Fixed a crash when the transformed view was updated while dragging

The transformed view could get updated during the transition
leading to a crash sometimes. We're now handling this better and
make sure the correct values are set.

Change-Id: I1a311cb7c108afeec0fc1c92eb3359c622db7b87
Fixes: 27922191

8 years agoMerge "Fix MessagingStyle HUNs" into nyc-dev
Adrian Roos [Wed, 27 Apr 2016 23:17:06 +0000 (23:17 +0000)]
Merge "Fix MessagingStyle HUNs" into nyc-dev

8 years agoApply restored wallpaper via API rather than rename-into-place
Christopher Tate [Wed, 27 Apr 2016 22:47:13 +0000 (15:47 -0700)]
Apply restored wallpaper via API rather than rename-into-place

This plays nicer with SELinux and generally means we can be more robust
about file security policies.

Bug 28403975

Change-Id: I857ee7073c0090c7515421f41c9334025e25bc79

8 years agoMerge "fix recursion for config change" into nyc-dev
Keun-young Park [Wed, 27 Apr 2016 23:04:49 +0000 (23:04 +0000)]
Merge "fix recursion for config change" into nyc-dev

8 years agoMerge "Broadcast USER_INITIALIZE after user is unlocked" into nyc-dev
Fyodor Kupolov [Wed, 27 Apr 2016 23:02:08 +0000 (23:02 +0000)]
Merge "Broadcast USER_INITIALIZE after user is unlocked" into nyc-dev

8 years agoFixed translations so that they become translatable
Selim Cinek [Wed, 27 Apr 2016 01:28:56 +0000 (18:28 -0700)]
Fixed translations so that they become translatable

Change-Id: I0b97327b44ca5a09dd925ad34e99684eeed59639
Fixes: 28375835

8 years agoMerge "Fixed a bug where the media template wasn't transforming right" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 23:00:04 +0000 (23:00 +0000)]
Merge "Fixed a bug where the media template wasn't transforming right" into nyc-dev

8 years agoMerge "Fixed a crash where the overflow number wasn't initialized" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 22:59:40 +0000 (22:59 +0000)]
Merge "Fixed a crash where the overflow number wasn't initialized" into nyc-dev

8 years agoMerge "Handle empty bigTexts more gracefully" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 22:58:57 +0000 (22:58 +0000)]
Merge "Handle empty bigTexts more gracefully" into nyc-dev

8 years agoMerge "Fix several accessibility magnification issues." into nyc-dev
Phil Weaver [Wed, 27 Apr 2016 22:50:34 +0000 (22:50 +0000)]
Merge "Fix several accessibility magnification issues." into nyc-dev

8 years agoSome cleanup for <uses-library> change.
Jeff Hao [Wed, 27 Apr 2016 22:50:16 +0000 (15:50 -0700)]
Some cleanup for <uses-library> change.

Addresses comments made in:
https://googleplex-android-review.git.corp.google.com/#/c/976512

Bug: 26880306
Change-Id: I382fb39f3bb5de5a03506f5526d909cf55530542

8 years agoFix docs build by adding include <endian.h>
Peng Xu [Wed, 27 Apr 2016 21:49:25 +0000 (14:49 -0700)]
Fix docs build by adding include <endian.h>

Added endian.h into include list to avoid build error in "docs".
The function "htobe64" in endian.h is used.

Change-Id: Ic76dab25d34c56b58b97849dfa7b103963392568

8 years agofix recursion for config change
Keun-young Park [Wed, 27 Apr 2016 22:02:07 +0000 (15:02 -0700)]
fix recursion for config change

- update mTempConfig from mCurConfig first to decide if
  config is changed or not. This fixes recursion of putting
  new config again from reconfigureDisplay
- ignore setNewConfiguration if there is no change in configuration
  This fixes another recursion due to config change -> app restart
  loop

bug: 28381048

Change-Id: I4c2e6072b269baf9fa11d4b8073f0800c0e0d28d

8 years agoMerge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 22:41:11 +0000 (22:41 +0000)]
Merge "Tethering and Data Saver: There Can Be Only One!" into nyc-dev

8 years agoMerge "Fixed that notifications didn't fade away when brightness changed" into nyc-dev
Selim Cinek [Wed, 27 Apr 2016 22:38:35 +0000 (22:38 +0000)]
Merge "Fixed that notifications didn't fade away when brightness changed" into nyc-dev

8 years agoMerge "Don't lose content change during rollback for loader already started" into...
TreeHugger Robot [Wed, 27 Apr 2016 22:25:37 +0000 (22:25 +0000)]
Merge "Don't lose content change during rollback for loader already started" into nyc-dev

8 years agoMerge "Fix remote input view clobbering" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 22:17:32 +0000 (22:17 +0000)]
Merge "Fix remote input view clobbering" into nyc-dev

8 years agoMake sure FIRST_LAUNCH is after PACKAGE_ADDED
Christopher Tate [Tue, 26 Apr 2016 00:08:56 +0000 (17:08 -0700)]
Make sure FIRST_LAUNCH is after PACKAGE_ADDED

If an app undergoes restore during install, it is considered 'started'
and the FIRST_LAUNCH broadcast needs to go out.  However, this must not
take place until after the restore operation has fully completed, in
order to avoid publishing the app's existence while it may still be in
an incoherent state.  We now make this broadcast part of POST_INSTALL
in the restore case.

Bundled apps are in the 'started' state regardless, so no FIRST_LAUNCH
broadcast is ever sent for them -- this CL does not change that
existing behavior even in the case of setup-time data restore of
factory-installed packages.

Bug 28173625

Change-Id: Ibcc3758576662dc447b75476173a0d008a9fe4da

8 years agoAdd a security warning to PdfRenderer doc.
Philip P. Moltmann [Wed, 27 Apr 2016 21:54:27 +0000 (14:54 -0700)]
Add a security warning to PdfRenderer doc.

Change-Id: Ia714d312665179366adae8e1923e4b9c339ebb59

8 years agoMerge "Always account for divider height when calculating list height" into nyc-dev
Alan Viverette [Wed, 27 Apr 2016 21:50:46 +0000 (21:50 +0000)]
Merge "Always account for divider height when calculating list height" into nyc-dev

8 years agoMerge "Support zero-length paths for a11y gestures." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 21:48:05 +0000 (21:48 +0000)]
Merge "Support zero-length paths for a11y gestures." into nyc-dev

8 years agoMerge "Add a 1st-time dialog for Data Saver title." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 21:42:04 +0000 (21:42 +0000)]
Merge "Add a 1st-time dialog for Data Saver title." into nyc-dev

8 years agoMerge "Fix crash when docking." into nyc-dev
Rob Carr [Wed, 27 Apr 2016 21:36:50 +0000 (21:36 +0000)]
Merge "Fix crash when docking." into nyc-dev

8 years agoMerge "Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:30:07 +0000 (21:30 +0000)]
Merge "Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev am: 171a1c2" into nyc-dev

8 years agoMerge "Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev am: 7659acc" into nyc-dev

8 years agoMerge "typo am: de6fde7 am: 55ba523 am: aaf1d09 am: 044913e" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:46 +0000 (21:29 +0000)]
Merge "typo am: de6fde7 am: 55ba523 am: aaf1d09 am: 044913e" into nyc-dev

8 years agoMerge "typo am: 3517069 am: 76f95c2 am: 7432ecf" into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:33 +0000 (21:29 +0000)]
Merge "typo am: 3517069 am: 76f95c2 am: 7432ecf" into nyc-dev

8 years agoMerge "Merge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:22 +0000 (21:29 +0000)]
Merge "Merge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787 am: 4defc19 am: c070811" into nyc-dev

8 years agoMerge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:11 +0000 (21:29 +0000)]
Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am: 96e6abb am: 39a59d0 am: 86c6f97 am: c7984b5" into nyc-dev

8 years agoMerge "Android Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:29:00 +0000 (21:29 +0000)]
Merge "Android Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am: 6461bca am: 7499bc7" into nyc-dev

8 years agoMerge "Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:49 +0000 (21:28 +0000)]
Merge "Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am: c939dd0 am: 19f9481 am: 88b2780" into nyc-dev

8 years agoMerge "Merge "Remove static _book.yaml in favor of generated version (samples_navtree...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:37 +0000 (21:28 +0000)]
Merge "Merge "Remove static _book.yaml in favor of generated version (samples_navtree_data.cs)." into mnc-mr-docs am: 2974e94 am: 1c1a85bc am: 61a6d2f" into nyc-dev

8 years agoMerge "Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:26 +0000 (21:28 +0000)]
Merge "Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am: b8767b7 am: 599796e am: f2f64b7 am: c78400e" into nyc-dev

8 years agoMerge "Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:15 +0000 (21:28 +0000)]
Merge "Merge "Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771" into mnc-mr-docs am: f8e0d7f am: b6491aa am: 0a33248" into nyc-dev

8 years agoMerge "Fixing network tags." into nyc-dev
Antonio Cansado [Wed, 27 Apr 2016 21:28:11 +0000 (21:28 +0000)]
Merge "Fixing network tags." into nyc-dev

8 years agoMerge "docs: Update SDK Manager for 2.0 changes b/26385384 am: 5f153b5 am: 559648a...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:28:05 +0000 (21:28 +0000)]
Merge "docs: Update SDK Manager for 2.0 changes b/26385384 am: 5f153b5 am: 559648a am: 14f034a am: 9bfc51e" into nyc-dev

8 years agoMerge "Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:56 +0000 (21:27 +0000)]
Merge "Merge "docs: Update SDK Manager for 2.0 changes b/26385384" into mnc-mr-docs am: 0f6ab24 am: 4363c43 am: d8e0ae4" into nyc-dev

8 years agoMerge "Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:44 +0000 (21:27 +0000)]
Merge "Merge "doc: Removed duplicate card from distribute/users page" into mnc-docs am: b515691 am: 4a5d857 am: f1a7aa6 am: 0a504d0" into nyc-dev

8 years agoMerge "Docs: Added that Method References work with earlier API levels am: 11e3f91...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:30 +0000 (21:27 +0000)]
Merge "Docs: Added that Method References work with earlier API levels am: 11e3f91 am: 89b9ee0 am: a6fbfaf am: 8f00192" into nyc-dev

8 years agoMerge "Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to...
Android Build Merger (Role) [Wed, 27 Apr 2016 21:27:19 +0000 (21:27 +0000)]
Merge "Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install." into mnc-mr-docs am: 19d1e73e41 am: 68af8d0 am: 1d52e49" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 27 Apr 2016 21:26:44 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 27 Apr 2016 21:26:04 +0000 (21:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
Kevin Hufnagle [Wed, 27 Apr 2016 21:25:28 +0000 (21:25 +0000)]
Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
am: 171a1c2

* commit '171a1c25467619af7a9268975d9b742914dc0bd6':

Change-Id: Iad7ca4e11e1fbe24b72ca74d816c83dedac4caf0

8 years agoMerge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev
Kevin Hufnagle [Wed, 27 Apr 2016 21:25:22 +0000 (21:25 +0000)]
Merge changes I4bf40d49,I8c1b82f0,I6128b520,Icf1428e3,I44704847, ... into mnc-ub-dev
am: 7659acc

* commit '7659acc0e7219cf562505ec09c1b4a31223f09ec':

Change-Id: I60f3fb7f1f4a88ff5c2bea721b2b6554decad677

8 years agotypo am: de6fde7 am: 55ba523 am: aaf1d09
smain@google.com [Wed, 27 Apr 2016 21:25:15 +0000 (21:25 +0000)]
typo am: de6fde7 am: 55ba523 am: aaf1d09
am: 044913e

* commit '044913ef93fb16a0a3fa3b6161bfdcf0e13a75a0':
  typo

Change-Id: I149d71c0465f44cb56dc2b3b3b3ad20e81dc713b

8 years agotypo am: 3517069 am: 76f95c2
smain@google.com [Wed, 27 Apr 2016 21:25:00 +0000 (21:25 +0000)]
typo am: 3517069 am: 76f95c2
am: 7432ecf

* commit '7432ecf8a38f1ebfa1370cae15725f9728f26470':
  typo

Change-Id: I24d977bc7a4b4bc815212b047ddca24db62190ad

8 years agoMerge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787 am...
Adarsh Fernando [Wed, 27 Apr 2016 21:24:39 +0000 (21:24 +0000)]
Merge "Docs: Gradle 2.1.0 Release Notes" into mnc-docs am: aa53fb1 am: c49e787 am: 4defc19
am: c070811

* commit 'c07081121939e7dc8c9093c8acf5103ca0e530fa':
  Docs: Gradle 2.1.0 Release Notes

Change-Id: I7993a48c45f4f1ead36ae7350f485243d8e133a9

8 years agoUpdate the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am: 96e6abb...
smain@google.com [Wed, 27 Apr 2016 21:24:22 +0000 (21:24 +0000)]
Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771 am: 96e6abb am: 39a59d0 am: 86c6f97
am: c7984b5

* commit 'c7984b5d62b511a17f3030641d44efc2b147a776':
  Update the N Preview docs now that Studio 2.1 is stable. bug: 28342771

Change-Id: I01396349b0ec8e88be46888f8a44f8f93c4c0f8d

8 years agoAndroid Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am: 6461bca
smain@google.com [Wed, 27 Apr 2016 21:24:10 +0000 (21:24 +0000)]
Android Studio 2.1 release notes and downloads. am: 8e48332 am: beab847 am: 6461bca
am: 7499bc7

* commit '7499bc755f1e4137ba4775498967c80807a48065':
  Android Studio 2.1 release notes and downloads.

Change-Id: I0e5d14f33d27ba4e019177833dc84f6b0fabb4c1

8 years agoMerge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am: c939dd0...
smain@google.com [Wed, 27 Apr 2016 21:23:59 +0000 (21:23 +0000)]
Merge "Android Studio 2.1 release notes and downloads." into mnc-mr-docs am: c939dd0 am: 19f9481
am: 88b2780

* commit '88b27807cc248607f713e97b1791186fc7e37313':
  Android Studio 2.1 release notes and downloads.

Change-Id: I55b8646648edbd6657b5bb781c6a239a828fe782

8 years agoMerge "Remove static _book.yaml in favor of generated version (samples_navtree_data...
Dirk Dougherty [Wed, 27 Apr 2016 21:23:49 +0000 (21:23 +0000)]
Merge "Remove static _book.yaml in favor of generated version (samples_navtree_data.cs)." into mnc-mr-docs am: 2974e94 am: 1c1a85bc
am: 61a6d2f

* commit '61a6d2f359e3ae81e7f962ba9fc02e0a92ceb300':
  Remove static _book.yaml in favor of generated version (samples_navtree_data.cs).

Change-Id: I9086d484fc307a7c1e39a06c317383d7b2e9c7be

8 years agoMerge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am: b8767b7...
Kevin Hufnagle [Wed, 27 Apr 2016 21:23:39 +0000 (21:23 +0000)]
Merge "docs: Added entry in USB vendor ID table for HP." into mnc-docs am: b8767b7 am: 599796e am: f2f64b7
am: c78400e

* commit 'c78400e09598850ff9404933f2d3cfc887a92339':
  docs: Added entry in USB vendor ID table for HP.

Change-Id: I6d69fbd8324c77dc64bf87e0878c249a9cd099e0