OSDN Git Service
Bill Yi [Wed, 27 Apr 2016 13:10:42 +0000 (06:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb4e5316af0f8a302487f3b737efef8b99f0fe9f
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 27 Apr 2016 01:45:11 +0000 (01:45 +0000)]
Merge "Don't hold lock when calling externally" into nyc-dev
Svetoslav Ganov [Wed, 27 Apr 2016 01:39:23 +0000 (01:39 +0000)]
Merge "Replace null checks is null object checks" into nyc-dev
Svetoslav Ganov [Wed, 27 Apr 2016 01:36:42 +0000 (18:36 -0700)]
Replace null checks is null object checks
A recent change replaced the null state during a setting
lookup with a null object, however missed to update some
null checks to be null object ones.
bug:
28405145
Change-Id: I80f0fb3ac6e64f4283b6c617283a009e97a40efe
TreeHugger Robot [Wed, 27 Apr 2016 01:18:42 +0000 (01:18 +0000)]
Merge "Terminate DocumentsUI opened for the specific root." into nyc-dev
Scott Main [Wed, 27 Apr 2016 01:11:18 +0000 (01:11 +0000)]
Merge "resolve merge conflicts of
886bbdb to nyc-dev" into nyc-dev
Tomasz Mikolajewski [Wed, 27 Apr 2016 01:11:02 +0000 (01:11 +0000)]
Merge "Exclude virtual files from ACTION_SEND." into nyc-dev
smain@google.com [Wed, 27 Apr 2016 01:09:06 +0000 (18:09 -0700)]
resolve merge conflicts of
886bbdb to nyc-dev
Change-Id: Ib6a009d086ff9f4c3a568124170cd6203f1b385b
Chong Zhang [Wed, 27 Apr 2016 01:08:15 +0000 (01:08 +0000)]
Merge "Finish immediately if the resumed activity is already visible" into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 00:53:17 +0000 (00:53 +0000)]
Merge "Don't override pre-release target sdk" into nyc-dev
Rob Carr [Wed, 27 Apr 2016 00:47:57 +0000 (00:47 +0000)]
Merge "Fix bugs with takeSurface and preserveWindows." into nyc-dev
Android Build Merger (Role) [Wed, 27 Apr 2016 00:43:23 +0000 (00:43 +0000)]
Merge "Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am:
e60e315 am:
f2a8f83 am:
86eb9f3" into nyc-dev
Adarsh Fernando [Wed, 27 Apr 2016 00:40:09 +0000 (00:40 +0000)]
Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am:
e60e315 am:
f2a8f83
am:
86eb9f3
* commit '
86eb9f3770faf3fbae439d583db31a5055a06625':
Docs: Minor edit to IR docs to mention longer intial/clean builds
Change-Id: I52767d1d4a5b0421611056747f0f8bb41c548ae7
TreeHugger Robot [Wed, 27 Apr 2016 00:39:40 +0000 (00:39 +0000)]
Merge "Fix two multi-user bugs in package upgrade." into nyc-dev
TreeHugger Robot [Wed, 27 Apr 2016 00:32:39 +0000 (00:32 +0000)]
Merge "Set installed flag of all users if system app is installed later" into nyc-dev
Tomasz Mikolajewski [Wed, 27 Apr 2016 00:30:45 +0000 (00:30 +0000)]
Merge "Fix index computation for quick viewing." into nyc-dev
Rob Carr [Wed, 27 Apr 2016 00:29:58 +0000 (00:29 +0000)]
Merge "Touch region fixes for dialogs and overlapping tasks." into nyc-dev
smain@google.com [Wed, 27 Apr 2016 00:25:09 +0000 (17:25 -0700)]
resolve merge conflicts of
946609b to nyc-dev
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
Todd Kennedy [Wed, 27 Apr 2016 00:06:38 +0000 (17:06 -0700)]
Don't hold lock when calling externally
Wound up in a deadlock. We held mPackages lock and called the mount
service. This called into the AppOps service which tried to obtain
its lock. On another thread, we held the AppOps service lock which
called into PackageManager service and tried to take mPackages.
Ideally, we'd never hold an internal lock when calling externally.
In practice, that's not always fixable [for example, code change
would be too great to not hold the AppOps lock when calling into
the PackageManager service].
Bug:
28169075
Change-Id: If0a7f1361c7be9385b1f629f68ebc0556b08ab06
Jeff Sharkey [Wed, 27 Apr 2016 00:04:00 +0000 (00:04 +0000)]
Merge "Revert "Precompute cursor indexes in DocumentsUI and improve perf by 2.7%."" into nyc-dev
Chong Zhang [Tue, 26 Apr 2016 23:29:38 +0000 (23:29 +0000)]
Merge "Request a wallpaper update pass when wallpaper target is set to visible" into nyc-dev
Chong Zhang [Tue, 26 Apr 2016 23:28:04 +0000 (23:28 +0000)]
Merge "Do not set waitForDebugger if the process to be debugged already started" into nyc-dev
Erik Kline [Tue, 26 Apr 2016 23:27:46 +0000 (23:27 +0000)]
Merge "Move IPv4 address setting to IpManager" into nyc-dev
Todd Kennedy [Tue, 26 Apr 2016 22:41:20 +0000 (15:41 -0700)]
Don't override pre-release target sdk
If a package targets a pre-release SDK [eg a letter version] it should not
be allowed to be upgraded by a release SDK [eg a number version]. If one
absolutely must upgrade to a release SDK, use the "--force-sdk" option
during install.
Bug:
28345311
Change-Id: Ic9fb209968e7c5da2c80c5ca4c0f44f5125f610a
Chong Zhang [Tue, 26 Apr 2016 23:21:07 +0000 (16:21 -0700)]
Finish immediately if the resumed activity is already visible
When in FINISH_AFTER_VISIBLE mode, we need to check visibility of
both the current activity, and the activity to be resumed. If the
resumed activity is already visible, we should finish immediately.
We can't put it into stopping state and wait because there won't be
a window visible callback from the next activity.
bug:
28378359
Change-Id: Ib1fb44acfec33616da76f48102cc00b453e41914
Jeff Sharkey [Tue, 26 Apr 2016 23:01:40 +0000 (17:01 -0600)]
Fix two multi-user bugs in package upgrade.
When upgrading a package, we need to fill in the "origUsers" field
so that we can clone the installed state correctly. This was done
for child package, but never set for the parent package.
Also fix a bug where a secondary user requested a package to be
moved. Because that move was pushed onto a Handler, the calling
userId appeared to be the device owner instead of the user that
actually requested the move. (Later in the upgrade flow there is
code that force-installs the package for the requesting user.)
Bug:
26729822
Change-Id: I2d2a007c73558f29a3f8c1408ec373fce6e87761
Oren Blasberg [Tue, 26 Apr 2016 22:43:38 +0000 (22:43 +0000)]
Merge "Show cascading popup menus if screen is big enough." into nyc-dev
Chen Xu [Tue, 26 Apr 2016 22:42:16 +0000 (22:42 +0000)]
Merge "Add CarrierConfig for metered roaming" into nyc-dev
Oren Blasberg [Tue, 26 Apr 2016 22:41:00 +0000 (22:41 +0000)]
Merge "Accommodate NaN in new context menu methods." into nyc-dev
Oren Blasberg [Tue, 26 Apr 2016 22:38:56 +0000 (22:38 +0000)]
Merge "Don't show icons for top level menus unless forced." into nyc-dev
Shreyas Basarge [Tue, 26 Apr 2016 22:36:45 +0000 (22:36 +0000)]
Merge "Account info on job wakelocks" into nyc-dev
Ruben Brunk [Tue, 26 Apr 2016 22:05:28 +0000 (22:05 +0000)]
Merge "Add manifest attribute for VR activities." into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:51 +0000 (21:58 +0000)]
Merge "Merge "docs: URL and App Indexing API updates for AS 2.0 support b/
26642964" into mnc-docs am:
cffbbc8 am:
8af8d4d am:
13308fc2 am:
39579d7" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:41 +0000 (21:58 +0000)]
Merge "Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am:
b9709f6 am:
c4ec690 am:
73b5cc9" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:31 +0000 (21:58 +0000)]
Merge "change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c am:
0619ef2" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:20 +0000 (21:58 +0000)]
Merge "Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040 am:
f654443" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:10 +0000 (21:58 +0000)]
Merge "Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc am:
fe47b6d" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:58:01 +0000 (21:58 +0000)]
Merge "Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am:
7961413 am:
88d1e91 am:
8776f89" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:51 +0000 (21:57 +0000)]
Merge "Update studio landing page and add all-new install flow docs. bug:
27850063 (update system reqs for 2.0) bug:
27725026 (update download page for 2.0) bug:
23908299 (clean up download and get started) am:
9577d31 am:
fc35cf2 am:
478463a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:39 +0000 (21:57 +0000)]
Merge "Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am:
7c909cc am:
090e5fb am:
5f6a355" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:30 +0000 (21:57 +0000)]
Merge "Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am:
63f15a9 am:
e7b8c79 am:
29c6f81 am:
26ed50a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:20 +0000 (21:57 +0000)]
Merge "Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9 am:
f1ac8fa" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:11 +0000 (21:57 +0000)]
Merge "Merge "Fix application manifest XML" into mnc-mr-docs am:
c8dcc2b am:
3fdc800 am:
fc688ec" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:57:02 +0000 (21:57 +0000)]
Merge "Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6 am:
824429f" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:53 +0000 (21:56 +0000)]
Merge "Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am:
242f06cd am:
0015bf0 am:
bb64fe3" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:44 +0000 (21:56 +0000)]
Merge "Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2 am:
ab3721a" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:24 +0000 (21:56 +0000)]
Merge "Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am:
cac018b am:
9e16ddc am:
461e731" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:12 +0000 (21:56 +0000)]
Merge "Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am:
2f5a204 am:
ddbf8d2c am:
f63a1c4" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:56:02 +0000 (21:56 +0000)]
Merge "Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am:
f380435 am:
0da507d am:
7f0d4d0" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:53 +0000 (21:55 +0000)]
Merge "Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8 am:
8d336e6" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:43 +0000 (21:55 +0000)]
Merge "Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef am:
c56d885" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:35 +0000 (21:55 +0000)]
Merge "Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am:
88e19d1 am:
2d9cc0f am:
a732be1" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:25 +0000 (21:55 +0000)]
Merge "Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc am:
690cba0" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:14 +0000 (21:55 +0000)]
Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d am:
2ca2a2c" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:55:05 +0000 (21:55 +0000)]
Merge "docs: Added link to "preparing for multiwindow" blog post am:
d93472b am:
5db4e1f am:
04b4190" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:53 +0000 (21:54 +0000)]
Merge "Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am:
a23e28f am:
fbb8b65 am:
3832614" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:43 +0000 (21:54 +0000)]
Merge "Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am:
abb9f4d am:
fe0cc90 am:
e8b402e" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:33 +0000 (21:54 +0000)]
Merge "Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am:
f2988f5 am:
2291d03 am:
25570d5" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:24 +0000 (21:54 +0000)]
Merge "Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am:
f70f0f4 am:
9f57db1 am:
cedb262" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:15 +0000 (21:54 +0000)]
Merge "Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am:
71b1f0b -s ours am:
a6d7166 am:
0446ed4 am:
f786db7" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:54:03 +0000 (21:54 +0000)]
Merge "simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076 am:
1f8be54" into nyc-dev
Android Build Merger (Role) [Tue, 26 Apr 2016 21:53:53 +0000 (21:53 +0000)]
Merge "Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am:
49b17d3 am:
30c61f9 am:
07bfe29" into nyc-dev
Cheryl Potter [Tue, 26 Apr 2016 21:50:44 +0000 (21:50 +0000)]
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/
26642964" into mnc-docs am:
cffbbc8 am:
8af8d4d am:
13308fc2
am:
39579d7
* commit '
39579d70b3d729a228c76ae06beeff06c5e94150':
docs: URL and App Indexing API updates for AS 2.0 support b/
26642964
Change-Id: Id71f67c7af800535071103c16924daaf6efa72d8
smain@google.com [Tue, 26 Apr 2016 21:49:15 +0000 (21:49 +0000)]
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am:
b9709f6 am:
c4ec690
am:
73b5cc9
* commit '
73b5cc9cf34b1705a7bb9e30d8d58fb94a01c7b8':
update Develop tab landing page with Studio 2.0 announcement.
Change-Id: I84027bc7f474b7a614bc80de5a83210cba73ef32
smain@google.com [Tue, 26 Apr 2016 21:47:09 +0000 (21:47 +0000)]
change Mac JDK requirement to 6 am:
611a2f4 am:
3b1f66c
am:
0619ef2
* commit '
0619ef243f887119b921d0874b155287ace70edc':
change Mac JDK requirement to 6
Change-Id: I8a35ad475c64aa7d687398100c0e3df76777d14a
Adarsh Fernando [Tue, 26 Apr 2016 21:44:35 +0000 (21:44 +0000)]
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am:
3dbc405 am:
6eed040
am:
f654443
* commit '
f6544435b561a4ca50a070dc4dd665dda94becff':
Docs: Added Instant Run feature overview section
Change-Id: Id14287bc04647fc19e477e9ce9469ff9874e322a
Adarsh Fernando [Tue, 26 Apr 2016 21:42:02 +0000 (21:42 +0000)]
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am:
b896cd1 am:
abb5afc
am:
fe47b6d
* commit '
fe47b6d6455dc9e13e7a80e50107fc007ad3daf1':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I4b00bcf7936dc1c5db1d3f54417a4aa1381853c0
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:42 +0000 (21:39 +0000)]
Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
Adarsh Fernando [Tue, 26 Apr 2016 21:39:34 +0000 (21:39 +0000)]
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am:
7961413 am:
88d1e91
am:
8776f89
* commit '
8776f8940a7a73a5763550ab8e902f4ad6210808':
Docs: Added instructions to launch instrumented tests in AS using CTL
Change-Id: If1512e3bc20cfdaed5c08317bdf5889857909b00
Sergei Vasilinetc [Tue, 26 Apr 2016 21:39:07 +0000 (21:39 +0000)]
Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev
Dirk Dougherty [Tue, 26 Apr 2016 21:37:24 +0000 (21:37 +0000)]
Update studio landing page and add all-new install flow docs. bug:
27850063 (update system reqs for 2.0) bug:
27725026 (update download page for 2.0) bug:
23908299 (clean up download and get started) am:
9577d31 am:
fc35cf2
am:
478463a
* commit '
478463ac42fecf7811d0299005ebe1d800b3483b':
Change-Id: I1788b6e613ecd7ae3850dd5fc838787efab7387a
Kevin Hufnagle [Tue, 26 Apr 2016 21:34:40 +0000 (21:34 +0000)]
Merge "docs: "Result is:" paragraph now in correct position on page." into mnc-mr-docs am:
7c909cc am:
090e5fb
am:
5f6a355
* commit '
5f6a355d610474411a826ad9a896d18f7827d7d0':
Change-Id: Ide8d78800c35e5735e18efea2e90b82a0ed65636
Robert Carr [Mon, 25 Apr 2016 23:21:13 +0000 (16:21 -0700)]
Fix bugs with takeSurface and preserveWindows.
When reusing a ViewRoot and DecorView as we do with preserveWindows
there are two issues with SurfaceHolders. First, we update the
SurfaceHolder callbacks when we call ViewRootImpl.setView. In the
case of preserved window relaunch, the DecorView is reused and there is
no call to setView. We need the ActivityThread to notify the ViewRoot
that something has changed. Secondly, we were assuming the only time
a new surface would be created for the purposes of SurfaceHolder
notification was when we previously did not have a valid surface.
Instead we need to check if the native Surface object has changed each time we
get a result from relayout.
Bug:
28331264
Change-Id: If1b4aab9b2ba579fa040e2a3ab4471842476d82f
sreevanis [Tue, 26 Apr 2016 21:31:56 +0000 (21:31 +0000)]
Merge "docs: Added new partner logos to the car brands section of auto index page." into mnc-docs am:
63f15a9 am:
e7b8c79 am:
29c6f81
am:
26ed50a
* commit '
26ed50a8cae1ce78a83704e5f104038e53b784b5':
Change-Id: Id2776bdb87590b3dea5acb302573942c5c605abb
Chad Brubaker [Tue, 26 Apr 2016 21:29:57 +0000 (21:29 +0000)]
Merge "Add missing </pin-set>" into mnc-mr-docs am:
5f415c2 am:
0ed59f9
am:
f1ac8fa
* commit '
f1ac8fac41c69114f815f7226c5b695509f8c2ca':
Change-Id: I6cbe92afc06391abd5285471f03629767b598752
Chad Brubaker [Tue, 26 Apr 2016 21:27:05 +0000 (21:27 +0000)]
Merge "Fix application manifest XML" into mnc-mr-docs am:
c8dcc2b am:
3fdc800
am:
fc688ec
* commit '
fc688ec32eaf5815ce3f1ccba6023d5290b8d336':
Change-Id: I35f3641ad371da743a2159eaf14e704b7ff229c2
Joe Fernandez [Tue, 26 Apr 2016 21:23:59 +0000 (21:23 +0000)]
Merge "docs: April 2016 Dashboard update" into mnc-mr-docs am:
4ec3749 am:
83113d6
am:
824429f
* commit '
824429f93ad0ab15b4776acda40f91f972b5e173':
Change-Id: I01b8d416c6c350c1707676d3682800d61fc6442a
Andrew Solovay [Tue, 26 Apr 2016 21:21:48 +0000 (21:21 +0000)]
Merge "Revert "Updates for Play" April Fool\'s joke." into mnc-mr-docs am:
242f06cd am:
0015bf0
am:
bb64fe3
* commit '
bb64fe34ae6ecf0fafa74ddc4d416a21062dc516':
Change-Id: I36475216bbb46c474d1b693250d9392021a6903c
Dirk Dougherty [Tue, 26 Apr 2016 21:19:18 +0000 (21:19 +0000)]
Merge "Updates for Play." into mnc-mr-docs am:
3afd52a am:
f4658e2
am:
ab3721a
* commit '
ab3721ae74d5808ccffb713e256ac48abe895dba':
Change-Id: I37a1841fa7f51bd8ba58b866a8ee255a3aa15954
Daniel Yu [Tue, 26 Apr 2016 21:16:23 +0000 (21:16 +0000)]
Merge "docs: Add note about missing recording functionality in Live Channels" into mnc-mr-docs am:
cac018b am:
9e16ddc
am:
461e731
* commit '
461e731583aad91ca952cba2bab13898e37bb33e':
Change-Id: If3f5053f4d7e12fc0ccf2d5dc94b7141ffaef57b
Kevin Hufnagle [Tue, 26 Apr 2016 21:13:31 +0000 (21:13 +0000)]
Merge "docs: Fixed namespace shown in a line of style XML" into mnc-mr-docs am:
2f5a204 am:
ddbf8d2c
am:
f63a1c4
* commit '
f63a1c4cfddc0c4ac065c8a5ce09e38fe71c3137':
Change-Id: I09a99fd61f157e171c1a873d91c311cac8bfc0c2
Kevin Hufnagle [Tue, 26 Apr 2016 21:10:50 +0000 (21:10 +0000)]
Merge "docs: Removed dead link in "create project" TOC." into mnc-mr-docs am:
f380435 am:
0da507d
am:
7f0d4d0
* commit '
7f0d4d0799622a803316c201ed7cc1e5135de89e':
Change-Id: I7febd987b8e397f38d34cf0a79b7de399a31fce3
Kevin Hufnagle [Tue, 26 Apr 2016 21:08:48 +0000 (21:08 +0000)]
Merge "docs: Corrected reference link for NotificationManager.notify()." into mnc-mr-docs am:
c9afecd am:
1c076e8
am:
8d336e6
* commit '
8d336e6c51380986ac78c348234bd0e0cf4a7380':
Change-Id: Ifa45c62212e81fb9cfaebe98703775715cd14cd0
Kevin Hufnagle [Tue, 26 Apr 2016 21:05:57 +0000 (21:05 +0000)]
Merge "docs: Added missing semicolon within code sample." into mnc-mr-docs am:
9deafe5 am:
fcf68ef
am:
c56d885
* commit '
c56d8853ff8a15aa5a5b5ec40c242745fed6a3b6':
Change-Id: I7db5e0257eb921cc391306f69e21b95c9a296863
Kevin Hufnagle [Tue, 26 Apr 2016 21:03:09 +0000 (21:03 +0000)]
Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am:
88e19d1 am:
2d9cc0f
am:
a732be1
* commit '
a732be179d7bc06580b66669d6b6c7ebe05b9e01':
Change-Id: I1a2d3eba374fe931b28e0358740d545348ebceba
Kevin Hufnagle [Tue, 26 Apr 2016 21:00:06 +0000 (21:00 +0000)]
Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am:
8ea3fd8 am:
f1cb86cc
am:
690cba0
* commit '
690cba02682e89299f94d58a5ea9f212006c11c4':
Change-Id: I958d262d9022e91a85f75af7f3e8cb9af1e1f355
Joe Fernandez [Tue, 26 Apr 2016 20:57:54 +0000 (20:57 +0000)]
Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am:
42a3312 am:
faa815d
am:
2ca2a2c
* commit '
2ca2a2c86571d0ad05b95ea0bda7d33414e4cb89':
Change-Id: Ica6e6425d795da330da197536a0e516fb53c8b7d
Andrew Solovay [Tue, 26 Apr 2016 20:55:21 +0000 (20:55 +0000)]
docs: Added link to "preparing for multiwindow" blog post am:
d93472b am:
5db4e1f
am:
04b4190
* commit '
04b41903f9c4ceebc0f5d2e03f8f921f5dc95e69':
Change-Id: I789b9b1066978a665b1262e46a8331c07cd7e9c3
Andrew Solovay [Tue, 26 Apr 2016 20:52:24 +0000 (20:52 +0000)]
Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am:
a23e28f am:
fbb8b65
am:
3832614
* commit '
3832614650f39719dbbb52ee092c0826291d6516':
Change-Id: Ic5aab52976bceb23ad6c584b87ee86fcff634c76
Elliot Waite [Tue, 26 Apr 2016 20:49:26 +0000 (20:49 +0000)]
Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am:
abb9f4d am:
fe0cc90
am:
e8b402e
* commit '
e8b402e20533d5ce7387a4666683c971b22ba381':
Change-Id: Ie43452782ce7ab1e1bdbce67c007b2d3705c7910
Miao Wang [Tue, 26 Apr 2016 20:46:23 +0000 (20:46 +0000)]
Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am:
f2988f5 am:
2291d03
am:
25570d5
* commit '
25570d531904594d0e73cbc5c7a5105006aa8cdd':
Change-Id: I91af0cd7f8a87e3bf00261cece1bf19c9fb88790
sreevanis [Tue, 26 Apr 2016 20:43:10 +0000 (20:43 +0000)]
Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am:
f70f0f4 am:
9f57db1
am:
cedb262
* commit '
cedb262cfaffed00f091d2a0abe22f92f9809d3e':
Change-Id: I216382c84e33766b5d6d3bdc6c831ffd9afa6560
sreevanis [Tue, 26 Apr 2016 20:40:13 +0000 (20:40 +0000)]
Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am:
71b1f0b -s ours am:
a6d7166 am:
0446ed4
am:
f786db7
* commit '
f786db7b9bcc6ebfa79b4bc60a837877e5a8a380':
Change-Id: I0c8528b9a6a0313f8983cd4d75adc244ec68f92d
smain@google.com [Tue, 26 Apr 2016 20:36:57 +0000 (20:36 +0000)]
simplification and clarification to the Studio Overview am:
e9b3ada am:
f1a5076
am:
1f8be54
* commit '
1f8be548ae1c21be6651ddc2621018b2028c58d0':
Change-Id: I2e08479aadd3d223b11e10d873239e14ed1a6976
smain@google.com [Tue, 26 Apr 2016 20:34:41 +0000 (20:34 +0000)]
Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am:
49b17d3 am:
30c61f9
am:
07bfe29
* commit '
07bfe296d0e7337ba42fcf260d1029746308a262':
Change-Id: Iedc8b307eba45aa106b52fac980fe1c0fe8cdae3
Chris Craik [Tue, 26 Apr 2016 20:20:37 +0000 (20:20 +0000)]
Merge "Improve SurfaceView postion snapping" into nyc-dev
Mady Mellor [Tue, 26 Apr 2016 19:38:42 +0000 (19:38 +0000)]
Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev
Chong Zhang [Tue, 26 Apr 2016 19:24:55 +0000 (12:24 -0700)]
Do not set waitForDebugger if the process to be debugged already started
For non-persistent debug settings, mDebugApp and mWaitForDebugger flags
will only be restored when we get attachApplication. If the process is
already running, we can't wait for debugger and there will be no
attachApplication calls coming.
We should leave the settings unmodified, otherwise after two such calls,
both mDebugApp and mOrigDebugApp will point to the same app, and the
debug settings can never be restored.
bug:
27931552
Change-Id: Id53e21bbe154f45bf2ca12bb5d7fd56279bae653
Chris Banes [Tue, 26 Apr 2016 19:20:14 +0000 (19:20 +0000)]
Merge "Fix onPrepareActionMode() not being called" into nyc-dev
Svetoslav Ganov [Tue, 26 Apr 2016 18:36:26 +0000 (18:36 +0000)]
Merge "Ensure local settings caches are not stale" into nyc-dev