OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "WifiManager: Remove unused methods" am: efb7bec56a
Roshan Pius [Wed, 7 Sep 2016 21:57:25 +0000 (21:57 +0000)]
Merge "WifiManager: Remove unused methods" am: efb7bec56a
am: 718c90daf1

Change-Id: I8f2ead6f404dd3bdb1106d22f2fde756daef4cc8

7 years agoMerge "WifiManager: Remove unused methods"
Roshan Pius [Wed, 7 Sep 2016 21:51:18 +0000 (21:51 +0000)]
Merge "WifiManager: Remove unused methods"
am: efb7bec56a

Change-Id: I68d2ee571f04136a7c4babbdfa097d5449cc5ac3

7 years agoMerge "WifiManager: Remove unused methods"
Treehugger Robot [Wed, 7 Sep 2016 21:43:19 +0000 (21:43 +0000)]
Merge "WifiManager: Remove unused methods"

7 years agoMerge "Support library 24.2.0 API diff" into nyc-dev
Alan Viverette [Wed, 7 Sep 2016 20:58:34 +0000 (20:58 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev
am: 9d25bf73a4

Change-Id: I52810f4fc94086fd23b00bd381c82c71ee5fbfd7

7 years agoSupport library 24.2.0 API diff
Alan Viverette [Wed, 7 Sep 2016 20:58:27 +0000 (20:58 +0000)]
Support library 24.2.0 API diff
am: ae3fecc1a9

Change-Id: Id53c9b41740e22ee7d14f6d037de63b000a7baff

7 years agoMerge "Support library 24.2.0 API diff" into nyc-dev
Alan Viverette [Wed, 7 Sep 2016 20:54:04 +0000 (20:54 +0000)]
Merge "Support library 24.2.0 API diff" into nyc-dev

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
Narayan Kamath [Wed, 7 Sep 2016 20:37:01 +0000 (20:37 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc  -s ours am: 9802fcfa2b am: 2acf9f7e3c am: 36b90a1934 am: 5febcdd210 am: ebcc7aeda9
am: f52b30cf8d

Change-Id: I9b47f64c25964c2ca1e91451f0a47002b5d01593

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
Narayan Kamath [Wed, 7 Sep 2016 20:32:17 +0000 (20:32 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc  -s ours am: 9802fcfa2b am: 2acf9f7e3c am: 36b90a1934 am: 5febcdd210
am: ebcc7aeda9

Change-Id: Ie2e2292bbb8c6d274109d64f7dd3ed00fca0ba0f

7 years agoMerge "docs: Fixing redirect file" into nyc-dev
Andrew Solovay [Wed, 7 Sep 2016 20:25:47 +0000 (20:25 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev
am: 33831c02b5

Change-Id: I581a03e4ae3bff311f1ae17dbaf2281d0389947b

7 years agodocs: Fixing redirect file
Andrew Solovay [Wed, 7 Sep 2016 20:25:43 +0000 (20:25 +0000)]
docs: Fixing redirect file
am: 5bf2ea6670

Change-Id: I52063f29a2adee8e11c528c3268b26a0120c2afc

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
Narayan Kamath [Wed, 7 Sep 2016 20:23:28 +0000 (20:23 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc  -s ours am: 9802fcfa2b am: 2acf9f7e3c am: 36b90a1934
am: 5febcdd210

Change-Id: Ib7e40acc4682e4198dcaab78c57de02acfe89c94

7 years agoMerge "docs: Fixing redirect file" into nyc-dev
TreeHugger Robot [Wed, 7 Sep 2016 20:19:07 +0000 (20:19 +0000)]
Merge "docs: Fixing redirect file" into nyc-dev

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
Narayan Kamath [Wed, 7 Sep 2016 20:17:02 +0000 (20:17 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc  -s ours am: 9802fcfa2b am: 2acf9f7e3c
am: 36b90a1934

Change-Id: Iec55904ecb004d3bf89bf3a065e5811afae798d6

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
Narayan Kamath [Wed, 7 Sep 2016 20:12:43 +0000 (20:12 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc  -s ours am: 9802fcfa2b
am: 2acf9f7e3c

Change-Id: Ideae7875e299ec0292054aad85fe8aa92b6aba9b

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f8...
Narayan Kamath [Wed, 7 Sep 2016 20:07:58 +0000 (20:07 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87 am: 9a409265fc  -s ours
am: 9802fcfa2b

Change-Id: Iabeefa7d07d78002c124ce62dc210111b83a99b7

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87
Narayan Kamath [Wed, 7 Sep 2016 20:01:56 +0000 (20:01 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54 am: f7b9f84f87
am: 9a409265fc  -s ours

Change-Id: Idf4dcc5ab7e8b0510848cbd2f220fe7a8e4b3e04

7 years agoMerge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
Andrew Solovay [Wed, 7 Sep 2016 19:07:49 +0000 (19:07 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
am: 4dc743ac67

Change-Id: Ia0fa62280c8409ce774a5f3ffb90f71eb081e7e1

7 years agodocs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
Andrew Solovay [Wed, 7 Sep 2016 19:07:39 +0000 (19:07 +0000)]
docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI
am: 7cfe9f83ac

Change-Id: Id52ee115f9aa58f87e9965dad972c9faa3e72fd6

7 years agoMerge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev
TreeHugger Robot [Wed, 7 Sep 2016 19:02:35 +0000 (19:02 +0000)]
Merge "docs: Added note about CustomTabsIntent.setAlwaysUseBrowserUI" into nyc-dev

7 years agoBackport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54
Narayan Kamath [Wed, 7 Sep 2016 18:58:41 +0000 (18:58 +0000)]
Backport changes to whitelist sockets opened by the zygote. am: 7ec85f9d54
am: f7b9f84f87

Change-Id: I317cecff389f30c5d47e4adee1afafbde8d9d23d

7 years agoBackport changes to whitelist sockets opened by the zygote.
Narayan Kamath [Wed, 7 Sep 2016 18:53:40 +0000 (18:53 +0000)]
Backport changes to whitelist sockets opened by the zygote.
am: 7ec85f9d54

Change-Id: I6db56b5b06636201382f6d908297644183253c0b

7 years agodocs: Fixing redirect file
Andrew Solovay [Fri, 26 Aug 2016 21:31:25 +0000 (14:31 -0700)]
docs: Fixing redirect file

Devsite handles "redirect this directory tree" differently than DAC
did; as a result, a bunch of redirects were broken. (On Devsite, a
redirect ending in a slash redirects *only* paths that match it;
to redirect that directory and all its contents, end with /...)

Also deleted one redirect that wouldn't work (trying to redirect
foo.html#bar , which wouldn't work--the anchors are ignored on
devsite and there was a separate redirect for just foo.html).

When a redirect pointed *to* a path ending in slash -- but was clearly
meant to point to the directory itself (i.e. the /index.html file) --
I removed the trailing slash.

Redirects staged to https://android-dot-devsite.googleplex.com , so
they should all work there.

bug: 30748799
Change-Id: I6d090de5e6efa6ddb2bbe3e99fdbfb0ae02b88d5

7 years agoMerge changes from topic 'fix-nyc-dev-plus-aosp' into nyc-dev-plus-aosp
Iliyan Malchev [Wed, 7 Sep 2016 18:22:44 +0000 (18:22 +0000)]
Merge changes from topic 'fix-nyc-dev-plus-aosp' into nyc-dev-plus-aosp

* changes:
  Move Status to libhidl
  Adds framework support for hidl-gen Java backend. (to support structs)
  Add Bool* APIs to HwParcel
  Link against libhidl for HidlSupport/svcmgr
  Support one-way methods in java support for hardware binder
  Initial commit of Java support for hardware binder

7 years agoBackport changes to whitelist sockets opened by the zygote.
Narayan Kamath [Fri, 19 Aug 2016 12:45:24 +0000 (13:45 +0100)]
Backport changes to whitelist sockets opened by the zygote.

This is the backport of the following commits :

Commit c5f27a7cb2ec816f483a65255034a1b57a8aa22:
-----------------------------------------------

Reopen whitelisted zygote file descriptors after a fork.

We don't want these descriptors to be shared post-fork, so we'll
have to close and reopen them when the zygote forks. The set of
open descriptors is checked against a whitelist and it is a fatal
error if a non whitelisted FD is opened. It is also a fatal error
if anything other than a regular file / character device or socket
is opened at the time of forking.

This work is done in two stages :
- An initial list of FDs is constructed and cached prior to the
  first zygote fork.

- On each subsequent fork, we check whether the list of open FDs
  has changed. We are currently tolerant of changes, but in the
  longer term, it should be a fatal error if the set of open file
  descriptors in the zygote changes.

- Post fork, we traverse the list of open descriptors and reopen
  them if necessary.

bug: 30963384

Commit 3764a260f0c90dcb323caeda14baf903cc108759:
-----------------------------------------------

Add a whitelist of sockets on fork.

Maintain a whitelist of AF_UNIX sockets that are permitted
to exist at the time of forking. If an open socket does not belong
to the whitelist (or is not AF_UNIX), the process will abort. If an
open socket is whitelisted, it will be redirected to /dev/null after
a sucessful fork. This allows us to unify our handling of the special
zygote sockets (/dev/socket/zygote[_secondary]) with the existing
whitelist of non socket file descriptors.

This change also removes non-fatal ALOGW messages since they have the
side effect of reopening the logging socket.

bug: 30963384

Commit 0b76d6a28e6978151bf245a775329cdae5e574d5:
-----------------------------------------------
fd_utils: Fix broken usage of iterators.

There were two separate issues here :
- RestatInternal was using an iterator after a call to erase(). This
  will not work because it will be invalidated.
- The "standard" for loop idiom for iterating over a map while making
  structural changes to it is broken. Switch to a while loop and treat
  cases where elements are erased differently from cases where they
  aren't.

bug: 31092930
bug: 30963384

Plus additional changes:
-----------------------------------------------
- change std::unordered_map to std::tr1::unordered_map.
- add /dev/alarm and /dev/__properties__ to the whitelist.
- map.erase(iterator) returns void prior to C++11, so need the kludge
  of calling erase(it++).

Change-Id: I694ff66d5f227239b0190ffc2287882b16e336fa

7 years agoMerge "WifiEnterpriseConfig: Refactor set/get field values" am: c4856bd73c
Roshan Pius [Wed, 7 Sep 2016 16:00:36 +0000 (16:00 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values" am: c4856bd73c
am: 655ae32d57

Change-Id: I2c5652450f774ed7841763898be7e3850af111a9

7 years agoMerge "WifiEnterpriseConfig: Refactor set/get field values"
Roshan Pius [Wed, 7 Sep 2016 15:55:32 +0000 (15:55 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values"
am: c4856bd73c

Change-Id: Id78dd9286f755f4cd1a9057f42972b8bfdc5caa9

7 years agoMerge "WifiEnterpriseConfig: Refactor set/get field values"
Roshan Pius [Wed, 7 Sep 2016 15:47:39 +0000 (15:47 +0000)]
Merge "WifiEnterpriseConfig: Refactor set/get field values"

7 years agoMove Status to libhidl
Martijn Coenen [Wed, 31 Aug 2016 23:37:05 +0000 (01:37 +0200)]
Move Status to libhidl

Bug: 31226252

Change-Id: Ieb0adcf1fa71d6859324c2d83841685d1e1a22f8
Signed-off-by: Iliyan Malchev <malchev@google.com>
7 years agoAdds framework support for hidl-gen Java backend. (to support structs)
Andreas Huber [Thu, 25 Aug 2016 18:21:21 +0000 (11:21 -0700)]
Adds framework support for hidl-gen Java backend. (to support structs)

Bug: 30575790
Change-Id: Ida30d8fe7a1b210e98f1a0ea5d429a0112f9ef3f
Signed-off-by: Iliyan Malchev <malchev@google.com>
7 years agoAdd Bool* APIs to HwParcel
Andreas Huber [Wed, 24 Aug 2016 23:19:03 +0000 (16:19 -0700)]
Add Bool* APIs to HwParcel

Bug: 31045584
Change-Id: I202c4aa7caf92a4cd7e3a45ef6784638e41facc8
Signed-off-by: Iliyan Malchev <malchev@google.com>
7 years agoLink against libhidl for HidlSupport/svcmgr
Martijn Coenen [Fri, 19 Aug 2016 12:23:42 +0000 (14:23 +0200)]
Link against libhidl for HidlSupport/svcmgr

Bug: 30839546
Change-Id: I52609576aa7f10da608725ef4ea78b778f127eef
Signed-off-by: Iliyan Malchev <malchev@google.com>
7 years agoSupport one-way methods in java support for hardware binder
Andreas Huber [Thu, 18 Aug 2016 21:29:40 +0000 (14:29 -0700)]
Support one-way methods in java support for hardware binder

Bug: 30922538
Change-Id: I5ff93126a29f6bff42dee3f9868fa794ca7c077f
Signed-off-by: Iliyan Malchev <malchev@google.com>
7 years agoInitial commit of Java support for hardware binder
Andreas Huber [Mon, 15 Aug 2016 16:25:02 +0000 (09:25 -0700)]
Initial commit of Java support for hardware binder

Change-Id: If1098ab921a11bae8eca2a70a3c3070e4daa0ea2

7 years agoMerge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am...
Sergio Giro [Wed, 7 Sep 2016 12:28:09 +0000 (12:28 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)" am: 12d3d4bbba
am: 6c753ca336

Change-Id: I3f6c8546ff116fbfcf11c0c0f5b168f56503e22f

7 years agoMerge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1
Sergio Giro [Wed, 7 Sep 2016 12:28:00 +0000 (12:28 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60" am: 6767fd28b1
am: 52e0434748

Change-Id: I4e631cb3d354b2bba2dd0ced239edf60588d12a3

7 years agoMerge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d
Sergio Giro [Wed, 7 Sep 2016 12:27:54 +0000 (12:27 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method" am: 4c2df18a4d
am: 09a2121d5d

Change-Id: I8e2002564fbdc2aea638538bb8954e44d882900e

7 years agoMerge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8
Sergio Giro [Wed, 7 Sep 2016 12:23:41 +0000 (12:23 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60" am: 59c0fcf0c8
am: 290f2bb2a0

Change-Id: I0030e50dc05e88979d50e73feeb778c79ece47fc

7 years agoMerge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
Sergio Giro [Wed, 7 Sep 2016 12:21:36 +0000 (12:21 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
am: 12d3d4bbba

Change-Id: I27e64111dc18e052884b3b571f93a17c9d5f663c

7 years agoMerge "java.security.PKCS12Attribute: port class from jdk8u60"
Sergio Giro [Wed, 7 Sep 2016 12:21:17 +0000 (12:21 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60"
am: 6767fd28b1

Change-Id: Ib80d6ae24734def58881a4536b232870fb885015

7 years agoMerge "java.security.SecureRandom: add getInstanceStrong() method"
Sergio Giro [Wed, 7 Sep 2016 12:20:49 +0000 (12:20 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method"
am: 4c2df18a4d

Change-Id: I5faf9c49a7d09e8eef38edd6cf32de4f65783e5d

7 years agoMerge "java.security: port DomainLoadStoreParameter from jdk8u60"
Sergio Giro [Wed, 7 Sep 2016 12:14:47 +0000 (12:14 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60"
am: 59c0fcf0c8

Change-Id: I8fd7dc636a579c67c4b9851f4babae30e19a2024

7 years agoMerge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"
Sergio Giro [Wed, 7 Sep 2016 12:08:27 +0000 (12:08 +0000)]
Merge "java.security.cert.X509CRL: add new method verify(PublicKey, Provider)"

7 years agoMerge "java.security.PKCS12Attribute: port class from jdk8u60"
Sergio Giro [Wed, 7 Sep 2016 12:07:13 +0000 (12:07 +0000)]
Merge "java.security.PKCS12Attribute: port class from jdk8u60"

7 years agoMerge "java.security.SecureRandom: add getInstanceStrong() method"
Sergio Giro [Wed, 7 Sep 2016 12:05:35 +0000 (12:05 +0000)]
Merge "java.security.SecureRandom: add getInstanceStrong() method"

7 years agoMerge "java.security: port DomainLoadStoreParameter from jdk8u60"
Sergio Giro [Wed, 7 Sep 2016 12:04:20 +0000 (12:04 +0000)]
Merge "java.security: port DomainLoadStoreParameter from jdk8u60"

7 years agoMerge "Add a test app for suppressed exceptions" am: 15c6078f4d
Yohann Roussel [Wed, 7 Sep 2016 10:08:16 +0000 (10:08 +0000)]
Merge "Add a test app for suppressed exceptions" am: 15c6078f4d
am: 166ab31073

Change-Id: Icff43af8769359b3cc97653182831466a02b0c8f

7 years agoMerge "Add a test app for suppressed exceptions"
Yohann Roussel [Wed, 7 Sep 2016 10:03:08 +0000 (10:03 +0000)]
Merge "Add a test app for suppressed exceptions"
am: 15c6078f4d

Change-Id: I45692cdf5081fe848935075d861fad11e68d19ba

7 years agoMerge "Add a test app for suppressed exceptions"
Yohann Roussel [Wed, 7 Sep 2016 09:52:49 +0000 (09:52 +0000)]
Merge "Add a test app for suppressed exceptions"

7 years agoMerge changes from topic 'enable_nan' am: 62419a0138
Etan Cohen [Wed, 7 Sep 2016 04:40:27 +0000 (04:40 +0000)]
Merge changes from topic 'enable_nan' am: 62419a0138
am: 20d6e886a7

Change-Id: I57da3187f0373aa45b8bac0786c34e80c87cef6c

7 years agoGive WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am...
Lorenzo Colitti [Wed, 7 Sep 2016 04:33:24 +0000 (04:33 +0000)]
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE] am: 4171cdf303  -s ours
am: 8b8bef622a  -s ours

Change-Id: Id410b4653b3314766eac6b185577cc7708e0823b

7 years agoMerge changes from topic 'enable_nan'
Etan Cohen [Wed, 7 Sep 2016 04:33:23 +0000 (04:33 +0000)]
Merge changes from topic 'enable_nan'
am: 62419a0138

Change-Id: I98abd87843ed3f2fde6c5b1fe1234563e03e0216

7 years ago[NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022 -s ours
Etan Cohen [Wed, 7 Sep 2016 04:33:21 +0000 (04:33 +0000)]
[NAN] Add transport type for NAN. [DO NOT MERGE] am: bd9fdbe022  -s ours
am: e3efe944fd  -s ours

Change-Id: I439ed5ac5b70f6e693a441d8b6000f208351a3f7

7 years agoGive WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
Lorenzo Colitti [Wed, 7 Sep 2016 04:28:21 +0000 (04:28 +0000)]
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
am: 4171cdf303  -s ours

Change-Id: I2d3f4c4b11ba2a39649c7747fbe1cee1ff16f198

7 years ago[NAN] Add transport type for NAN. [DO NOT MERGE]
Etan Cohen [Wed, 7 Sep 2016 04:27:28 +0000 (04:27 +0000)]
[NAN] Add transport type for NAN. [DO NOT MERGE]
am: bd9fdbe022  -s ours

Change-Id: I5b313eda3f872b9938b0092d4fc197e5af8ac8b7

7 years agoMerge changes from topic 'enable_nan'
Etan Cohen [Wed, 7 Sep 2016 04:19:51 +0000 (04:19 +0000)]
Merge changes from topic 'enable_nan'

* changes:
  Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
  [NAN] Add transport type for NAN. [DO NOT MERGE]

7 years agoMerge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0
Roshan Pius [Tue, 6 Sep 2016 23:12:01 +0000 (23:12 +0000)]
Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0
am: e597198f12

Change-Id: I3a1f7808a4ce44f96753cb875ff914985151b208

7 years agoMerge "WifiConfiguration: Fix isEnterprise"
Roshan Pius [Tue, 6 Sep 2016 23:02:10 +0000 (23:02 +0000)]
Merge "WifiConfiguration: Fix isEnterprise"
am: 9221c96ae0

Change-Id: I439205f4db4bfc292f084ea716014d64353c2885

7 years agoGive WakeupMessage the ability to transport an object as well. [DO NOT MERGE]
Lorenzo Colitti [Tue, 7 Jun 2016 07:27:10 +0000 (16:27 +0900)]
Give WakeupMessage the ability to transport an object as well. [DO NOT MERGE]

(cherry-pick of commit eab17da5882e59caff25c73aa6bcd0587aca9dd4)

Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3

7 years ago[NAN] Add transport type for NAN. [DO NOT MERGE]
Etan Cohen [Mon, 20 Jun 2016 16:27:12 +0000 (09:27 -0700)]
[NAN] Add transport type for NAN. [DO NOT MERGE]

Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.

While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.

(cherry-pick of commit 7b84987a6acf2f0a950c334a17a6ee085db3ba4f)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75

7 years agoMerge "WifiConfiguration: Fix isEnterprise"
Treehugger Robot [Tue, 6 Sep 2016 22:51:42 +0000 (22:51 +0000)]
Merge "WifiConfiguration: Fix isEnterprise"

7 years agoMerge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b
Mathieu Chartier [Tue, 6 Sep 2016 22:38:18 +0000 (22:38 +0000)]
Merge "Avoid profile guided compilation for vmSafeMode" am: a817838e8b
am: 7554be1e36

Change-Id: I4d34ab801e08034c7d54818cc0f313efa88edf69

7 years agoMerge "Avoid profile guided compilation for vmSafeMode"
Mathieu Chartier [Tue, 6 Sep 2016 22:30:34 +0000 (22:30 +0000)]
Merge "Avoid profile guided compilation for vmSafeMode"
am: a817838e8b

Change-Id: I5e761bb08c72ed2700cec752caba5a6b02b02015

7 years agoMerge "Avoid profile guided compilation for vmSafeMode"
Mathieu Chartier [Tue, 6 Sep 2016 22:19:03 +0000 (22:19 +0000)]
Merge "Avoid profile guided compilation for vmSafeMode"

7 years agoMerge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012
yuanhuihui [Tue, 6 Sep 2016 21:42:46 +0000 (21:42 +0000)]
Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes" am: 1cd6248012
am: 130cb9232a

Change-Id: Ia3d8581e5641e2da8a5d84222edb81829edbc6d0

7 years agoMerge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e...
Android Build Merger (Role) [Tue, 6 Sep 2016 21:34:02 +0000 (21:34 +0000)]
Merge "Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7 am: 0bb64f1b3e" into nyc-dev-plus-aosp

7 years agoMerge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev...
Android Build Merger (Role) [Tue, 6 Sep 2016 21:33:37 +0000 (21:33 +0000)]
Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev-plus-aosp

7 years agoMerge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3...
Android Build Merger (Role) [Tue, 6 Sep 2016 21:33:28 +0000 (21:33 +0000)]
Merge "OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a am: 6c22810fb3" into nyc-dev-plus-aosp

7 years agoMerge "OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c" into...
Android Build Merger (Role) [Tue, 6 Sep 2016 21:33:20 +0000 (21:33 +0000)]
Merge "OtaDexoptService: Run dexopt on all apps am: 14186731f9 am: 4775ba500c" into nyc-dev-plus-aosp

7 years agoMerge "Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug...
Android Build Merger (Role) [Tue, 6 Sep 2016 21:33:15 +0000 (21:33 +0000)]
Merge "Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev am: d2273e433c" into nyc-dev-plus-aosp

7 years agoMerge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238...
Android Build Merger (Role) [Tue, 6 Sep 2016 21:33:09 +0000 (21:33 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238 am: 1e4bc15f31" into nyc-dev-plus-aosp

7 years agoMerge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238...
Sreevani Sreejith [Tue, 6 Sep 2016 21:32:34 +0000 (21:32 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev
am: d2273e433c

Change-Id: Ic3d176da7b7c6e213793ddabc8f409d65942389b

7 years agodocs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238
sreevanis [Tue, 6 Sep 2016 21:32:25 +0000 (21:32 +0000)]
docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238
am: 1e4bc15f31

Change-Id: I9c4fb48ed1d0a853acd657b0c08ae1de85078fb1

7 years agoMerge changes from topic 'cherry_pms_installd' am: 421c74f8e7
Andreas Gampe [Tue, 6 Sep 2016 21:32:03 +0000 (21:32 +0000)]
Merge changes from topic 'cherry_pms_installd' am: 421c74f8e7
am: 0bb64f1b3e

Change-Id: I93d809446e316aa9c8c126e10229b09005f24ac3

7 years agoRelease mPackages lock earlier am: 94f9be2ee2
Todd Kennedy [Tue, 6 Sep 2016 21:31:56 +0000 (21:31 +0000)]
Release mPackages lock earlier am: 94f9be2ee2
am: 2ee7053cfc

Change-Id: If18e59f7a4575f88d0f196b0a4fbe869644392a7

7 years agoOtaDexopt: Special-case system app classpaths am: 3f95d0bb6a
Andreas Gampe [Tue, 6 Sep 2016 21:31:43 +0000 (21:31 +0000)]
OtaDexopt: Special-case system app classpaths am: 3f95d0bb6a
am: 6c22810fb3

Change-Id: Id9b936123e43c0ced3f1ab4f4aab629b707562a1

7 years agoOtaDexoptService: Run dexopt on all apps am: 14186731f9
Andreas Gampe [Tue, 6 Sep 2016 21:31:29 +0000 (21:31 +0000)]
OtaDexoptService: Run dexopt on all apps am: 14186731f9
am: 4775ba500c

Change-Id: Ib35dd0b8a268a1f9f3e5f9739a5f2eaaa320ef39

7 years agoFrameworks/base: Add compiler stats to Package Manager am: 7e619a912c
Andreas Gampe [Tue, 6 Sep 2016 21:31:18 +0000 (21:31 +0000)]
Frameworks/base: Add compiler stats to Package Manager am: 7e619a912c
am: 723bbd880a

Change-Id: Ia02fbf2770aaf4186633421a6c11aa0b95dd8f64

7 years ago[RFC] Special case system apps for profile optimizations am: 08313b0d95
Calin Juravle [Tue, 6 Sep 2016 21:25:44 +0000 (21:25 +0000)]
[RFC] Special case system apps for profile optimizations am: 08313b0d95
am: 788e111cba

Change-Id: I8466811b44b623e23117d6554e69cc80e2c4485f

7 years agoCompile core-apps according to their own "reason" for A/B am: 9438528d99
Calin Juravle [Tue, 6 Sep 2016 21:25:40 +0000 (21:25 +0000)]
Compile core-apps according to their own "reason" for A/B am: 9438528d99
am: 54a3247073

Change-Id: I9a95c7e64379757a00373f54521e035ff920ebe7

7 years agoFrameworks/base: Add new flow to OtaDexoptService am: d15300cf38
Andreas Gampe [Tue, 6 Sep 2016 21:25:36 +0000 (21:25 +0000)]
Frameworks/base: Add new flow to OtaDexoptService am: d15300cf38
am: 32a092adf3

Change-Id: I7a49f0732cf24c2a86f798c6725a664e93092d7b

7 years agoOtadexopt: Expose progress percentage am: ff8ab4c9fa
Andreas Gampe [Tue, 6 Sep 2016 21:25:32 +0000 (21:25 +0000)]
Otadexopt: Expose progress percentage am: ff8ab4c9fa
am: 630a372a1d

Change-Id: I25937bf6a90076b37c5c322ccc8335fef3a9e6ee

7 years agocp preopted files from B partition during PM init. am: 2b6fc4c92d
Alex Light [Tue, 6 Sep 2016 21:25:28 +0000 (21:25 +0000)]
cp preopted files from B partition during PM init. am: 2b6fc4c92d
am: 0b89b352d4

Change-Id: I7da5e74d61dd82c177bf4ca2a87085317e9973f5

7 years agoMerge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238...
Sreevani Sreejith [Tue, 6 Sep 2016 21:24:31 +0000 (21:24 +0000)]
Merge "docs: Added functional and UI quality criteria for Wear 2.0 apps. Bug:30951238" into nyc-dev

7 years agoMerge "fixes mStartedUsers shoule be locked by mLock, not mVolumes"
yuanhuihui [Tue, 6 Sep 2016 21:15:46 +0000 (21:15 +0000)]
Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes"
am: 1cd6248012

Change-Id: Ie1d930f8925431641932bf1c4c94df9e57ffefc5

7 years agoMerge changes from topic 'cherry_pms_installd'
Andreas Gampe [Tue, 6 Sep 2016 21:15:42 +0000 (21:15 +0000)]
Merge changes from topic 'cherry_pms_installd'
am: 421c74f8e7

Change-Id: Ie69459a637f38cb1d9cf51f9069851fb75232264

7 years agoRelease mPackages lock earlier
Todd Kennedy [Tue, 6 Sep 2016 21:15:40 +0000 (21:15 +0000)]
Release mPackages lock earlier
am: 94f9be2ee2

Change-Id: I461f9588d34413705ee54d410b0d55936b699a04

7 years agoOtaDexopt: Special-case system app classpaths
Andreas Gampe [Tue, 6 Sep 2016 21:15:34 +0000 (21:15 +0000)]
OtaDexopt: Special-case system app classpaths
am: 3f95d0bb6a

Change-Id: Ia12705715f2638c0733192cd3324fbc05bd5d420

7 years agoOtaDexoptService: Run dexopt on all apps
Andreas Gampe [Tue, 6 Sep 2016 21:15:29 +0000 (21:15 +0000)]
OtaDexoptService: Run dexopt on all apps
am: 14186731f9

Change-Id: I6f53fc0acaa8f5413ac70488e4bd9938a3253cbf

7 years agoFrameworks/base: Add compiler stats to Package Manager
Andreas Gampe [Tue, 6 Sep 2016 21:15:23 +0000 (21:15 +0000)]
Frameworks/base: Add compiler stats to Package Manager
am: 7e619a912c

Change-Id: I4784db13f78d130c75277ece8313e1e638c11698

7 years ago[RFC] Special case system apps for profile optimizations
Calin Juravle [Tue, 6 Sep 2016 21:15:17 +0000 (21:15 +0000)]
[RFC] Special case system apps for profile optimizations
am: 08313b0d95

Change-Id: I4a44215cf5f9b7bcb3bcf131c7404fbb407d00d1

7 years agoCompile core-apps according to their own "reason" for A/B
Calin Juravle [Tue, 6 Sep 2016 21:15:09 +0000 (21:15 +0000)]
Compile core-apps according to their own "reason" for A/B
am: 9438528d99

Change-Id: Iba85d525810252b34bc862017b9ffe578f27fc93

7 years agoFrameworks/base: Add new flow to OtaDexoptService
Andreas Gampe [Tue, 6 Sep 2016 21:15:01 +0000 (21:15 +0000)]
Frameworks/base: Add new flow to OtaDexoptService
am: d15300cf38

Change-Id: I74f9938dc74c19ee0ef220ab3b50daa1085edea2

7 years agoOtadexopt: Expose progress percentage
Andreas Gampe [Tue, 6 Sep 2016 21:14:53 +0000 (21:14 +0000)]
Otadexopt: Expose progress percentage
am: ff8ab4c9fa

Change-Id: I2c7e91842d0975505c6b2e701c087b598d08e6cc

7 years agocp preopted files from B partition during PM init.
Alex Light [Tue, 6 Sep 2016 21:14:43 +0000 (21:14 +0000)]
cp preopted files from B partition during PM init.
am: 2b6fc4c92d

Change-Id: I97015c4a43d08d4420a745b09875eee467b85a1f

7 years agoMerge "fixes mStartedUsers shoule be locked by mLock, not mVolumes"
Treehugger Robot [Tue, 6 Sep 2016 21:09:05 +0000 (21:09 +0000)]
Merge "fixes mStartedUsers shoule be locked by mLock, not mVolumes"

7 years agoMerge changes from topic 'cherry_pms_installd'
Andreas Gampe [Tue, 6 Sep 2016 21:02:53 +0000 (21:02 +0000)]
Merge changes from topic 'cherry_pms_installd'

* changes:
  Release mPackages lock earlier
  OtaDexopt: Special-case system app classpaths
  OtaDexoptService: Run dexopt on all apps
  Frameworks/base: Add compiler stats to Package Manager
  [RFC] Special case system apps for profile optimizations
  Compile core-apps according to their own "reason" for A/B
  Frameworks/base: Add new flow to OtaDexoptService
  Otadexopt: Expose progress percentage
  cp preopted files from B partition during PM init.

7 years agoWifiManager: Remove unused methods
Roshan Pius [Tue, 6 Sep 2016 20:38:31 +0000 (13:38 -0700)]
WifiManager: Remove unused methods

Remove the unused hidden methods from WifiManager.

BUG: 29449615
TEST: Compiles, boots up.
Change-Id: Ie7e6f438b23a368e44d35390267d5505e12bb75e

7 years agoUpdate #jd-content to #body-content for DevSite layout changes.
Amanda Kassay [Tue, 6 Sep 2016 19:11:46 +0000 (19:11 +0000)]
Update #jd-content to #body-content for DevSite layout changes.
am: b5887e68c3

Change-Id: I60e4832cd02a7af89812d5c947f494c372785b6b

7 years agoDoc change: remove useUpdatedTemplates script and sections using old templates.
Dirk Dougherty [Tue, 6 Sep 2016 18:13:16 +0000 (18:13 +0000)]
Doc change: remove useUpdatedTemplates script and sections using old templates.
am: 9ac575abc3

Change-Id: If9123b0d0438d78982b73cbec08aebe28f2ae1c6

7 years agoremove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
smain@google.com [Tue, 6 Sep 2016 18:13:01 +0000 (18:13 +0000)]
remove 'useUpdatedTemplates' flag that's no longer supported. Fix build.
am: 7dd9749246

Change-Id: I112bec6d8618a116c8abab0751849e12253e298c