Commit Graph

249922 Commits

Author SHA1 Message Date
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
bcdbdaad76 Merge "Call isUserUnlockingOrUnlocked with cleared identity" into nyc-dev
am: b7bd2e645d

* commit 'b7bd2e645db390373d4f0847c7637d06faa1d4da':
  Call isUserUnlockingOrUnlocked with cleared identity

Change-Id: I2b80b409fb8f5829813aec7485d97fcf88ab4959
2016-05-13 17:12:04 +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
7ca0a8791b 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: I32d8c3cfc18bda7e38d2ab88c28c2197e2043745
2016-05-13 17:08:33 +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
1f1fd18f8f Merge "PIP: Fix NPE when onboarding is shown" into nyc-dev
am: abe26c8d69

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

Change-Id: I53f212597a04444fd544342adb9ee60f281fffee
2016-05-13 17:00:15 +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
9f768c3436 Merge "System server: Add Bluetooth to native processes" into nyc-dev
am: 3264b60738

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

Change-Id: Ia2f3acf70364886cb4a088e716bf480550779cd8
2016-05-13 16:31:45 +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
Elliott Hughes
f6ebf375e4 resolve merge conflicts of bc90502 to nyc-dev-plus-aosp
Change-Id: Ic78042d45085718b2220107e9a84767df316440a
2016-05-13 08:57:40 -07: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
Elliott Hughes
bc905021d0 Merge "Make android_net_NetUtils include what it actually uses."
am: e8f373e442

* commit 'e8f373e442a301691aa8f35f1dfb46e8149b450b':
  Make android_net_NetUtils include what it actually uses.

Change-Id: Iddc38891a66e6a868eef3af4ce025c7d7af1fb15
2016-05-13 15:13:01 +00:00
Elliott Hughes
e8f373e442 Merge "Make android_net_NetUtils include what it actually uses." 2016-05-13 15:04:18 +00:00
Paul Jensen
c6154624f2 Merge "ApfFilter unit test" into nyc-dev
am: b742495cf5

* commit 'b742495cf54c09c5780c7c22f4d389b92e22449d':
  ApfFilter unit test

Change-Id: I97bdf703c24c8c3008113c09f5f441cd1d74bc81
2016-05-13 14:38:13 +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
Shibin George
23d28cecf8 Synchronize access of mSubscriptions
Introduction of setConfigAsync to set Zen mode config
asynchronously leads to synchronization issues like
ArrayIndexOutOfBoundsException while accessing mSubscriptions.

Change-Id: I6f72d894605498e0a4b48eb58af19851be53b9dc
2016-05-13 17:36:15 +05:30
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
2ac64d96e4 Support IPv4-only and IPv6-only provisioning
am: 2ec229a0ed

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

Change-Id: I588ce57d75d14d43221851027c52ea316d083eac
2016-05-13 05:59:19 +00:00
xu.peng
9071ced8b0 Fix "TelephonyRegistry notifies wrong data status"
TelephonyRegistry should notify data status by correct subId,
otherwise in some case, SIM1 data status will be overried
by SIM2 data status.
Such as screen on/off action.If in fact SIM1 is data connected
to download something, but SIM2 is not,then sreen off,
both SIM1 and SIM2 will be notified to update data status.
Then SIM1 data status will be overried by SIM2 to be "no data
connected", before SIM1 data downloading is finished,SIM1
will not be able to show "data conneced" status.

Change-Id: Ia7d0767b3b4520294ee0d024903f7522cb0a0110
2016-05-13 05:38:21 +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
1c4c2caa4c 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: I20b5d6ab8adbb97cffca52e1daf66ed939d508b8
2016-05-13 03:30:45 +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
64ebf46143 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: I7af091476b9bf8b01bea6d42022d6f48164802b4
2016-05-13 02:49:07 +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
63e4161c97 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: Id10c0050e55ef57f2a88fe4db1b4b3c3e0f58cf5
2016-05-13 02:45:59 +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
Dirk Dougherty
f7c0b9c26f Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500 am: 0ec5620717 am: fc05721530
am: ccfda4ecd8

* commit 'ccfda4ecd8623a2560d907293be0ba5451d07852':
  Add metadata for tools videos.

Change-Id: Ia4a21c9ea14d58dea01f36653a48756c0d7b8520
2016-05-13 02:42:55 +00:00
Eric Schmidt
fd9dca7783 Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs
am: 16d7c71365

* commit '16d7c713656a0b4b98d15d29bc845ffe6b3dfe79':
  docs: Continue CL of emoji section in api-overview

Change-Id: I822c82db9d385325e754a93054cc9878880e6590
2016-05-13 02:42:50 +00:00
Dirk Dougherty
ccfda4ecd8 Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500 am: 0ec5620717
am: fc05721530

* commit 'fc05721530dcaa532e58b188624bb51d0024032c':
  Add metadata for tools videos.

Change-Id: I39bd537935258fab40ed38804c3233c6f124b91b
2016-05-13 02:40:25 +00:00
Eric Schmidt
87ec2a1348 Merge "docs: Continue CL of notifications updates" into mnc-io-docs
am: 272db39ad8

* commit '272db39ad8909d78562cc520aef9e75d501e79d7':
  docs: Continue CL of notifications updates

Change-Id: I9c06da55a3172f70f92f35fad4e889da049dba17
2016-05-13 02:40:20 +00:00
David Friedman
16d7c71365 Merge "docs: Continue CL of emoji section in api-overview" into mnc-io-docs 2016-05-13 02:37:39 +00:00
Dirk Dougherty
fc05721530 Merge "Add metadata for tools videos." into mnc-mr-docs am: 96762b8500
am: 0ec5620717

* commit '0ec5620717dec4ca0a4cf66e30567867df98b2d4':
  Add metadata for tools videos.

Change-Id: I71219fac0af88663cf1a5d270d7533016b8b866e
2016-05-13 02:37:18 +00:00
David Friedman
272db39ad8 Merge "docs: Continue CL of notifications updates" into mnc-io-docs 2016-05-13 02:36:40 +00:00
Dirk Dougherty
0ec5620717 Merge "Add metadata for tools videos." into mnc-mr-docs
am: 96762b8500

* commit '96762b8500166d931bbb8d5e6193c841540bdec8':
  Add metadata for tools videos.

Change-Id: I5b79243c49a5fba1637223dee0bfc7dfad5f9eea
2016-05-13 02:34:52 +00:00
Dirk Dougherty
96762b8500 Merge "Add metadata for tools videos." into mnc-mr-docs 2016-05-13 02:30:51 +00:00
Chong Zhang
8f6a9ca5e2 Merge "Fix a flicker when window is removed during entering animation" into nyc-dev
am: a285fdeb16

* commit 'a285fdeb160e822a2e1fe2fb6bd80ce91afcf181':
  Fix a flicker when window is removed during entering animation

Change-Id: If69708ffa782088d9d50064a110d75ca2c81c066
2016-05-13 02:03:51 +00:00
Chong Zhang
a285fdeb16 Merge "Fix a flicker when window is removed during entering animation" into nyc-dev 2016-05-13 01:58:52 +00:00
Eric Schmidt
700127aecf docs: Continue CL of emoji section in api-overview
Bug: 27920740
Change-Id: I069dcdad67ab91c6085bdf52b1a0af6833afbd11
2016-05-13 01:54:23 +00:00
Keisuke Kuroyanagi
727b2bcc92 Merge "Adjust divider when IME height is changed." into nyc-dev
am: 36d1296cf4

* commit '36d1296cf4f074599015b424161402f9b07da8ab':
  Adjust divider when IME height is changed.

Change-Id: I2a4d8a16028350c6634ce5f11eca644019325ce1
2016-05-13 01:53:55 +00:00
Keisuke Kuroyanagi
36d1296cf4 Merge "Adjust divider when IME height is changed." into nyc-dev 2016-05-13 01:46:10 +00:00