OSDN Git Service
Ruchi Kandoi [Sat, 14 May 2016 01:32:53 +0000 (01:32 +0000)]
Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev
TreeHugger Robot [Sat, 14 May 2016 01:09:25 +0000 (01:09 +0000)]
Merge "Fix regression from "PIP: Fix NPE when onboarding is shown"" into nyc-dev
smain@google.com [Sat, 14 May 2016 00:51:50 +0000 (00:51 +0000)]
bring back the android command line tool page. as per: https://critique.corp.google.com/#review/
122312732 am:
7d1717b0a9 am:
648b0ee2ec
am:
fb52c63d81
* commit '
fb52c63d81c966e4ba83314d86b2897391c14151':
bring back the android command line tool page. as per: https://critique.corp.google.com/#review/
122312732
Change-Id: Ib0102cb3e64d9e5829465724812e229ccc3b376c
smain@google.com [Sat, 14 May 2016 00:49:08 +0000 (00:49 +0000)]
bring back the android command line tool page. as per: https://critique.corp.google.com/#review/
122312732 am:
7d1717b0a9
am:
648b0ee2ec
* commit '
648b0ee2ec58ed298a7746797285d3d0f0f9f74e':
bring back the android command line tool page. as per: https://critique.corp.google.com/#review/
122312732
Change-Id: I605ed40346fef422806828c6d18ce42e21afc038
smain@google.com [Sat, 14 May 2016 00:46:27 +0000 (00:46 +0000)]
bring back the android command line tool page. as per: https://critique.corp.google.com/#review/
122312732
am:
7d1717b0a9
* commit '
7d1717b0a90d4ee5f7abcd89f5345a5a613d72e1':
bring back the android command line tool page. as per: https://critique.corp.google.com/#review/
122312732
Change-Id: I72151cd87714898faec80bb8f299c06b02ed6605
Andrew Solovay [Sat, 14 May 2016 00:44:04 +0000 (00:44 +0000)]
Merge "docs: Quick Tile update to DP3 release notes" into mnc-io-docs am:
823cfe0fd3
am:
caa1a1c6f9
* commit '
caa1a1c6f90449774894650b365f912f136fe442':
docs: Quick Tile update to DP3 release notes
Change-Id: Ia86339118d70ee5c145afcacb0f25b5683cf5346
Andrew Solovay [Sat, 14 May 2016 00:41:28 +0000 (00:41 +0000)]
Merge "docs: Quick Tile update to DP3 release notes" into mnc-io-docs
am:
823cfe0fd3
* commit '
823cfe0fd35c9875d58a1ec0bc1b1ad13b416ba1':
docs: Quick Tile update to DP3 release notes
Change-Id: I929a37f76ca4beef34a4401e5a90839f33fb8502
smain@google.com [Sat, 14 May 2016 00:38:15 +0000 (17:38 -0700)]
bring back the android command line tool page.
as per: https://critique.corp.google.com/#review/
122312732
Change-Id: I15c902c1dd3b712185abdd6c80f6d7ab7df84246
Andrew Solovay [Sat, 14 May 2016 00:36:22 +0000 (00:36 +0000)]
Merge "docs: Quick Tile update to DP3 release notes" into mnc-io-docs
smain@google.com [Sat, 14 May 2016 00:28:03 +0000 (00:28 +0000)]
remove tools-moved.html redirect, go to studio home instead am:
7848eef2e6 am:
b8fe6e8b20
am:
9e11298335
* commit '
9e11298335c84f29f8fb8213c8d61721d1cec18c':
remove tools-moved.html redirect, go to studio home instead
Change-Id: I666b10252b966a5b803b7aab888919186e78f4cb
smain@google.com [Sat, 14 May 2016 00:24:36 +0000 (00:24 +0000)]
remove tools-moved.html redirect, go to studio home instead am:
7848eef2e6
am:
b8fe6e8b20
* commit '
b8fe6e8b209b0fe39f661c10979557376dae23ec':
remove tools-moved.html redirect, go to studio home instead
Change-Id: I5092050fcbec6c55487e441b3e7113d411fcbeb8
smain@google.com [Sat, 14 May 2016 00:21:59 +0000 (00:21 +0000)]
Merge "Revisions to develop landing page for studio 2.1" into mnc-mr-docs am:
3eff38fdba am:
3a8d2c8fd2
am:
6e8711c89c
* commit '
6e8711c89c5aef027f0f2d7d9fb3d1a0a31c042c':
Revisions to develop landing page for studio 2.1
Change-Id: I310b93a7621de4745d069fe22ba7acb81aedb48e
smain@google.com [Sat, 14 May 2016 00:21:50 +0000 (00:21 +0000)]
remove tools-moved.html redirect, go to studio home instead
am:
7848eef2e6
* commit '
7848eef2e62df56e73f992c174ca2c6195664ea4':
remove tools-moved.html redirect, go to studio home instead
Change-Id: If5d9f19cdf0058047a6336edbed83e45323ffa79
Scott Main [Sat, 14 May 2016 00:19:17 +0000 (00:19 +0000)]
Merge "Revisions to develop landing page for studio 2.1" into mnc-mr-docs am:
3eff38fdba
am:
3a8d2c8fd2
* commit '
3a8d2c8fd20b65ec6700f662d815299943661f48':
Revisions to develop landing page for studio 2.1
Change-Id: Ib9689bc1b71e79c447425bceb0cf944ad5630362
smain@google.com [Sat, 14 May 2016 00:16:43 +0000 (00:16 +0000)]
Merge "Revisions to develop landing page for studio 2.1" into mnc-mr-docs
am:
3eff38fdba
* commit '
3eff38fdba7dc1e0f02aa80997ee2e3895524ee1':
Revisions to develop landing page for studio 2.1
Change-Id: Ied3d0ed51ce5bca165c91acc788683fb39ac5d53
smain@google.com [Sat, 14 May 2016 00:13:20 +0000 (17:13 -0700)]
remove tools-moved.html redirect, go to studio home instead
Change-Id: If14e889b475782ceee65a2beba49fe26d7a54a6c
Scott Main [Sat, 14 May 2016 00:11:48 +0000 (00:11 +0000)]
Merge "Revisions to develop landing page for studio 2.1" into mnc-mr-docs
smain@google.com [Sat, 14 May 2016 00:10:32 +0000 (17:10 -0700)]
Revisions to develop landing page for studio 2.1
Change-Id: I8fe5e0dc1f9627306a2516f795ed5933d5bb671a
Sreevani Sreejith [Fri, 13 May 2016 23:54:00 +0000 (23:54 +0000)]
Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs am:
f4bf6f7675
am:
a87dfa0de6
* commit '
a87dfa0de6cdad7e42b8d21fd1112df2f04b36df':
Added Support and Release Notes Nav link and IMF Nav link.
Change-Id: I3a5965b18d7a6771593a4d8a4c863d1f38e445c0
sreevanis [Fri, 13 May 2016 23:51:24 +0000 (23:51 +0000)]
Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs
am:
f4bf6f7675
* commit '
f4bf6f7675bc04f3f9e4cb05408b5c63ae8d3c49':
Added Support and Release Notes Nav link and IMF Nav link.
Change-Id: I58ed03df80f0db496cbb45b5a7a630b9ba878454
Sreevani Sreejith [Fri, 13 May 2016 23:47:47 +0000 (23:47 +0000)]
Merge "Added Support and Release Notes Nav link and IMF Nav link." into mnc-io-docs
sreevanis [Fri, 13 May 2016 23:21:52 +0000 (16:21 -0700)]
Added Support and Release Notes Nav link and IMF Nav link.
Bug:
28768632
Change-Id: I553001c8876ae498472dd64e0948876ba5ca7d2c
Jae Seo [Fri, 13 May 2016 18:16:16 +0000 (18:16 +0000)]
Fix regression from "PIP: Fix NPE when onboarding is shown"
Removed the second "continue" to allow isFirstValidTask to be set to
false.
This is a follow-up fix from commit
91c5066c0036b5322f53c35fcc48bbad75ef4305.
Bug:
28754669
Change-Id: Ic852afaa78fc79bcd85b04e888975cd3bfc72094
Dianne Hackborn [Fri, 13 May 2016 23:22:11 +0000 (23:22 +0000)]
Merge "Fix issue #
28728838 java.lang.ClassCastException: android.os.BinderProxy..." into nyc-dev
Chong Zhang [Fri, 13 May 2016 23:21:03 +0000 (23:21 +0000)]
Merge "Set final crop on wallpaper instead of intersect clip with stack bounds" into nyc-dev
Jorim Jaggi [Fri, 13 May 2016 23:16:12 +0000 (23:16 +0000)]
Merge "Also freeze configuration when freezing bounds" into nyc-dev
Sreevani Sreejith [Fri, 13 May 2016 23:14:59 +0000 (23:14 +0000)]
Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs am:
9c105c50a9
am:
a9486c041f
* commit '
a9486c041f177f11d5f61dc7fb92a10447c836a3':
Wear 2.0 preview input method documentaation.
Change-Id: Ideb177a06ba57134e535dcd67a8c01ca9bb8216d
sreevanis [Fri, 13 May 2016 23:12:28 +0000 (23:12 +0000)]
Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs
am:
9c105c50a9
* commit '
9c105c50a9a7c3a020103287a4d207291b8ab711':
Wear 2.0 preview input method documentaation.
Change-Id: I2913fb11624046751bc9097cf9c216d02edae971
Chris Craik [Fri, 13 May 2016 23:12:17 +0000 (23:12 +0000)]
Merge "Fix Skia filter behavior test" into nyc-dev
Sreevani Sreejith [Fri, 13 May 2016 23:04:50 +0000 (23:04 +0000)]
Merge "Wear 2.0 preview input method documentaation." into mnc-io-docs
Jorim Jaggi [Tue, 10 May 2016 02:57:25 +0000 (19:57 -0700)]
Also freeze configuration when freezing bounds
We also need to freeze the override configuration so we don't report
the new configuration too early, which leads to bugs.
Bug:
27915587
Change-Id: Idffadbb02ab0311796caa760ae1f467fd2d17768
sreevanis [Wed, 11 May 2016 18:30:58 +0000 (11:30 -0700)]
Wear 2.0 preview input method documentaation.
Bug:
28472831
Change-Id: Ic2143ec8087d084609e3c6e8c125c37e1a5849da
Chong Zhang [Fri, 13 May 2016 22:38:02 +0000 (15:38 -0700)]
Set final crop on wallpaper instead of intersect clip with stack bounds
Wallpaper's clip rect is offset by its window offsets, it can't be
intersect directly with stack bounds.
bug:
28763785
Change-Id: Id87d668c9e59832498c9c62730617d0a5a9207c2
Ruchi Kandoi [Fri, 13 May 2016 22:10:39 +0000 (15:10 -0700)]
network: Adds the functionality to parse uid in netlink messages.
Netlink notifications about the state of the modem contains uid too.
This patch adds the functionality to add that. It also fixes the bug to
parse the timestamp in the message even in cases where the length is
greater than expected.
Bug:
28527904
Change-Id: I4643bff3eb5b1ffa2dc0b78f1c6947d60487e0d8
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Svetoslav Ganov [Fri, 13 May 2016 22:22:31 +0000 (22:22 +0000)]
Merge "Make settings cahches generation mechanism robust." into nyc-dev
Svetoslav Ganov [Wed, 11 May 2016 01:55:47 +0000 (18:55 -0700)]
Make settings cahches generation mechanism robust.
Settings is using a MemoryIntArray to communicate the settings table
version enabling apps to have up-to-date local caches. However, ashmem
allows an arbitrary process with a handle to the fd (even in read only
mode) to unpin the memory which can then be garbage collected. Here we
make this mechanism fault tolerant against bad apps unpinning the ashmem
region. First, we no longer unpin the ashmem on the client side and if
the ashmem region is purged and cannot be pinned we recreate it and
hook up again with the local app caches. The change also adds a test
that clients can only read while owner can read/write.
bug:
28764789
Change-Id: I1ef79b4b21e976124b268c9126a55d614157059b
Andrew Solovay [Fri, 13 May 2016 22:08:17 +0000 (22:08 +0000)]
docs: Updates to multi-window and related docs. am:
4d93a21980 am:
8263d6c0a3 am:
c88130c572
am:
d29c26073e
* commit '
d29c26073e97e4c6e7825641cf6e76720df395e3':
docs: Updates to multi-window and related docs.
Change-Id: Ic4be60debb41d074d717bfb0989125299428831a
Andrew Solovay [Fri, 13 May 2016 22:03:15 +0000 (22:03 +0000)]
docs: Updates to multi-window and related docs. am:
4d93a21980 am:
8263d6c0a3
am:
c88130c572
* commit '
c88130c5724227b3ba7ef0b5ef4476fedabca650':
docs: Updates to multi-window and related docs.
Change-Id: I308c988e3a93737a478f9f2445b512e86f218643
Andrew Solovay [Fri, 13 May 2016 22:00:39 +0000 (22:00 +0000)]
docs: Updates to multi-window and related docs. am:
4d93a21980
am:
8263d6c0a3
* commit '
8263d6c0a35a5467764ed12d6586ab176fdc15ff':
docs: Updates to multi-window and related docs.
Change-Id: Ia571cf3a38f1cd621bba6bc35d9b2b836361d7b5
Andrew Solovay [Fri, 13 May 2016 21:57:51 +0000 (21:57 +0000)]
docs: Updates to multi-window and related docs.
am:
4d93a21980
* commit '
4d93a21980f7e82bd346ad9c3a18c0c932d09253':
docs: Updates to multi-window and related docs.
Change-Id: Ie12e3c25417943582aa1db1bf476e53a41838745
TreeHugger Robot [Fri, 13 May 2016 21:53:41 +0000 (21:53 +0000)]
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
Andrew Solovay [Fri, 13 May 2016 21:37:33 +0000 (14:37 -0700)]
docs: Quick Tile update to DP3 release notes
Continuing work from CL http://ag/
1010439 , addressing comments on
that CL that were left after it was submitted.
See first comment for doc stage location.
bug:
28588696
Change-Id: I9d92008ed30582657d97f162958b8efd5c317999
Dianne Hackborn [Fri, 13 May 2016 21:50:23 +0000 (14:50 -0700)]
Fix issue #
28728838 java.lang.ClassCastException: android.os.BinderProxy...
...cannot be cast to LocalBinder after a crash
Turns out, if you called removeProcessLocked() with an old ProcessRecord,
we could get in to a bad state -- if we had a new process with that same
name already running, we would kind-of blow it away as a process name,
but not as much else. So the next time we wanted to run a new thing
in the process, we would start a new second process and the two could
get mixed together.
Change-Id: I05e0463bd55f57f5e07f0b804ed9fd8c4f98a5a5
Bert McMeen [Fri, 13 May 2016 21:43:01 +0000 (21:43 +0000)]
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs am:
1334929863
am:
2288757582
* commit '
2288757582bd8b572f009aee68a0fe1599507060':
docs: Bridger feature page for Wear preview
Change-Id: Ica0f66a85c0b5c9d3db6eee71338b7a7956cb827
Bert McMeen [Fri, 13 May 2016 21:40:22 +0000 (21:40 +0000)]
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs
am:
1334929863
* commit '
133492986389a63e34cb9066e515864eadeeb485':
docs: Bridger feature page for Wear preview
Change-Id: If629e5ff1d0a90661fc69287f9e669625f8ce5a2
Bert McMeen [Fri, 13 May 2016 21:35:03 +0000 (21:35 +0000)]
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs am:
e8d7012fba
am:
97158b85ec
* commit '
97158b85ec07c22b0aca39ffaf0c8172751c0a65':
docs: Wear preview docs: Get Started, Download/Test, Program Overview
Change-Id: I549ab462afb03184118a00aa3bcfdb45284b4288
Bert McMeen [Fri, 13 May 2016 21:34:58 +0000 (21:34 +0000)]
docs: Complications guide for Wear Preview am:
c0780f1d52
am:
194fbc0da4
* commit '
194fbc0da4272b1c957c1e69d363f2c566a30716':
docs: Complications guide for Wear Preview
Change-Id: Ie3850f9647ec2fa2d0e43560e27ac1947a486375
Bert McMeen [Fri, 13 May 2016 21:32:10 +0000 (21:32 +0000)]
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs
am:
e8d7012fba
* commit '
e8d7012fbafb64e71fe2d94b4ef1cb466f63bfc9':
docs: Wear preview docs: Get Started, Download/Test, Program Overview
Change-Id: Icc722c4d00fc6862e28fc246cd376e90901c0092
Bert McMeen [Fri, 13 May 2016 21:32:07 +0000 (21:32 +0000)]
docs: Complications guide for Wear Preview
am:
c0780f1d52
* commit '
c0780f1d52c8e4d78e750fb0f16eec8280ddf5f4':
docs: Complications guide for Wear Preview
Change-Id: I71999d68698c336c354cc11d042775685b77da8d
Bert McMeen [Fri, 13 May 2016 21:30:18 +0000 (21:30 +0000)]
Merge "docs: Bridger feature page for Wear preview" into mnc-io-docs
Bert McMeen [Fri, 13 May 2016 21:29:26 +0000 (21:29 +0000)]
Merge "docs: Wear preview docs: Get Started, Download/Test, Program Overview" into mnc-io-docs
Jorim Jaggi [Fri, 13 May 2016 21:22:01 +0000 (21:22 +0000)]
Merge "Fix transition for forced resizable exit" into nyc-dev
Sid Soundararajan [Fri, 13 May 2016 21:19:23 +0000 (21:19 +0000)]
Merge "Remove task based on object rather than position" into nyc-dev
Jorim Jaggi [Fri, 13 May 2016 21:11:42 +0000 (14:11 -0700)]
Fix transition for forced resizable exit
Since the transition is picked from layout params from the activity
below, we need to manually override it.
Bug:
28750938
Change-Id: I7351c7d8bd14a393cba51d6afb1e644204217440
Jorim Jaggi [Thu, 12 May 2016 21:47:27 +0000 (14:47 -0700)]
Don't allow any app to specify rotation unless in home task
The previous logic was racy/buggy in a sense so that the non-home app
could still force the orientation when the divider was still minimized.
The logic is cleaned up so only the home task can force the orientation
in multi-window.
Change-Id: I9eccf86d9fa442375d6eca400cb6ac0815c9fa10
Fixes:
28675152
Chong Zhang [Fri, 13 May 2016 20:48:31 +0000 (20:48 +0000)]
Merge "Update stack bounds for fullscreen if rotated after updateDisplayInfo" into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 20:42:20 +0000 (20:42 +0000)]
Merge "Fixed some issues with fullscreen dimming" into nyc-dev
Adam Powell [Fri, 13 May 2016 18:04:39 +0000 (11:04 -0700)]
Add Fragment#onAttachFragment for parent fragments
Framework edition
Add a matching onAttachFragment method to Fragment to match the
fragment host version.
Bug
28760393
Change-Id: I5f50b3446449cae7110da6b4e468ee80f413e1e5
Andrew Solovay [Fri, 13 May 2016 20:33:55 +0000 (13:33 -0700)]
docs: Updates to multi-window and related docs.
Clarified behavior when activity is resized or put in fullscreen
mode, per b/
28580007 . Also (per email from o-o) removed misleading
statement about when onStop() might or might not be called.
Both changes can go live now (multiwindow update applies to DP1 & 2,
and onStop() clarification applies to all versions of API), so I'll
submit as soon as this is approved.
See first comment for doc stage location.
bug:
28580007
Change-Id: Ib008f24e5796ec7810b67c91e512e679680d4afd
Bert McMeen [Wed, 11 May 2016 20:55:09 +0000 (13:55 -0700)]
docs: Complications guide for Wear Preview
Bug:
28425614
Change-Id: Ic1d5ce1a962b39a395c447c1f4d3bfadd6114246
Wei Wang [Tue, 10 Nov 2015 03:45:53 +0000 (19:45 -0800)]
Properly handle registration timeout in BLE.
Bug:
25384098
Change-Id: I7877f6368c4982fcd91e68810c4da0ab7b5fc6b7
Dirk Dougherty [Fri, 13 May 2016 18:16:15 +0000 (18:16 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am:
3a263cec30 am:
6d3ca9aaa9
am:
0e4b51ebc6
* commit '
0e4b51ebc6b86a535a9f7757e8b64f70a10aaa30':
Correct the DP2 status beta -> alpha.
Change-Id: I9fded988b946d669f9560716563771f8e6b82351
Joe Fernandez [Fri, 13 May 2016 18:13:46 +0000 (18:13 +0000)]
Merge "docs: change preview landing page top ribbon color" into mnc-io-docs am:
a138ad92b2
am:
3357a67905
* commit '
3357a67905453d64846079e560bbe893c4c733b6':
docs: change preview landing page top ribbon color
Change-Id: I7eede6be5a8960e7f2360656c66b136f519fb1bb
Dirk Dougherty [Fri, 13 May 2016 18:13:40 +0000 (18:13 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs am:
3a263cec30
am:
6d3ca9aaa9
* commit '
6d3ca9aaa91328d3664a217fee8a49c9ee46858e':
Correct the DP2 status beta -> alpha.
Change-Id: Iecc460e2b5399bff284f8d2479d475325fc8a1df
Joe Fernandez [Fri, 13 May 2016 18:11:15 +0000 (18:11 +0000)]
Merge "docs: change preview landing page top ribbon color" into mnc-io-docs
am:
a138ad92b2
* commit '
a138ad92b299bf32a59ee5f4ba5a9e34e6998cb4':
docs: change preview landing page top ribbon color
Change-Id: Ib7d5c3fc9a133ceb0a97f801218481a94fb15a47
Dirk Dougherty [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs
am:
3a263cec30
* commit '
3a263cec302b3d1883e3cc48b068c05240506d31':
Correct the DP2 status beta -> alpha.
Change-Id: I925a0c044e1b7b6186f348c4c8e216b8f53a13f4
Chong Zhang [Fri, 13 May 2016 18:04:38 +0000 (11:04 -0700)]
Update stack bounds for fullscreen if rotated after updateDisplayInfo
Rotation could change again after updateDisplayInfo is called. We
need to set stack bounds even for fullscreen stacks in this case.
Otherwise the bounds will be incorrect until it's rotated again.
bug:
28611814
Change-Id: I31289524a9ceacaaaa66924e9bf6cbe88fd83f99
Joe Fernandez [Fri, 13 May 2016 18:06:41 +0000 (18:06 +0000)]
Merge "docs: change preview landing page top ribbon color" into mnc-io-docs
Dirk Dougherty [Fri, 13 May 2016 18:03:23 +0000 (18:03 +0000)]
Merge "Correct the DP2 status beta -> alpha." into mnc-mr-docs
Dirk Dougherty [Fri, 13 May 2016 17:57:56 +0000 (10:57 -0700)]
Correct the DP2 status beta -> alpha.
Bug:
28175714
Change-Id: I050c9a41961528c1d65cd9b9737d93c82d16aef2
Amanda Kassay [Fri, 13 May 2016 17:59:59 +0000 (17:59 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/
28744510" into mnc-mr-docs am:
379e28db22 am:
494a4c967c
am:
899981c244
* commit '
899981c2442807cf637b5a9280a71cfe22e45880':
Clean up sdk/sdk_vars.cs file b/
28744510
Change-Id: I3d21f2b99ead958ed064ea4d81dbea95513ce5a6
Joe Fernandez [Fri, 13 May 2016 17:59:02 +0000 (10:59 -0700)]
docs: change preview landing page top ribbon color
Change-Id: Iaa406a83de47df49eab54d1265629edc4dd57479
Amanda Kassay [Fri, 13 May 2016 17:57:28 +0000 (17:57 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/
28744510" into mnc-mr-docs am:
379e28db22
am:
494a4c967c
* commit '
494a4c967cc4bb648da3b79d777b1c089445b41f':
Clean up sdk/sdk_vars.cs file b/
28744510
Change-Id: Id6ba8a4083bc7753f5d0e6387ac0a18778cf1a27
Amanda Kassay [Fri, 13 May 2016 17:54:57 +0000 (17:54 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/
28744510" into mnc-mr-docs
am:
379e28db22
* commit '
379e28db228f2c0102ec41925600155c058a1ea7':
Clean up sdk/sdk_vars.cs file b/
28744510
Change-Id: I4b262eca7ca315d1ae0d51bd77ec2bcf35cadb77
Amanda Kassay [Fri, 13 May 2016 17:51:18 +0000 (17:51 +0000)]
Merge "Clean up sdk/sdk_vars.cs file b/
28744510" into mnc-mr-docs
TreeHugger Robot [Fri, 13 May 2016 17:26:45 +0000 (17:26 +0000)]
Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev
Bert McMeen [Wed, 11 May 2016 22:34:22 +0000 (15:34 -0700)]
docs: Wear preview docs: Get Started, Download/Test, Program Overview
Bug:
28317997
Change-Id: I7053f9cc336edecf91a256c31e6650a61ef4ae2d
Android Build Merger (Role) [Fri, 13 May 2016 17:21:13 +0000 (17:21 +0000)]
Merge "Merge "docs: App Translation API updates" into mnc-docs am:
1ede811143 am:
ec6effa1b0 am:
70f2e39008 am:
e60af6b9e2" into nyc-dev
Kevin Hufnagle [Fri, 13 May 2016 17:20:42 +0000 (17:20 +0000)]
Merge "docs: App Translation API updates" into mnc-docs am:
1ede811143 am:
ec6effa1b0 am:
70f2e39008
am:
e60af6b9e2
* commit '
e60af6b9e2645144cda30c5e54a1267f05ac1d0d':
docs: App Translation API updates
Change-Id: Idc2ad381a5105b6502f3c37b08ec30ebbf6568eb
Joe Fernandez [Fri, 13 May 2016 17:17:53 +0000 (17:17 +0000)]
Merge "docs: App Translation API updates" into mnc-docs am:
1ede811143 am:
ec6effa1b0
am:
70f2e39008
* commit '
70f2e3900830f58cd8b4644319ba7e173c49f7c3':
docs: App Translation API updates
Change-Id: Id1b10da621def8add8384011755a8a7061e06ff0
Paul Jensen [Fri, 13 May 2016 17:14:46 +0000 (17:14 +0000)]
Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev
Kevin Hufnagle [Fri, 13 May 2016 17:14:36 +0000 (17:14 +0000)]
Merge "docs: App Translation API updates" into mnc-docs am:
1ede811143
am:
ec6effa1b0
* commit '
ec6effa1b0c7381f5d29a5b87d9bef53516dda4e':
docs: App Translation API updates
Change-Id: I77d01fcaa4c4ef1cefdbba2dad8af71f7aa6fa62
TreeHugger Robot [Fri, 13 May 2016 17:14:11 +0000 (17:14 +0000)]
Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
TreeHugger Robot [Fri, 13 May 2016 17:11:13 +0000 (17:11 +0000)]
Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
Joe Fernandez [Fri, 13 May 2016 17:11:08 +0000 (17:11 +0000)]
Merge "docs: App Translation API updates" into mnc-docs
am:
1ede811143
* commit '
1ede811143d32afe8ba6ce49a19060da4a1b6092':
docs: App Translation API updates
Change-Id: Id075bdfddf3c5ccabf063690a37c487a87f9635d
Fyodor Kupolov [Fri, 13 May 2016 17:07:57 +0000 (17:07 +0000)]
Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev
David Friedman [Fri, 13 May 2016 17:06:14 +0000 (17:06 +0000)]
Docs: API Overview page for Android N, Dev Preview 3 am:
93970bae9b
am:
95d6fa6b5d
* commit '
95d6fa6b5d594951b6ce49f690792184d5ef8e72':
Docs: API Overview page for Android N, Dev Preview 3
Change-Id: I357b712f7daa382f408e3b212486b5da0e7ec5f7
Kevin Hufnagle [Fri, 13 May 2016 17:05:10 +0000 (17:05 +0000)]
Merge "docs: App Translation API updates" into mnc-docs
David Friedman [Fri, 13 May 2016 17:03:28 +0000 (17:03 +0000)]
Docs: API Overview page for Android N, Dev Preview 3
am:
93970bae9b
* commit '
93970bae9b4fc9297b76df7c610de682d91bf5dc':
Docs: API Overview page for Android N, Dev Preview 3
Change-Id: I0d639f0bd499509a0bedaf0d0539acd21d43d079
TreeHugger Robot [Fri, 13 May 2016 16:55:11 +0000 (16:55 +0000)]
Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev
Andreas Gampe [Fri, 13 May 2016 16:27:57 +0000 (16:27 +0000)]
Merge "System server: Add Bluetooth to native processes" into nyc-dev
Amanda Kassay [Fri, 13 May 2016 14:58:06 +0000 (10:58 -0400)]
Clean up sdk/sdk_vars.cs file b/
28744510
Change-Id: I9e09f0a320c4379db517ddb4e0783035dea5c061
Adam Powell [Thu, 12 May 2016 23:13:17 +0000 (16:13 -0700)]
Show package icon/label for resolved package-targeted implicit intents
If we're going to show metadata about a resolved implicit intent that
is targeted to a single package with multiple potential targets,
populate the ResolveInfo with the label and icon of the target
package's ApplicationInfo and set resolvePackageName. This helps use
cases such as EXTRA_INITIAL_INTENTS in ChooserActivity, where
sometimes apps set target packages but not components.
Bug
28739056
Change-Id: I8070d341fccc139463c5ac8d66db45fce02252e5
Paul Jensen [Fri, 13 May 2016 14:33:24 +0000 (14:33 +0000)]
Merge "ApfFilter unit test" into nyc-dev
David Friedman [Fri, 13 May 2016 08:23:13 +0000 (01:23 -0700)]
Docs: API Overview page for Android N, Dev Preview 3
Change-Id: Ib9a5dbe796eba85ea94686cce2532e0e77d6c615
Jaewan Kim [Fri, 13 May 2016 07:18:49 +0000 (16:18 +0900)]
PIP: Fix NPE when onboarding is shown
Bug:
28754669
Change-Id: Ifca78e111b63422c3875dc4eba48c02e11f83530
Erik Kline [Thu, 12 May 2016 06:13:02 +0000 (15:13 +0900)]
Support IPv4-only and IPv6-only provisioning
Bug:
28437662
Change-Id: I95b2d6eeb48cc526c8e6e015c5130ff9141fb898
Andrii Kulian [Fri, 13 May 2016 03:24:33 +0000 (03:24 +0000)]
Merge "Close leaked windows when trying to preserve main one" into nyc-dev
David Friedman [Fri, 13 May 2016 02:46:05 +0000 (02:46 +0000)]
Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs am:
16d7c71365
am:
fd9dca7783
* commit '
fd9dca77839260c7a808b8e57a73da4107ced88f':
docs: Continue CL of emoji section in api-overview
Change-Id: I539ce22956d67b4a1e85cad1ab35375a615412b6
David Friedman [Fri, 13 May 2016 02:42:58 +0000 (02:42 +0000)]
Merge "docs: Continue CL of notifications updates" into mnc-io-docs am:
272db39ad8
am:
87ec2a1348
* commit '
87ec2a13488163b8ed51493a8f4b30165272c847':
docs: Continue CL of notifications updates
Change-Id: I8fb81d096b30c4bb5ac52c1bad3a883492acc45c
OSDN Git Service
