OSDN Git Service
Andreas Gampe [Thu, 13 Oct 2016 14:19:35 +0000 (14:19 +0000)]
Merge "Debug: Use UniqueFile" am:
546f755bf8
am:
8d151b26c2
Change-Id: Idd34de736fb73a07bc8b2f9c37ecf3b2080f1512
Selim Cinek [Thu, 13 Oct 2016 14:18:41 +0000 (14:18 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature" am:
a0322d5c5a -s ours
am:
00c553e1ba -s ours
Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c
lei.peng [Thu, 13 Oct 2016 14:17:59 +0000 (14:17 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am:
80587da3c1
am:
93c75d07c1
Change-Id: I5436618eb3ddd752a95caa5b0c427a3e32279a49
Stephen Li [Thu, 13 Oct 2016 14:16:43 +0000 (14:16 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master
am:
6accb573ab
Change-Id: I4e30dd844a5709d652c178be1b56e8f6e339464f
Jordan Liu [Thu, 13 Oct 2016 14:16:38 +0000 (14:16 +0000)]
Add cdma_3waycall_flash_delay key to CarrierConfig
am:
e5535d71fc
Change-Id: I5f23c160109bbdc951ff03c6d9912acfb09c03fd
Stephen Li [Thu, 13 Oct 2016 14:15:42 +0000 (14:15 +0000)]
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master
am:
302b99512f
Change-Id: I79c5b83245cfda542f9bcd05e389738d6fee7b39
Robert Sesek [Thu, 13 Oct 2016 14:13:36 +0000 (14:13 +0000)]
Merge "resolve merge conflicts of
8f8d187 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
Kevin Hufnagle [Wed, 12 Oct 2016 00:19:41 +0000 (00:19 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev
am:
2acaf0a120
Change-Id: I6e0c4229e23693efed750bb8eaa39e3a81ed1bf7
Kevin Hufnagle [Wed, 12 Oct 2016 00:19:36 +0000 (00:19 +0000)]
docs: Removed "Accessibility" page from "Pure Android" design docs
am:
1965375aa5
Change-Id: I0eade4d13850d53411fa86f0f14c6fdf096548d8
Kevin Hufnagle [Tue, 11 Oct 2016 23:40:42 +0000 (23:40 +0000)]
Merge "docs: Removed "Accessibility" page from "Pure Android" design docs" into nyc-dev
Andrew Solovay [Tue, 11 Oct 2016 20:32:14 +0000 (20:32 +0000)]
docs: Changed Google Analytics link to https://
am:
374ddfe529
Change-Id: I0c0042e565a920c806b38ef4f14012d77b2ffc41
Andrew Solovay [Tue, 11 Oct 2016 17:50:31 +0000 (10:50 -0700)]
docs: Changed Google Analytics link to https://
We've changed the script so the auto-generated versions of these
files will now use https:// for the Google Analytics links (required
if the files are going to be moved into Piper) but the existing
files haven't had that change applied, so I'm doing it by hand.
I'll build and stage to
https://android-dot-devsite.googleplex.com/sdk/support_api_diff/...
Change-Id: Ia11114920f84101522cd4511fde6a0363675bf24
Joe Fernandez [Tue, 11 Oct 2016 15:58:37 +0000 (15:58 +0000)]
Merge "docs: Add Android developer written case studies" into nyc-dev
am:
d2c5657e9c
Change-Id: I08cdf407d11d9abaeeee92c9dd4079534f8cb3d5
George French [Tue, 11 Oct 2016 15:58:31 +0000 (15:58 +0000)]
docs: Add Android developer written case studies
am:
cf71b1fdc0
Change-Id: I51bd536dfb4f0db5ea62f2c87ef7a05756ade6ed
Joe Fernandez [Tue, 11 Oct 2016 15:53:05 +0000 (15:53 +0000)]
Merge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev
am:
cae752e66b
Change-Id: I987597df2df3f9a5111b06d45ef2ceebf35e7556
George French [Tue, 11 Oct 2016 15:53:00 +0000 (15:53 +0000)]
Docs: Developer written case studies batch 3 (proj 31)
am:
26ab4135ab
Change-Id: Ib840c8fc23dd71735248871c901a0f6c79992854
Joe Fernandez [Tue, 11 Oct 2016 15:47:26 +0000 (15:47 +0000)]
Merge "docs: Add Android developer written case studies" into nyc-dev
Joe Fernandez [Tue, 11 Oct 2016 15:45:27 +0000 (15:45 +0000)]
Merge "Docs: Developer written case studies batch 3 (proj 31)" into nyc-dev
George French [Wed, 21 Sep 2016 00:09:29 +0000 (17:09 -0700)]
docs: Add Android developer written case studies
- updated stories/index.jd, games.jd, apps.jd to use collections
bug:
30809628
Change-Id: Iffd7e5913979c6002234d07d495c8c10dca7f9f2
Kevin Hufnagle [Tue, 11 Oct 2016 07:36:57 +0000 (07:36 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev
am:
aa78ed5b0a
Change-Id: I6609dc0031bd2e8f1c4d656f2c4a55c161e96071
Kevin Hufnagle [Tue, 11 Oct 2016 07:36:54 +0000 (07:36 +0000)]
docs: Revised Espresso code snippets
am:
d3c3c34134
Change-Id: I125c4d0b0518fb3ab27fc273d3d90203b359e278
Kevin Hufnagle [Tue, 11 Oct 2016 07:24:45 +0000 (07:24 +0000)]
Merge "docs: Revised Espresso code snippets" into nyc-dev
Kevin Hufnagle [Tue, 11 Oct 2016 06:04:07 +0000 (06:04 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev
am:
8e4ea67fa7
Change-Id: I2ca4ab1dfc68eb86a1f52ffb853b3d93320f648a
Kevin Hufnagle [Tue, 11 Oct 2016 06:04:01 +0000 (06:04 +0000)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB.
am:
197226e4a5
Change-Id: I1b78f9a13cc794ce81fca9d4dbfeb77cb93b5391
Kevin Hufnagle [Tue, 11 Oct 2016 05:54:10 +0000 (05:54 +0000)]
Merge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within IAB." into nyc-dev
Kevin Hufnagle [Tue, 11 Oct 2016 03:47:16 +0000 (20:47 -0700)]
docs: Removed "Accessibility" page from "Pure Android" design docs
The "Accessibility" section of Google's material design guidelines
has superseded this design page on DAC. To avoid confusion among
readers, it's best to remove this page.
Bug:
29513203
Change-Id: I61e3bbc7cacc6bed05c33e4983b967408528e5cf
Robert Sesek [Mon, 10 Oct 2016 22:34:42 +0000 (18:34 -0400)]
resolve merge conflicts of
8f8d187 to nyc-dev-plus-aosp
Change-Id: I75c7110ee4f0c9717e7276b609caa2402ef5c2be
George French [Thu, 6 Oct 2016 22:04:33 +0000 (15:04 -0700)]
Docs: Developer written case studies batch 3 (proj 31)
bug: b/
31739418
Change-Id: Iec92348aca9c4753a7a54b48c75d80dd5062dff0
Bert McMeen [Mon, 10 Oct 2016 22:08:48 +0000 (22:08 +0000)]
Docs: Remove a reference to a deprecated sample
am:
3e01ab2b0e
Change-Id: I565f9a6a7613e8430b06537384126bdebbc8d07a
Andreas Gampe [Mon, 10 Oct 2016 21:24:21 +0000 (21:24 +0000)]
Merge "Debug: Use UniqueFile"
am:
546f755bf8
Change-Id: I8696c83ddc9dbde46933810219f443dafa4b9d67
Selim Cinek [Mon, 10 Oct 2016 21:23:27 +0000 (21:23 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature"
am:
a0322d5c5a -s ours
Change-Id: I9de0c5ce3ab2fb3e5c44cc518a32da1432846bbc
lei.peng [Mon, 10 Oct 2016 21:22:45 +0000 (21:22 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null"
am:
80587da3c1
Change-Id: I394c312444e33f5b2fdcbe0887afb8ef58cef121
Bert McMeen [Mon, 10 Oct 2016 21:21:00 +0000 (14:21 -0700)]
Docs: Remove a reference to a deprecated sample
Bug:
31709180
Change-Id: Ieec19820b1154628236495541a28b50089c4e0cd
Tobias Sargeant [Mon, 10 Oct 2016 21:12:56 +0000 (21:12 +0000)]
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master
am:
38bfbf8d2a
Change-Id: I617abd1cf479bcf8fb83e58b63e305636a73e6f9
Tobias Sargeant [Mon, 10 Oct 2016 21:12:49 +0000 (21:12 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.
am:
dd4bb31639
Change-Id: Ie61bf8517c5b7a20beb67259d84e351f4a47665b
Treehugger Robot [Mon, 10 Oct 2016 21:02:29 +0000 (21:02 +0000)]
Merge "Debug: Use UniqueFile"
Stephen Li [Mon, 10 Oct 2016 20:44:02 +0000 (20:44 +0000)]
Merge "Add cdma_3waycall_flash_delay key to CarrierConfig" into stage-aosp-master
Stephen Li [Mon, 10 Oct 2016 20:43:41 +0000 (20:43 +0000)]
Merge "Split the zygote logic out of android.os.Process into a new ZygoteProcess class." into stage-aosp-master
TreeHugger Robot [Mon, 10 Oct 2016 20:42:36 +0000 (20:42 +0000)]
Merge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp-master
Treehugger Robot [Mon, 10 Oct 2016 20:41:13 +0000 (20:41 +0000)]
Merge "DO NOT MERGE - Added Emergency affordance feature"
Treehugger Robot [Mon, 10 Oct 2016 20:20:56 +0000 (20:20 +0000)]
Merge "Modify the case in adjustFocus when the mFocusedActivity is null"
Andreas Gampe [Wed, 5 Oct 2016 19:59:18 +0000 (12:59 -0700)]
Debug: Use UniqueFile
Test: m
Test: Device boots
Test: runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/os/DebugTest.java
Change-Id: Ibd31046ceccfd94c1ec7ce2e0c4a748c009cc69f
Selim Cinek [Tue, 13 Sep 2016 23:02:33 +0000 (16:02 -0700)]
DO NOT MERGE - Added Emergency affordance feature
Added a service that listens whether emergency affordances
are necessary.
If the they are needed, it adds an option to the
global actions dialog that directly launches the
emergency call and also adds a long-press listener
to the keyguard emergency button.
Test: adb shell settings put global force_emergency_affordance 1 && adb shell settings put global emergency_affordance_number 111112
Bug:
30404490
Change-Id: Ib96a15da2ef4b568a8d77140ebca6aa6f20f5ddb
lei.peng [Sat, 8 Oct 2016 09:58:37 +0000 (17:58 +0800)]
Modify the case in adjustFocus when the mFocusedActivity is null
Starting activity failed and the mFocusedActvity become null,
consider this condition when adjust focus.
Because in this condition, the focus mismatch between
ActivityManagerService#mFocusedActivity and
InputDispatcher(inputfilnger)#mFocusedApplication, ANR may occur.
Test: monkey test 48h with no ANR
Change-Id: Id1a2bf0d6ca6530e34443d359fbe2aa6c11b878c
Elliott Hughes [Sat, 8 Oct 2016 21:58:52 +0000 (21:58 +0000)]
Merge "Rely on the platform -std default." am:
66f15cc01b
am:
5a989a504a
Change-Id: I1e8593f68eaafb254c92f004c2694ca4145c910a
Elliott Hughes [Sat, 8 Oct 2016 21:53:48 +0000 (21:53 +0000)]
Merge "Rely on the platform -std default."
am:
66f15cc01b
Change-Id: I8930911314a16c499c6c8ea1b005e3c3ea7d95fa
Treehugger Robot [Sat, 8 Oct 2016 21:45:16 +0000 (21:45 +0000)]
Merge "Rely on the platform -std default."
Kevin Hufnagle [Fri, 9 Sep 2016 04:22:37 +0000 (21:22 -0700)]
docs: Revised Espresso code snippets
The code snippet showing how to migrate subclasses of
ActivityInstrumentationTestCase2 to Espresso didn't compile. These
changes allow it to run successfully. Also removed obsolete section
describing using Espresso with ActivityInstrumentationTestCase2.
Bug:
27453733
Change-Id: Ib7c7e85d3299337f14be1482f7eb574c9a30dc22
Elliott Hughes [Fri, 7 Oct 2016 22:57:17 +0000 (15:57 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: I7180f1eb539ff8cbe33832d010775f053a922946
Joe Fernandez [Fri, 7 Oct 2016 22:40:02 +0000 (22:40 +0000)]
docs: add collections for Distribute Stories, Games and Apps
am:
d366709268
Change-Id: If58c868bd646995bf2e3303b5f3aa147a46516ae
Jordan Liu [Wed, 7 Sep 2016 19:01:24 +0000 (12:01 -0700)]
Add cdma_3waycall_flash_delay key to CarrierConfig
Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]
Bug:
29873049
(cherry picked from commit
bd3f2a7eb01b88d8e26deea4e4ef3e5ce423955c)
Change-Id: If3f658281e62d1c2669f862c6c3812a7437c6dce
Robert Sesek [Fri, 18 Mar 2016 20:52:57 +0000 (16:52 -0400)]
Split the zygote logic out of android.os.Process into a new ZygoteProcess class.
There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.
Bug:
21643067
(cherry picked from commit
94e824bc1b5f83024b7c9a228a8f2d0cd1347d11)
(cherry picked from commit
96b49848e7784bc4b40ffd01e2524461e1efcab7)
Change-Id: I2e12057e4c2e7567f909d699b487e70b1664cca8
Tobias Sargeant [Tue, 19 Jan 2016 16:34:54 +0000 (16:34 +0000)]
Refactor ZygoteInit to support a WebView-specific zygote.
This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.
* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.
Bug:
22084679
Bug:
21643067
(cherry picked from commit
ba816e0c9efd8cd2aeef618a819a2ad46b742f87)
(cherry picked from commit
b9679dc1fad508a001e30a941148e1bdc3fe953f)
Change-Id: Iefdb0784dd08ac09a23aafe18663c13dce421775
Joe Fernandez [Fri, 7 Oct 2016 21:11:49 +0000 (14:11 -0700)]
docs: add collections for Distribute Stories, Games and Apps
b/
31741249
Change-Id: I873ce82f18c5edbdeb85fb2fdb25ba322760a2dc
Mark Salyzyn [Fri, 7 Oct 2016 15:20:36 +0000 (15:20 +0000)]
Merge "jni: move security interfaces to private" am:
07bc1ee77d
am:
82df72dc1f
Change-Id: I63c71141a74cdfe55080492353f1bb2cc4e5e696
Mark Salyzyn [Fri, 7 Oct 2016 15:17:05 +0000 (15:17 +0000)]
Merge "jni: move security interfaces to private"
am:
07bc1ee77d
Change-Id: Ic46ceb9fce64a7db977013254622bc24b91f6f3e
Treehugger Robot [Fri, 7 Oct 2016 15:03:01 +0000 (15:03 +0000)]
Merge "jni: move security interfaces to private"
Todd Kennedy [Fri, 7 Oct 2016 14:29:07 +0000 (14:29 +0000)]
Merge "Force APKs to be streamed" into nyc-dev
am:
dd100f4298
Change-Id: Ic29843ba26e6bab7cd285cde30f7572af920090a
Todd Kennedy [Fri, 7 Oct 2016 14:29:04 +0000 (14:29 +0000)]
Force APKs to be streamed
am:
d220683d33
Change-Id: I17a44d4b985a08b565d8c287cfee573cacb0216c
TreeHugger Robot [Fri, 7 Oct 2016 14:21:26 +0000 (14:21 +0000)]
Merge "Force APKs to be streamed" into nyc-dev
Edward Savage-Jones [Fri, 7 Oct 2016 11:21:55 +0000 (11:21 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable" am:
708543b5ff
am:
d94cc68123
Change-Id: I69df9317467dc48fdd0c39081fcd5a9e65d72cc1
Edward Savage-Jones [Fri, 7 Oct 2016 11:17:49 +0000 (11:17 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable"
am:
708543b5ff
Change-Id: I2a95bd2a53f3ef73f63b6d955528cb16dbd4de10
Treehugger Robot [Fri, 7 Oct 2016 11:09:26 +0000 (11:09 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable"
Dimitry Ivanov [Fri, 7 Oct 2016 08:53:06 +0000 (08:53 +0000)]
Merge "Relax namespace restriction on system server classloader" am:
a8135325c1
am:
3c6b4961cb
Change-Id: I60ab1b74e82a11da485e30a7ea5e45e49c5498c9
Dimitry Ivanov [Fri, 7 Oct 2016 08:45:18 +0000 (08:45 +0000)]
Merge "Relax namespace restriction on system server classloader"
am:
a8135325c1
Change-Id: Ie6b5e9041c1a03a8a6b2343069ef2a37b9aba9aa
Dimitry Ivanov [Fri, 7 Oct 2016 08:34:41 +0000 (08:34 +0000)]
Merge "Relax namespace restriction on system server classloader"
Kevin Hufnagle [Wed, 25 May 2016 20:01:30 +0000 (13:01 -0700)]
cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file
settings within IAB.
The section titled "Adding a batch of items to a product list," found
within the "Administering In-app Billing" page on the DAC site, now
contains up-to-date descriptions of the different settings within the
CSV files used with product lists within the Google Play Developer
Console.
Bug:
28767053
Change-Id: I578aaacdaa866d9fbac8a087f22eb1c3617437ba
Andreas Gampe [Fri, 7 Oct 2016 00:51:45 +0000 (00:51 +0000)]
Merge "Debug: Add test for bug
31943543" am:
7c4efe421c
am:
afe73c0c3c
Change-Id: Ia72dda69495f732e2a4a8abcee679a3c6beabab4
Andreas Gampe [Fri, 7 Oct 2016 00:45:14 +0000 (00:45 +0000)]
Merge "Debug: Add test for bug
31943543"
am:
7c4efe421c
Change-Id: I4d1a78aa19473e29a121e20ec8c4e07dd202da89
Treehugger Robot [Fri, 7 Oct 2016 00:37:50 +0000 (00:37 +0000)]
Merge "Debug: Add test for bug
31943543"
Miao Wang [Thu, 6 Oct 2016 21:22:05 +0000 (21:22 +0000)]
Merge "Correctly pass number of input allocations for BLAS" am:
8d08d0fa83
am:
e443dd04b0
Change-Id: I4194799c54c065dd239a4f635af05d99e67a6996
Miao Wang [Thu, 6 Oct 2016 21:15:07 +0000 (21:15 +0000)]
Merge "Correctly pass number of input allocations for BLAS"
am:
8d08d0fa83
Change-Id: Ia2624e12f3122119814f082f24e02052a19ecd9c
Jakub Pawlowski [Thu, 6 Oct 2016 21:07:44 +0000 (21:07 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)" am:
44c013d739
am:
6fe3900791
Change-Id: I8e04aa89379c4a50031fade065c288fd1cc30668
Treehugger Robot [Thu, 6 Oct 2016 21:04:56 +0000 (21:04 +0000)]
Merge "Correctly pass number of input allocations for BLAS"
Jakub Pawlowski [Thu, 6 Oct 2016 21:00:51 +0000 (21:00 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)"
am:
44c013d739
Change-Id: I4cc9e7c960e51ec49fcaf3f16968afac7b6cc471
Jakub Pawlowski [Thu, 6 Oct 2016 20:54:07 +0000 (20:54 +0000)]
Merge "Fix connecting to profiles when bonding from local device (1/3)"
Andreas Gampe [Thu, 6 Oct 2016 20:49:52 +0000 (13:49 -0700)]
Debug: Add test for bug
31943543
Bug:
31943543
Test: adb shell setprop debug.checkjni 1 && runtest --path frameworks/base/core/tests/coretests/src/com/android/internal/os/DebugTest.java
Change-Id: I895f3f9927ed3572dc4e77b49d12cadd53ce5d6a
Peter Qiu [Thu, 6 Oct 2016 17:53:15 +0000 (17:53 +0000)]
Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am:
05d950ee3b
am:
c1beaa3424
Change-Id: I2eab4d515d9f879ecf7d8d6d78cce6c9b336786b
Miao Wang [Thu, 6 Oct 2016 17:45:42 +0000 (10:45 -0700)]
Correctly pass number of input allocations for BLAS
Bug:
31992305
Test: Build and CTS RsBlas test pass on Angler.
Change-Id: If49c0be003d9c2a2175924dc3303703b9ab49357
Peter Qiu [Thu, 6 Oct 2016 17:45:22 +0000 (17:45 +0000)]
Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"
am:
05d950ee3b
Change-Id: I8c7766d9c2d0ce6bcc761c5087b27a9c7acc1b51
Peter Qiu [Thu, 6 Oct 2016 17:39:19 +0000 (17:39 +0000)]
Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am:
0169a3b094
am:
5f03e24ef0
Change-Id: I9f2dc7cd4fe690de2a2b08dca56a8e72a15d44ec
Treehugger Robot [Thu, 6 Oct 2016 17:35:32 +0000 (17:35 +0000)]
Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"
Peter Qiu [Thu, 6 Oct 2016 17:32:51 +0000 (17:32 +0000)]
Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects"
am:
0169a3b094
Change-Id: I6e83e3a609daa1e77b0edf4ff1843c961ee54831
Treehugger Robot [Thu, 6 Oct 2016 17:21:44 +0000 (17:21 +0000)]
Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects"
Amanda Kassay [Thu, 6 Oct 2016 13:44:38 +0000 (13:44 +0000)]
Wear Preview, auto, tv, versions project metadata. b/
31771704 b/
31903798 b/
31773716
am:
fd6846e116
Change-Id: I37309b922b81bba3be86b4d6516d140b851a45de
Neil Fuller [Thu, 6 Oct 2016 08:43:42 +0000 (08:43 +0000)]
Merge "Remove .mk lines that are just setting the default" am:
8873c3821d
am:
6a3c315b25
Change-Id: I24bd59700cd8b362691115e725cbf11e6accdedc
Neil Fuller [Thu, 6 Oct 2016 08:37:54 +0000 (08:37 +0000)]
Merge "Remove .mk lines that are just setting the default"
am:
8873c3821d
Change-Id: Ic3a02567b2983da067cccc9ce38a2e29ef3834b6
Neil Fuller [Thu, 6 Oct 2016 08:31:33 +0000 (08:31 +0000)]
Merge "Remove .mk lines that are just setting the default"
Etan Cohen [Thu, 6 Oct 2016 04:55:16 +0000 (04:55 +0000)]
Merge "[NAN] Expose NAN characteristics as an API" am:
f12c6e4f5e
am:
b5d18a6b11
Change-Id: I4614dc5659753ee1bfc6276090a5d1d7e9b209a0
Etan Cohen [Thu, 6 Oct 2016 04:51:12 +0000 (04:51 +0000)]
Merge "[NAN] Expose NAN characteristics as an API"
am:
f12c6e4f5e
Change-Id: I842c7503eeb6d70c941e3097dae0207661cc906e
Etan Cohen [Thu, 6 Oct 2016 04:45:28 +0000 (04:45 +0000)]
Merge "[NAN] Expose NAN characteristics as an API"
Etan Cohen [Mon, 3 Oct 2016 22:14:51 +0000 (15:14 -0700)]
[NAN] Expose NAN characteristics as an API
Expose NAN characteristics as an API.
(cherry-pick of commit
3a9de10963d869fa8f721432ce12785de384c560)
Bug:
31912101
Test: build and validate API updates
Change-Id: If02942d738aab8fa2f2f47489c6840af1bc38280
Etan Cohen [Thu, 6 Oct 2016 02:16:08 +0000 (02:16 +0000)]
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am:
ee1e81ec5d
am:
c5101c52b6
Change-Id: Ib3d02752745845d4966965c98dac9d47e0551d6d
Etan Cohen [Thu, 6 Oct 2016 02:12:22 +0000 (02:12 +0000)]
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
am:
ee1e81ec5d
Change-Id: I606be878116457c91d3c036a4a0086207a5a6752
Etan Cohen [Thu, 6 Oct 2016 02:06:36 +0000 (02:06 +0000)]
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
Amanda Kassay [Wed, 5 Oct 2016 21:28:53 +0000 (17:28 -0400)]
Wear Preview, auto, tv, versions project metadata.
b/
31771704 b/
31903798 b/
31773716
Staged:
https://android-dot-devsite.googleplex.com/about/versions/nougat/index.html
https://android-dot-devsite.googleplex.com/index.html
https://android-dot-devsite.googleplex.com/wear/preview/index.html
Change-Id: I639b3d168b839745669787c56b44c28fa85252d9
Andreas Huber [Wed, 5 Oct 2016 22:29:42 +0000 (22:29 +0000)]
Merge "Start hw-binder threadpool on HwBinder.getService() call." am:
5d49f802a4
am:
553866e9c3
Change-Id: I75b87c424c65f207fd75c8b809913d624546cbfb
Andreas Huber [Wed, 5 Oct 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Start hw-binder threadpool on HwBinder.getService() call."
am:
5d49f802a4
Change-Id: I155ec0240f1ddce7b9128646378f18bfee153b86
Etan Cohen [Mon, 3 Oct 2016 22:42:11 +0000 (15:42 -0700)]
[NAN] Add COARSE_LOCATION permission check to NAN discovery
NAN discovery can expose location based on service signatures.
(cherry-pick of commit
e1d8a5a6fc3661f226afff3fde59a3eb2c06d718)
Bug:
31907534
Test: unit test + integrated (sl4a) testing
Change-Id: Iec0fae507dfdae65fe08ab6e2ddb89334c15def5
Andreas Huber [Wed, 5 Oct 2016 22:18:04 +0000 (22:18 +0000)]
Merge "Start hw-binder threadpool on HwBinder.getService() call."