OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
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

7 years agocherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings within...
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

7 years agoMerge "cherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file settings...
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

7 years agoDocs: Remove a reference to a deprecated sample
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

7 years agoDocs: Remove a reference to a deprecated sample
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

7 years agoMerge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp...
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

7 years agoRefactor ZygoteInit to support a WebView-specific zygote.
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

7 years agoMerge "Refactor ZygoteInit to support a WebView-specific zygote." into stage-aosp...
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

7 years agoMerge "Rely on the platform -std default." am: 66f15cc01b
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

7 years agoMerge "Rely on the platform -std default."
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

7 years agoMerge "Rely on the platform -std default."
Treehugger Robot [Sat, 8 Oct 2016 21:45:16 +0000 (21:45 +0000)]
Merge "Rely on the platform -std default."

7 years agoRely on the platform -std default.
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

7 years agodocs: add collections for Distribute Stories, Games and Apps
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

7 years agoRefactor ZygoteInit to support a WebView-specific zygote.
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

7 years agodocs: add collections for Distribute Stories, Games and Apps
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

7 years agoMerge "jni: move security interfaces to private" am: 07bc1ee77d
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

7 years agoMerge "jni: move security interfaces to private"
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

7 years agoMerge "jni: move security interfaces to private"
Treehugger Robot [Fri, 7 Oct 2016 15:03:01 +0000 (15:03 +0000)]
Merge "jni: move security interfaces to private"

7 years agoMerge "Force APKs to be streamed" into nyc-dev
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

7 years agoForce APKs to be streamed
Todd Kennedy [Fri, 7 Oct 2016 14:29:04 +0000 (14:29 +0000)]
Force APKs to be streamed
am: d220683d33

Change-Id: I17a44d4b985a08b565d8c287cfee573cacb0216c

7 years agoMerge "Force APKs to be streamed" into nyc-dev
TreeHugger Robot [Fri, 7 Oct 2016 14:21:26 +0000 (14:21 +0000)]
Merge "Force APKs to be streamed" into nyc-dev

7 years agoMerge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff
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

7 years agoMerge "Make PIN/password failed attempts dialog non-cancelable"
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

7 years agoMerge "Make PIN/password failed attempts dialog non-cancelable"
Treehugger Robot [Fri, 7 Oct 2016 11:09:26 +0000 (11:09 +0000)]
Merge "Make PIN/password failed attempts dialog non-cancelable"

7 years agoMerge "Relax namespace restriction on system server classloader" am: a8135325c1
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

7 years agoMerge "Relax namespace restriction on system server classloader"
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

7 years agoMerge "Relax namespace restriction on system server classloader"
Dimitry Ivanov [Fri, 7 Oct 2016 08:34:41 +0000 (08:34 +0000)]
Merge "Relax namespace restriction on system server classloader"

7 years agocherry-pick from mnc-io-docs: docs: Updated descriptions for CSV file
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

7 years agoMerge "Debug: Add test for bug 31943543" am: 7c4efe421c
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

7 years agoMerge "Debug: Add test for bug 31943543"
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

7 years agoMerge "Debug: Add test for bug 31943543"
Treehugger Robot [Fri, 7 Oct 2016 00:37:50 +0000 (00:37 +0000)]
Merge "Debug: Add test for bug 31943543"

7 years agoMerge "Correctly pass number of input allocations for BLAS" am: 8d08d0fa83
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

7 years agoMerge "Correctly pass number of input allocations for BLAS"
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

7 years agoMerge "Fix connecting to profiles when bonding from local device (1/3)" am: 44c013d739
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

7 years agoMerge "Correctly pass number of input allocations for BLAS"
Treehugger Robot [Thu, 6 Oct 2016 21:04:56 +0000 (21:04 +0000)]
Merge "Correctly pass number of input allocations for BLAS"

7 years agoMerge "Fix connecting to profiles when bonding from local device (1/3)"
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

7 years agoMerge "Fix connecting to profiles when bonding from local device (1/3)"
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)"

7 years agoDebug: Add test for bug 31943543
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

7 years agoMerge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates...
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

7 years agoCorrectly pass number of input allocations for BLAS
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

7 years agoMerge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"
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

7 years agoMerge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am: 0169a3b094
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

7 years agoMerge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"
Treehugger Robot [Thu, 6 Oct 2016 17:35:32 +0000 (17:35 +0000)]
Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"

7 years agoMerge "wifi: add ParcelUtil for parcelizing non-parcelable objects"
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

7 years agoMerge "wifi: add ParcelUtil for parcelizing non-parcelable objects"
Treehugger Robot [Thu, 6 Oct 2016 17:21:44 +0000 (17:21 +0000)]
Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects"

7 years agoWear Preview, auto, tv, versions project metadata. b/31771704 b/31903798 b/31773716
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

7 years agoMerge "Remove .mk lines that are just setting the default" am: 8873c3821d
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

7 years agoMerge "Remove .mk lines that are just setting the default"
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

7 years agoMerge "Remove .mk lines that are just setting the default"
Neil Fuller [Thu, 6 Oct 2016 08:31:33 +0000 (08:31 +0000)]
Merge "Remove .mk lines that are just setting the default"

7 years agoMerge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e
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

7 years agoMerge "[NAN] Expose NAN characteristics as an API"
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

7 years agoMerge "[NAN] Expose NAN characteristics as an API"
Etan Cohen [Thu, 6 Oct 2016 04:45:28 +0000 (04:45 +0000)]
Merge "[NAN] Expose NAN characteristics as an API"

7 years ago[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

7 years agoMerge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d
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

7 years agoMerge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
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

7 years agoMerge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
Etan Cohen [Thu, 6 Oct 2016 02:06:36 +0000 (02:06 +0000)]
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"

7 years agoWear Preview, auto, tv, versions project metadata.
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

7 years agoMerge "Start hw-binder threadpool on HwBinder.getService() call." am: 5d49f802a4
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

7 years agoMerge "Start hw-binder threadpool on HwBinder.getService() call."
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

7 years ago[NAN] Add COARSE_LOCATION permission check to NAN discovery
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

7 years agoMerge "Start hw-binder threadpool on HwBinder.getService() call."
Andreas Huber [Wed, 5 Oct 2016 22:18:04 +0000 (22:18 +0000)]
Merge "Start hw-binder threadpool on HwBinder.getService() call."

7 years agoMerge "Doc change: remove intl/nn from collections paths." into nyc-dev
Dirk Dougherty [Wed, 5 Oct 2016 18:47:28 +0000 (18:47 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev
am: 794e0d3578

Change-Id: Idf5272a3ccd1dab43d7b088893559f117d42ae0b

7 years agoDoc change: remove intl/nn from collections paths.
Dirk Dougherty [Wed, 5 Oct 2016 18:47:23 +0000 (18:47 +0000)]
Doc change: remove intl/nn from collections paths.
am: 240ddd735c

Change-Id: I7e3895dfb51856fabab3866cc2b6bbd91f798a88

7 years agoMerge "Doc change: remove intl/nn from collections paths." into nyc-dev
Dirk Dougherty [Wed, 5 Oct 2016 18:40:47 +0000 (18:40 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev

7 years agoStart hw-binder threadpool on HwBinder.getService() call.
Andreas Huber [Wed, 5 Oct 2016 18:10:26 +0000 (11:10 -0700)]
Start hw-binder threadpool on HwBinder.getService() call.

Bug: 31961648
Test: hidl_test_java
Change-Id: I6caf778ab78a875427a17e1758ab724836c8d34e

7 years agoMerge "Update preview-community redirect to point at +AD." into nyc-dev
Dirk Dougherty [Wed, 5 Oct 2016 17:02:27 +0000 (17:02 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev
am: 61d3faa52c

Change-Id: Ibcd0fdc336812e750808bf3a6a66f97199f9b3e8

7 years agoUpdate preview-community redirect to point at +AD.
Dirk Dougherty [Wed, 5 Oct 2016 17:02:23 +0000 (17:02 +0000)]
Update preview-community redirect to point at +AD.
am: 559013e711

Change-Id: Idcb0d323e4558a627a388330760eb52fa29b9d63

7 years agoMerge "Update preview-community redirect to point at +AD." into nyc-dev
Dirk Dougherty [Wed, 5 Oct 2016 16:52:36 +0000 (16:52 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev

7 years agoDoc change: remove intl/nn from collections paths.
Dirk Dougherty [Wed, 5 Oct 2016 16:40:02 +0000 (09:40 -0700)]
Doc change: remove intl/nn from collections paths.

Change-Id: I45c0322d39a54e2565401d11bdc56d7e8e555cd2

Bug-Id: 31940660

7 years agojni: move security interfaces to private
Mark Salyzyn [Tue, 4 Oct 2016 16:01:37 +0000 (09:01 -0700)]
jni: move security interfaces to private

Test: Compile & boot smoke
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I09328bda5d58138ad222f082bdd3688a97df5b35

7 years agoMake PIN/password failed attempts dialog non-cancelable
Edward Savage-Jones [Wed, 5 Oct 2016 08:29:02 +0000 (10:29 +0200)]
Make PIN/password failed attempts dialog non-cancelable

This commit makes it harder for a users pocket to trigger an MDM
remote wipe, by setting the warning dialog to noncancelable.

With this change the pocket would first need to tap on OK before
being able to attempt to enter a PIN. This mirrors the existing
behaviour of both PIN and PUK warning dialogs.

Test: manual - enable an MDM set to trigger a wipe of the device/user
on unsucessful unlock attempts. Then incorrectly enter your PIN until
the warning dialog appears.  The dialog should only be dismissable
by pressing the 'OK' button.

Change-Id: I4d86af555a5d8b226ceffa4711bd5e277db93f1e

7 years agoRemove .mk lines that are just setting the default
Neil Fuller [Wed, 5 Oct 2016 12:35:50 +0000 (13:35 +0100)]
Remove .mk lines that are just setting the default

1.8 is now the default unless targeting an old SDK.

Bug: 31944681
Test: make checkbuild
Change-Id: Ic8a50cfd332da8b84eb87207a3c2d2c9a9a58e99

7 years agoMerge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1
Etan Cohen [Wed, 5 Oct 2016 05:29:00 +0000 (05:29 +0000)]
Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1
am: 6619d5b545

Change-Id: Ied61c54b053a6ffe8ca9f14c43630d82f356dfa2

7 years agoMerge "[NAN] Use NAN capability information to validate configurations"
Etan Cohen [Wed, 5 Oct 2016 05:24:47 +0000 (05:24 +0000)]
Merge "[NAN] Use NAN capability information to validate configurations"
am: 141a2840e1

Change-Id: I247e246a2e74b7940eb9b8f30bc1bdbe14c30574

7 years agoMerge "[NAN] Use NAN capability information to validate configurations"
Etan Cohen [Wed, 5 Oct 2016 05:20:05 +0000 (05:20 +0000)]
Merge "[NAN] Use NAN capability information to validate configurations"

7 years agoMerge "Debug: Initialize local to false" am: 33d404efb0
Andreas Gampe [Wed, 5 Oct 2016 04:47:34 +0000 (04:47 +0000)]
Merge "Debug: Initialize local to false" am: 33d404efb0
am: 3327b49429

Change-Id: Ie60b97b1d3e97e1461953fe34ca3d181d323e315

7 years agoMerge "Debug: Initialize local to false"
Andreas Gampe [Wed, 5 Oct 2016 04:42:56 +0000 (04:42 +0000)]
Merge "Debug: Initialize local to false"
am: 33d404efb0

Change-Id: Ia6fdb36342a392d777da45f562d0173bdd4bebed

7 years agoMerge "Debug: Initialize local to false"
Treehugger Robot [Wed, 5 Oct 2016 04:34:57 +0000 (04:34 +0000)]
Merge "Debug: Initialize local to false"

7 years agoDebug: Initialize local to false
Andreas Gampe [Wed, 5 Oct 2016 01:06:42 +0000 (18:06 -0700)]
Debug: Initialize local to false

Ensure that a later read always sees a well-defined value.

Bug: 31943543
Test: m
Change-Id: I654f7896bf1c07a67911196f8906007955f00b85

7 years ago[NAN] Use NAN capability information to validate configurations
Etan Cohen [Mon, 3 Oct 2016 20:40:09 +0000 (13:40 -0700)]
[NAN] Use NAN capability information to validate configurations

Validate publish and subscribe configurations and message length using
the NAN configuration retrieved from the firmware.

(cherry-pick of commit 65eaa6d82170140b351d48342550a27c971d2a37)

Bug: 31912101
Test: unit tests
Change-Id: I0328cabf1aafb3f350c5fe38e6d03b0e002c693b

7 years agoMerge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad01
Jordan Liu [Tue, 4 Oct 2016 18:23:25 +0000 (18:23 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad01
am: 2b7118fcbf

Change-Id: I4ca39a58ed1d35eae4a0b8802c027cd0c4c271ee

7 years agoMerge "Remove config in frameworks/base" am: 529f8d7209
Jordan Liu [Tue, 4 Oct 2016 18:22:27 +0000 (18:22 +0000)]
Merge "Remove  config in frameworks/base" am: 529f8d7209
am: 32e1d7f6b4

Change-Id: I3016d18369640dfc7336106b2272f737113b133a

7 years agoMerge "Add editable_voicemail_number key to CarrierConfig"
Jordan Liu [Tue, 4 Oct 2016 18:17:25 +0000 (18:17 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig"
am: 25b64aad01

Change-Id: If3ac600a1dbb0dc0aba65af49d271b333b7e6368

7 years agoMerge "Remove config in frameworks/base"
Jordan Liu [Tue, 4 Oct 2016 18:16:30 +0000 (18:16 +0000)]
Merge "Remove  config in frameworks/base"
am: 529f8d7209

Change-Id: I20e8eef28b656fd60da84da00b9d9d566d3b340b

7 years agoMerge "Add editable_voicemail_number key to CarrierConfig"
Jordan Liu [Tue, 4 Oct 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig"

7 years agoMerge "Remove config in frameworks/base"
Jordan Liu [Tue, 4 Oct 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Remove  config in frameworks/base"

7 years agoFix connecting to profiles when bonding from local device (1/3)
Jakub Pawlowski [Wed, 20 Jul 2016 18:55:48 +0000 (11:55 -0700)]
Fix connecting to profiles when bonding from local device (1/3)

When bond is created from Bluetooth Settings, profiles gets properly
auto connected when services are discovered. If pairing is done from any
other app, i.e. NFC app, the bond is not being recognized as initiated
from local device, and profiles are not connected.

This patch makes sure that if bonding is initiated, no matter from which
app, it will cause proper profiles to connect.

Bug: 30211618
Change-Id: I71131f33eb5b9db2f5b4a8737b191d541bf1fd3d

7 years agowifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates
Peter Qiu [Fri, 30 Sep 2016 21:19:34 +0000 (14:19 -0700)]
wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates

Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: Ie013c0637e66fb970746ad8f80bca03515b72443

7 years agowifi: add ParcelUtil for parcelizing non-parcelable objects
Peter Qiu [Fri, 30 Sep 2016 18:24:38 +0000 (11:24 -0700)]
wifi: add ParcelUtil for parcelizing non-parcelable objects

This CL adds the support for X509Certificate and PrivateKey objects.

Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: I1416a2aeeb0dfdd4a562d1a3b578addf55deb4ab

7 years agoMerge "Fix window animation flash issue" am: 1a02a26838
Wale Ogunwale [Mon, 3 Oct 2016 23:24:56 +0000 (23:24 +0000)]
Merge "Fix window animation flash issue" am: 1a02a26838
am: bb5f6db56a

Change-Id: Iea47c85999a4584ba878761710a175d925d0809a

7 years agoMerge "Fix window animation flash issue"
Wale Ogunwale [Mon, 3 Oct 2016 23:20:52 +0000 (23:20 +0000)]
Merge "Fix window animation flash issue"
am: 1a02a26838

Change-Id: Ib68ce77146e653b95cec215e4a80aaa0fb106ad2

7 years agoMerge "Fix window animation flash issue"
Wale Ogunwale [Mon, 3 Oct 2016 23:14:34 +0000 (23:14 +0000)]
Merge "Fix window animation flash issue"

7 years agoDocs: Wear preview 3 - tweaks to gradle snippet
Bert McMeen [Mon, 3 Oct 2016 21:15:44 +0000 (21:15 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet
am: 70c6411a10

Change-Id: Ia167f04b40f1edf2cf4b95d2e1b56b3efa6b8a75

7 years agoDocs: Wear preview 3 - tweaks to gradle snippet
Bert McMeen [Mon, 3 Oct 2016 20:32:54 +0000 (13:32 -0700)]
Docs: Wear preview 3 - tweaks to gradle snippet

Bug: 31910705
Change-Id: Ia58ac7bec8e748a797c6213bbd31a05f876e2424

7 years agoMerge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584
Colin Cross [Mon, 3 Oct 2016 20:27:46 +0000 (20:27 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584
am: 6d0b466935

Change-Id: I9602684e0ac91f7c08dafe70309433bb233ceeaf

7 years agoMerge "Fix struct vs. class mismatch in forward definitions"
Colin Cross [Mon, 3 Oct 2016 20:23:40 +0000 (20:23 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am: 8f1011d584

Change-Id: I259197408884f11e61f61e5241ee0012de28b54f

7 years agoMerge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095
Adam Lesinski [Mon, 3 Oct 2016 20:21:46 +0000 (20:21 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095
am: f48d0b8f19

Change-Id: Ia7da9ff37d813729a8c916a3b6e378110045aa17

7 years agoMerge "[AssetManager]:Fix thread race caused double free issue."
Adam Lesinski [Mon, 3 Oct 2016 20:18:52 +0000 (20:18 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."
am: 126e022095

Change-Id: I9928064b4811579bd50d4eeaff98bd4200b8bc7b

7 years agoMerge "Fix struct vs. class mismatch in forward definitions"
Colin Cross [Mon, 3 Oct 2016 20:16:16 +0000 (20:16 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"

7 years agoMerge "[AssetManager]:Fix thread race caused double free issue."
Adam Lesinski [Mon, 3 Oct 2016 20:07:37 +0000 (20:07 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."