Commit Graph

246497 Commits

Author SHA1 Message Date
Amanda Kassay
26818308f9 Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs am: 379e28db22 am: 494a4c967c am: 899981c244
am: a63801a7c2

* commit 'a63801a7c2fa80d5815c78d6339536690803b34b':
  Clean up sdk/sdk_vars.cs file b/28744510

Change-Id: I69785f0e0ddad254c583f0fc087bba4d5134ec6a
2016-05-13 18:02:22 +00:00
Dirk Dougherty
d9ad1ca8fb Correct the DP2 status beta -> alpha.
Bug: 28175714
Change-Id: I050c9a41961528c1d65cd9b9737d93c82d16aef2
2016-05-13 11:01:46 -07:00
Amanda Kassay
a63801a7c2 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
2016-05-13 17:59:59 +00:00
Joe Fernandez
85f0641d1b docs: change preview landing page top ribbon color
Change-Id: Iaa406a83de47df49eab54d1265629edc4dd57479
2016-05-13 10:59:02 -07:00
Amanda Kassay
899981c244 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
2016-05-13 17:57:28 +00:00
Amanda Kassay
494a4c967c 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
2016-05-13 17:54:57 +00:00
Amanda Kassay
379e28db22 Merge "Clean up sdk/sdk_vars.cs file b/28744510" into mnc-mr-docs 2016-05-13 17:51:19 +00:00
Steve McKay
270539c6d0 Merge "Don\'t show new-window item in Downloads per Gabe." into nyc-dev
am: fec0d188c1

* commit 'fec0d188c166e5a2c517f4494e83c1db11b31c68':
  Don't show new-window item in Downloads per Gabe.

Change-Id: I3e7b11561ad3d6a3407119428a2e20709072f53a
2016-05-13 17:31:32 +00:00
TreeHugger Robot
fec0d188c1 Merge "Don't show new-window item in Downloads per Gabe." into nyc-dev 2016-05-13 17:26:46 +00:00
Bert McMeen
3ec4cf8068 docs: Wear preview docs: Get Started, Download/Test, Program Overview
Bug: 28317997
Change-Id: I7053f9cc336edecf91a256c31e6650a61ef4ae2d
2016-05-13 10:26:34 -07:00
Kevin Hufnagle
c33bd4ebdd Merge "Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008 am: e60af6b9e2" into nyc-dev
am: 5dbbb72e71

* commit '5dbbb72e71455a676c39b3e43c2615ba4ce4d08d':
  docs: App Translation API updates

Change-Id: I9175e0bb439c40f79997dd4e90b719a84dd5930a
2016-05-13 17:23:28 +00:00
Paul Jensen
76b2c48d83 Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev
am: 90ba8cf379

* commit '90ba8cf3799fa60138d212e092cc7f0a5e79374f':
  Use APF program to drop non-IP non-ARP broadcasts

Change-Id: I7f9130cbe2198106b9d9c89c5272fc822852e172
2016-05-13 17:23:23 +00:00
Felipe Leme
cc02a95cbd Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev
am: 25018d41f4

* commit '25018d41f482fe21a45eb2e739f22dc7cc937428':
  Fixed connectivity state in some power saving scenarios.

Change-Id: If76cc55916bbd7e5e4093b39ff81a40c1e43034c
2016-05-13 17:23:19 +00:00
Android Build Merger (Role)
5dbbb72e71 Merge "Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143 am: ec6effa1b0 am: 70f2e39008 am: e60af6b9e2" into nyc-dev 2016-05-13 17:21:14 +00:00
Kevin Hufnagle
90fa73b6d6 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
2016-05-13 17:20:42 +00:00
Joe Fernandez
e60af6b9e2 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
2016-05-13 17:17:53 +00:00
Adam Powell
a53d9cace1 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev
am: e89dc40706

* commit 'e89dc40706f325e039de7dd6714223908dfb9b17':
  Show package icon/label for resolved package-targeted implicit intents

Change-Id: I254e8d1a0b3cc45e3c030ca1cec7e7ecc5dbd91e
2016-05-13 17:17:44 +00:00
Paul Jensen
90ba8cf379 Merge "Use APF program to drop non-IP non-ARP broadcasts" into nyc-dev 2016-05-13 17:14:47 +00:00
Kevin Hufnagle
70f2e39008 Merge "docs: App Translation API updates" into mnc-docs am: 1ede811143
am: ec6effa1b0

* commit 'ec6effa1b0c7381f5d29a5b87d9bef53516dda4e':
  docs: App Translation API updates

Change-Id: I77d01fcaa4c4ef1cefdbba2dad8af71f7aa6fa62
2016-05-13 17:14:36 +00:00
TreeHugger Robot
25018d41f4 Merge "Fixed connectivity state in some power saving scenarios." into nyc-dev 2016-05-13 17:14:13 +00:00
Fyodor Kupolov
98a9b7bbfb Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev
am: b7bd2e645d

* commit 'b7bd2e645db390373d4f0847c7637d06faa1d4da':
  Call isUserUnlockingOrUnlocked with cleared identity

Change-Id: If4587d7949df3b332d50cd06f3ae3b216c767e04
2016-05-13 17:12:01 +00:00
TreeHugger Robot
e89dc40706 Merge "Show package icon/label for resolved package-targeted implicit intents" into nyc-dev 2016-05-13 17:11:14 +00:00
Joe Fernandez
ec6effa1b0 Merge "docs: App Translation API updates" into mnc-docs
am: 1ede811143

* commit '1ede811143d32afe8ba6ce49a19060da4a1b6092':
  docs: App Translation API updates

Change-Id: Id075bdfddf3c5ccabf063690a37c487a87f9635d
2016-05-13 17:11:08 +00:00
David Friedman
d7d262dd09 Docs: API Overview page for Android N, Dev Preview 3 am: 93970bae9b am: 95d6fa6b5d
am: d180d46711

* commit 'd180d467117c3c2896f09dd640ff64c6178bc715':
  Docs: API Overview page for Android N, Dev Preview 3

Change-Id: I209031e20cfefe3be310131c88bccbc63cad0e90
2016-05-13 17:08:30 +00:00
Fyodor Kupolov
b7bd2e645d Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev 2016-05-13 17:07:59 +00:00
David Friedman
d180d46711 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
2016-05-13 17:06:14 +00:00
Robin Lee
fe47b6eefa Skip 'network may be monitored' if dying or locked
KeyChain isn't direct boot aware & attempting to bind to a service
inside a dying user isn't going to end well.

Change-Id: I5a0acc34f98c39705ec404765c87e7ac61ca9b71
Fix: 28725354
2016-05-13 18:05:33 +01:00
Kevin Hufnagle
1ede811143 Merge "docs: App Translation API updates" into mnc-docs 2016-05-13 17:05:11 +00:00
David Friedman
95d6fa6b5d 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
2016-05-13 17:03:28 +00:00
Jaewan Kim
7539af45cb Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev
am: abe26c8d69

* commit 'abe26c8d69d7bfa5400e52ad4bb96020df0cdf68':
  PIP: Fix NPE when onboarding is shown

Change-Id: I3082c08a64f423b1fa9435a473b4f398e1350856
2016-05-13 17:00:14 +00:00
TreeHugger Robot
abe26c8d69 Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev 2016-05-13 16:55:12 +00:00
Andreas Gampe
9a2ecb30ae Merge "System server: Add Bluetooth to native processes" into nyc-dev
am: 3264b60738

* commit '3264b60738b0c8c611334d448aca4480eaffc1cc':
  System server: Add Bluetooth to native processes

Change-Id: I8bbeb967bd7ce4867399099f9d945fb2108b9909
2016-05-13 16:31:42 +00:00
Andreas Gampe
3264b60738 Merge "System server: Add Bluetooth to native processes" into nyc-dev 2016-05-13 16:27:58 +00:00
Amanda Kassay
b32811214c Clean up sdk/sdk_vars.cs file b/28744510
Change-Id: I9e09f0a320c4379db517ddb4e0783035dea5c061
2016-05-13 12:17:43 -04:00
Robin Lee
4d03abcd49 Make some of the UID-based VPN code reusable
By changing some member refs into arguments and having one of the
functions create the UID range instead of adding to mVpnUsers.

This will be useful for other layers of UID filtering like having
UIDs explicitly blocked from the VPN.

Deleted one broken line of code that cleared the status intent when
a restricted profile is removed. Other than that, this commit shouldn't
change any behaviour. If it does, that's a bug.

Bug: 26694104
Change-Id: Ieb656835d3282a8ba63cc3f12a80bfae166bcf44
2016-05-13 16:03:11 +00:00
Adam Powell
86100d18ad 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
2016-05-13 08:34:37 -07:00
Paul Jensen
771d9fe0b6 Merge "ApfFilter unit test" into nyc-dev
am: b742495cf5

* commit 'b742495cf54c09c5780c7c22f4d389b92e22449d':
  ApfFilter unit test

Change-Id: Ib0595b9cd72efaa408028983287fea0b81b3bee6
2016-05-13 14:38:11 +00:00
Paul Jensen
b742495cf5 Merge "ApfFilter unit test" into nyc-dev 2016-05-13 14:33:25 +00:00
Donghyun Cho
fc462b962c CEC: Defer CEC actions until logical address is available
If logical address of device is not set, CEC actions will not work
correctly because outgoing CEC message's source address will be
wrong. In this case, CEC actions should be deferred until address
allocation finishes.

Bug: 28709242
Change-Id: I09e199c6144a5b341e3a6113022d0243fcfc3cf5
2016-05-13 21:22:37 +09:00
Steven Ng
e333b2eb81 Merge "Add a Global setting for disabling OEM unlocking setting" into nyc-mr1-dev 2016-05-13 11:27:59 +00:00
David Friedman
93970bae9b Docs: API Overview page for Android N, Dev Preview 3
Change-Id: Ib9a5dbe796eba85ea94686cce2532e0e77d6c615
2016-05-13 01:23:13 -07:00
Jaewan Kim
91c5066c00 PIP: Fix NPE when onboarding is shown
Bug: 28754669
Change-Id: Ifca78e111b63422c3875dc4eba48c02e11f83530
2016-05-13 16:18:49 +09:00
Erik Kline
d2ba6ec3fc Support IPv4-only and IPv6-only provisioning
am: 2ec229a0ed

* commit '2ec229a0ed5a462c20549d86bda5f2de9ec2858e':
  Support IPv4-only and IPv6-only provisioning

Change-Id: I39d864095a53c4499893dc8272795fec78e25b98
2016-05-13 05:59:17 +00:00
Erik Kline
2ec229a0ed Support IPv4-only and IPv6-only provisioning
Bug: 28437662
Change-Id: I95b2d6eeb48cc526c8e6e015c5130ff9141fb898
2016-05-13 13:21:25 +09:00
Andrii Kulian
48164fd554 Merge "Close leaked windows when trying to preserve main one" into nyc-dev
am: 4ef107bb7a

* commit '4ef107bb7ad0c1f28db710374bb118e6658d3238':
  Close leaked windows when trying to preserve main one

Change-Id: Ie98ad06c08eb4486d98327201fb7fa10456a2459
2016-05-13 03:30:41 +00:00
Andrii Kulian
4ef107bb7a Merge "Close leaked windows when trying to preserve main one" into nyc-dev 2016-05-13 03:24:34 +00:00
Eric Schmidt
54a948f8b4 Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs am: 16d7c71365 am: fd9dca7783
am: 02a71e6eeb

* commit '02a71e6eebcaf58bdbe4966fc315054d97ad7750':
  docs: Continue CL of emoji section in api-overview

Change-Id: Iee5bcf4a7f12e4ea46e052fb0ab7c3bb9e7371ca
2016-05-13 02:49:21 +00:00
David Friedman
02a71e6eeb 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
2016-05-13 02:46:05 +00:00
Eric Schmidt
6ca10930b1 Merge "docs: Continue CL of notifications updates" into mnc-io-docs am: 272db39ad8 am: 87ec2a1348
am: 938fff13e4

* commit '938fff13e4084232d43e2450afa59d5955d2d8d0':
  docs: Continue CL of notifications updates

Change-Id: I42aa7921d36a49a9f6a67850015181cb079c1bf6
2016-05-13 02:45:56 +00:00
David Friedman
938fff13e4 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
2016-05-13 02:42:58 +00:00