git.osdn.net Git - android-x86/frameworks-base.git/log

Tenghui Zhu [Thu, 6 Oct 2016 20:42:05 +0000 (20:42 +0000)]

Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev am: 99224b311c
am: 3445b58a6d

Change-Id: I81a5d603b4f6608c5cf0b03f965b4796071982c6

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 6 Oct 2016 20:41:01 +0000 (20:41 +0000)]

Update JavaDoc about animatable on VectorDrawable am: bb12929470
am: 8bf7fd89e7

Change-Id: I2fcb755d5d36f6268c98e985e23bdf886e7a5e0a

commit | commitdiff | tree

Adam Lesinski [Thu, 6 Oct 2016 20:40:09 +0000 (20:40 +0000)]

Merge "Fix thread race caused double free issue." into nyc-mr1-dev am: 68ec3695d0
am: a2b5c8a912

Change-Id: I9ceebadf59e2355d2cf4e101fbe67a8de54ccf99

commit | commitdiff | tree

songjinshi [Thu, 6 Oct 2016 20:39:10 +0000 (20:39 +0000)]

Fix thread race caused double free issue. am: 5754b41c20
am: 09901f3bc9

Change-Id: Ied71f524dcb24439e121598beaec59029474cc4d

commit | commitdiff | tree

Bert McMeen [Thu, 6 Oct 2016 20:38:16 +0000 (20:38 +0000)]

Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10 am: 19404c6f93 am: 20cf00152d
am: c9956e2ea8

Change-Id: Ie05921c5492319d5d9c37ea22247ce1eae2d65cb

commit | commitdiff | tree

Chris Tate [Thu, 6 Oct 2016 20:37:19 +0000 (20:37 +0000)]

Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev am: ee28c8c22c
am: d8e73720f6

Change-Id: I7a87357cbfe67ffbcd7cd6d9c5cf2a26250fb755

commit | commitdiff | tree

Christopher Tate [Thu, 6 Oct 2016 20:36:26 +0000 (20:36 +0000)]

Explicitly close FD binder parameters in backup/restore API calls am: 91bb0e5cca
am: 3fa99a6d11

Change-Id: I4789534da734abbce9ec52fcbe9a754bd7bd9fa0

commit | commitdiff | tree

Phil Weaver [Thu, 6 Oct 2016 20:35:28 +0000 (20:35 +0000)]

Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev am: 8051c9222e
am: b88b084684

Change-Id: I952386834e47d2ec70055aa6223f6243ae16b365

commit | commitdiff | tree

Phil Weaver [Thu, 6 Oct 2016 20:34:32 +0000 (20:34 +0000)]

Make magnification ignore invisible wallpaper. am: 473af05b82
am: 2de5ca2c65

Change-Id: I44e46afdec4da4e40cfd3d3d8262edb3156fb291

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 20:31:28 +0000 (20:31 +0000)]

Merge "Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev am: c26c98cd4a
am: c361eb7c85

Change-Id: Ia024c0a762f6fbfc7079ab35f500c8b1eef98fe6

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 20:30:36 +0000 (20:30 +0000)]

Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service am: eb909e3cda
am: 86e1f6f3e1

Change-Id: I1523c302115b0e8d1487f81feb125d393cbf6b3c

commit | commitdiff | tree

Jim Miller [Thu, 6 Oct 2016 20:26:20 +0000 (20:26 +0000)]

Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev am: bf79852ae4
am: aa3e039ad7

Change-Id: I0891cf27dbe49ba18584e913d6a75b9223c10de4

commit | commitdiff | tree

Jim Miller [Thu, 6 Oct 2016 20:25:19 +0000 (20:25 +0000)]

Add metrics logging for critical fingerprintd errors am: c57c8d934c
am: 71558c252b

Change-Id: I9eb3c9e7e8f0509a4e5c666d356388a1b272e710

commit | commitdiff | tree

Adarsh Fernando [Thu, 6 Oct 2016 20:24:14 +0000 (20:24 +0000)]

Docs: Redirect for Android Studio IR Flight Recorder am: 1face37061 am: 5fe735fe2c am: bce10d350d
am: 5e9c44497e

Change-Id: I02f7c8d2cf5b1c13e91fdd576edc7fe93bad827d

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:23:14 +0000 (20:23 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b8e046a8a2 -s ours
am: 2f09527ec4 -s ours

Change-Id: Ia559a0124045302ccde7de2b65143ceb0769bcd7

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:22:23 +0000 (20:22 +0000)]

Import translations. DO NOT MERGE am: 53edc8f204 -s ours
am: 1a7f727ffe -s ours

Change-Id: I29f80185040eacb12c6b236c1a16aa8aaa047ed4

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:21:21 +0000 (20:21 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a381e699e0 -s ours
am: a51780e388 -s ours

Change-Id: I0aac0984657ea5ed22b53e5801b4578594f7c449

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:20:27 +0000 (20:20 +0000)]

Import translations. DO NOT MERGE am: 453f915f94 -s ours
am: 094adbf23d -s ours

Change-Id: Ie910b9568c58f579112e6ba8e08a9ff71b8cc1c4

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:19:37 +0000 (20:19 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8990b8c29c -s ours
am: 8ca1fcdeb7 -s ours

Change-Id: Ifae46ed2bfd502ae02718f33b14444525c91dc89

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:18:41 +0000 (20:18 +0000)]

Import translations. DO NOT MERGE am: d2671e488d -s ours
am: d6f07c492c -s ours

Change-Id: I11003e9aef0af3c40cfe47ff2a78f6853c0edb99

commit | commitdiff | tree

Tenghui Zhu [Thu, 6 Oct 2016 20:14:28 +0000 (20:14 +0000)]

Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev
am: 99224b311c

Change-Id: If59f1d136a96dbfb83311f99f7e08dff8927e72d

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 6 Oct 2016 20:14:23 +0000 (20:14 +0000)]

Update JavaDoc about animatable on VectorDrawable
am: bb12929470

Change-Id: I476d1416b0f734fbc87895c22de3e95efdbf25b9

commit | commitdiff | tree

Hemal Patel [Thu, 6 Oct 2016 20:13:41 +0000 (20:13 +0000)]

Merge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3 am: 14557acbfc am: d7ef4228e2
am: 8ae777d632

Change-Id: I64c3bd8c7c8c2c5e8e91383ffd0bf2b4ed5e6b7c

commit | commitdiff | tree

Adam Lesinski [Thu, 6 Oct 2016 20:13:05 +0000 (20:13 +0000)]

Merge "Fix thread race caused double free issue." into nyc-mr1-dev
am: 68ec3695d0

Change-Id: I7b13469b249e5a159e3be9d1ee264f2616ebcd22

commit | commitdiff | tree

songjinshi [Thu, 6 Oct 2016 20:13:00 +0000 (20:13 +0000)]

Fix thread race caused double free issue.
am: 5754b41c20

Change-Id: Ic9dd6e9c6d216753d997da99158816682d5464d1

commit | commitdiff | tree

Hemal Patel [Thu, 6 Oct 2016 20:12:39 +0000 (20:12 +0000)]

Docs: Fixed the Service link am: 1918214589 am: eb21088b67 am: 63b5e3ddd1
am: 435e8d8921

Change-Id: Ibd3d658f9375b711a35442b7800c223c0b6dc010

commit | commitdiff | tree

Bert McMeen [Thu, 6 Oct 2016 20:12:08 +0000 (20:12 +0000)]

Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10 am: 19404c6f93
am: 20cf00152d

Change-Id: I55a7ee1cb4716de818d125bd168820838d323a17

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 20:11:42 +0000 (20:11 +0000)]

Merge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev am: fee635cc28
am: 6695d876ca

Change-Id: I2b1f9d57f6b754e517950d7faa373a182813fb6f

commit | commitdiff | tree

Chris Tate [Thu, 6 Oct 2016 20:11:01 +0000 (20:11 +0000)]

Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev
am: ee28c8c22c

Change-Id: I51884bab34d7e0bd33e19c8cdfd780572880f96f

commit | commitdiff | tree

Christopher Tate [Thu, 6 Oct 2016 20:10:56 +0000 (20:10 +0000)]

Explicitly close FD binder parameters in backup/restore API calls
am: 91bb0e5cca

Change-Id: Ibdba35d9c4e17180a7593966b4d54d6fb9c03f02

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 20:10:38 +0000 (20:10 +0000)]

Implement untetherAll as calls to stopTethering am: fa6a486615
am: 715a2142aa

Change-Id: I45f63ffee26ca9b935cdbfb107ebf4d28f362acd

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 20:09:43 +0000 (20:09 +0000)]

Merge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev am: a6afc56f94
am: f42c660ddd

Change-Id: I64f32a690fb7a4209abcc619c28b0d331f96add1

commit | commitdiff | tree

Phil Weaver [Thu, 6 Oct 2016 20:09:42 +0000 (20:09 +0000)]

Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev
am: 8051c9222e

Change-Id: I4d4338d71140773df82f89c4fa67dcf8ee004d4c

commit | commitdiff | tree

Phil Weaver [Thu, 6 Oct 2016 20:09:37 +0000 (20:09 +0000)]

Make magnification ignore invisible wallpaper.
am: 473af05b82

Change-Id: Ie40d7eda7b36d8613e1dd035d9446c4239e20193

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 20:08:44 +0000 (20:08 +0000)]

Notify NetworkPolicyManagerService on tethering changes am: deebfec90b
am: 5ca9c569c3

Change-Id: Ic1b99f8bbeffde72dd93d4879aa25954d0d98554

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 20:07:57 +0000 (20:07 +0000)]

Merge "Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev
am: c26c98cd4a

Change-Id: I0024a7927ec686fd147ce5a1a477eb85c50e19a7

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 20:07:41 +0000 (20:07 +0000)]

Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service
am: eb909e3cda

Change-Id: Ibbc6447d97c54b7393e557a831f0767edaea9b40

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 20:07:02 +0000 (20:07 +0000)]

Merge "Do not access MTP devices when disabled." into nyc-mr1-dev am: a40092d6d2
am: d22a1d66d8

Change-Id: I5669f78107fba42ee1d332d504b4c077c39bba2c

commit | commitdiff | tree

Jim Miller [Thu, 6 Oct 2016 20:06:21 +0000 (20:06 +0000)]

Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev
am: bf79852ae4

Change-Id: I30f7db6cb9cd4cbb166402e0778591574cac27da

commit | commitdiff | tree

Jim Miller [Thu, 6 Oct 2016 20:06:16 +0000 (20:06 +0000)]

Add metrics logging for critical fingerprintd errors
am: c57c8d934c

Change-Id: I7da4ef8b31bced6330656b2d4555d8e179ed4ddf

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 20:05:48 +0000 (20:05 +0000)]

Do not access MTP devices when disabled. am: 5201f1e61c
am: c950703424

Change-Id: I9fdf980a9f60ae97eab64019b6f8e7f5b0e67e2b

commit | commitdiff | tree

Adarsh Fernando [Thu, 6 Oct 2016 20:05:26 +0000 (20:05 +0000)]

Docs: Redirect for Android Studio IR Flight Recorder am: 1face37061 am: 5fe735fe2c
am: bce10d350d

Change-Id: I370104a076b8382a353065201fc0603b08081229

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 20:04:43 +0000 (20:04 +0000)]

Merge "Work on issue #29422027: APR: Runtime restarts in system_server" into nyc-mr1-dev am: 531c0237fc
am: 726c7a5200

Change-Id: I4408669b6d4a618f595a254cd80ba6e849dc795d

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:04:09 +0000 (20:04 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b8e046a8a2 -s ours

Change-Id: I7a06f41a928e47341a0767a0c65d2c45af6ddef6

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:04:06 +0000 (20:04 +0000)]

Import translations. DO NOT MERGE
am: 53edc8f204 -s ours

Change-Id: Ibc030ab4cd2881cfe500ce7be8b7477b7a352e2d

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:02:51 +0000 (20:02 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: a381e699e0 -s ours

Change-Id: Ia7869d0fcde0a98cb706ac10836bad8d02f54272

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:02:48 +0000 (20:02 +0000)]

Import translations. DO NOT MERGE
am: 453f915f94 -s ours

Change-Id: Ibc356ceb2016c7a7c6abfccb5db7b3bcdc11d2ee

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:01:33 +0000 (20:01 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8990b8c29c -s ours

Change-Id: Iad921d79917548c8f38f68b78a6b09c84eff0cec

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 20:01:30 +0000 (20:01 +0000)]

Import translations. DO NOT MERGE
am: d2671e488d -s ours

Change-Id: I0b6000ab626e0aba864bb9b5ec182c338fba6de3

commit | commitdiff | tree

Hemal Patel [Thu, 6 Oct 2016 20:00:46 +0000 (20:00 +0000)]

Merge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3 am: 14557acbfc
am: d7ef4228e2

Change-Id: I70f2cbd4333eacbf239183b845816b8e3fb1150b

commit | commitdiff | tree

Hemal Patel [Thu, 6 Oct 2016 19:59:53 +0000 (19:59 +0000)]

Docs: Fixed the Service link am: 1918214589 am: eb21088b67
am: 63b5e3ddd1

Change-Id: I1b1d34bb84a66c35268a7db754e5465b4c2b8d30

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:58:38 +0000 (19:58 +0000)]

Merge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev
am: fee635cc28

Change-Id: Id16b45b6340d9018ecf90f066b65574a02735c33

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:58:33 +0000 (19:58 +0000)]

Implement untetherAll as calls to stopTethering
am: fa6a486615

Change-Id: I20abc6e267bf38208e9f76f173a9fb584749c4f5

commit | commitdiff | tree

Nimrod Gileadi [Thu, 6 Oct 2016 19:58:09 +0000 (19:58 +0000)]

resolve merge conflicts of 448489a to cw-f-dev
am: f2122f5f96

Change-Id: I9e8069d3e74399ed5c47da3b7a74a5c70702c0a8

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:57:19 +0000 (19:57 +0000)]

Merge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev
am: a6afc56f94

Change-Id: I1f67dc626f9f84894b1696c308a546f7f103b891

commit | commitdiff | tree

Christopher Wiley [Thu, 6 Oct 2016 19:57:15 +0000 (19:57 +0000)]

Notify NetworkPolicyManagerService on tethering changes
am: deebfec90b

Change-Id: I43b25305c730966da83acdaccb127c27be0e2332

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 19:55:48 +0000 (19:55 +0000)]

Merge "Do not access MTP devices when disabled." into nyc-mr1-dev
am: a40092d6d2

Change-Id: Ic036b736f9368ef4fc207f16a8e2c23feef77305

commit | commitdiff | tree

Philip P. Moltmann [Thu, 6 Oct 2016 19:55:28 +0000 (19:55 +0000)]

Do not access MTP devices when disabled.
am: 5201f1e61c

Change-Id: I9aa036678f2677054666b137533e61eaeac88159

commit | commitdiff | tree

Dianne Hackborn [Thu, 6 Oct 2016 19:54:30 +0000 (19:54 +0000)]

Merge "Work on issue #29422027: APR: Runtime restarts in system_server" into nyc-mr1-dev
am: 531c0237fc

Change-Id: Idbf5ea191fa9ccdacad76f5c3951b31ccb203b6a

commit | commitdiff | tree

Nimrod Gileadi [Thu, 6 Oct 2016 18:25:11 +0000 (19:25 +0100)]

resolve merge conflicts of 448489a to cw-f-dev

Change-Id: Idaff9ccaf74bf0ec82c6346eb383295b508c7324

commit | commitdiff | tree

Peter Qiu [Thu, 6 Oct 2016 17:58:25 +0000 (17:58 +0000)]

Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am: 05d950ee3b am: c1beaa3424
am: 9515f91d9e

Change-Id: Ie62a95760cefb678a5c53c9c394ee80e226563eb

commit | commitdiff | tree

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

commit | commitdiff | tree

Peter Qiu [Thu, 6 Oct 2016 17:45:25 +0000 (17:45 +0000)]

Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am: 0169a3b094 am: 5f03e24ef0
am: dfd9e7637e

Change-Id: I7f8439ef2659288c17df867f97a8185ad7b2db0d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Oct 2016 17:35:32 +0000 (17:35 +0000)]

Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates"

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Oct 2016 17:21:44 +0000 (17:21 +0000)]

Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects"

commit | commitdiff | tree

Tucker Sylvestro [Thu, 6 Oct 2016 16:13:55 +0000 (16:13 +0000)]

Merge "Add the onDeviceOffBody API method to KeyStore" into cw-f-dev
am: f0b51e9db7

Change-Id: Ied0cba84862423875e5cb5990057f31409a86548

commit | commitdiff | tree

Tucker Sylvestro [Thu, 6 Oct 2016 16:13:48 +0000 (16:13 +0000)]

Add the onDeviceOffBody API method to KeyStore
am: b32aae2a46

Change-Id: Idbf7f1d505b1d446a3d648dcf1b0f334a629110a

commit | commitdiff | tree

Tucker Sylvestro [Thu, 6 Oct 2016 16:08:41 +0000 (16:08 +0000)]

Merge "Add the onDeviceOffBody API method to KeyStore" into cw-f-dev

commit | commitdiff | tree

Amanda Kassay [Thu, 6 Oct 2016 13:51:05 +0000 (13:51 +0000)]

Wear Preview, auto, tv, versions project metadata. b/31771704 b/31903798 b/31773716 am: fd6846e116
am: 62a1078b82

Change-Id: I1670a1d64a4f5f5bd100b4785a4b8ad1590d62c3

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 09:40:25 +0000 (09:40 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 6cffa2bf95 -s ours

Change-Id: I138bd5f7114a952632587b5c6089e153c9cd4ea2

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 09:40:20 +0000 (09:40 +0000)]

Import translations. DO NOT MERGE
am: ac7dd9a101 -s ours

Change-Id: Ibb296699e4f333586b7637ee7feb31da127e3c96

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 09:38:54 +0000 (09:38 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 84bf8e0122 -s ours

Change-Id: I60aeba1caa5fc32622472cf22f09c24d909fcf07

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 09:38:51 +0000 (09:38 +0000)]

Import translations. DO NOT MERGE
am: a8afcaf508 -s ours

Change-Id: I2a609b8a5e1076798d68761d806486cf13f75391

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Oct 2016 09:34:47 +0000 (09:34 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Oct 2016 09:34:10 +0000 (09:34 +0000)]

Merge "Import translations. DO NOT MERGE" into cw-f-dev

commit | commitdiff | tree

Neil Fuller [Thu, 6 Oct 2016 08:49:37 +0000 (08:49 +0000)]

Merge "Remove .mk lines that are just setting the default" am: 8873c3821d am: 6a3c315b25
am: c611842e1c

Change-Id: Ib71490ac084c706b53ae83278f3f8fcd302fc0f2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Thu, 6 Oct 2016 08:31:33 +0000 (08:31 +0000)]

Merge "Remove .mk lines that are just setting the default"

commit | commitdiff | tree

Etan Cohen [Thu, 6 Oct 2016 04:59:23 +0000 (04:59 +0000)]

Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11
am: 84b7932077

Change-Id: I3b7366e623b8b97b57bd73fdd618033f79225a5e

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Thu, 6 Oct 2016 04:45:28 +0000 (04:45 +0000)]

Merge "[NAN] Expose NAN characteristics as an API"

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Thu, 6 Oct 2016 02:21:04 +0000 (02:21 +0000)]

Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6
am: 97b3d99577

Change-Id: Ie9eeeb5b5a898a8b147628d8aacf1e365fa6e91a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Thu, 6 Oct 2016 02:06:36 +0000 (02:06 +0000)]

Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 01:21:21 +0000 (18:21 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic724c8be4da50b16d7550e8c378262e50897ff67
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Thu, 6 Oct 2016 01:13:10 +0000 (18:13 -0700)]

Import translations. DO NOT MERGE

Change-Id: I56b24b53ea2a6fce620699eacfcd152e4fd2558c
Auto-generated-cl: translation import

commit | commitdiff | tree

Erik Wolsheimer [Wed, 5 Oct 2016 22:46:12 +0000 (22:46 +0000)]

Do not listen for clock ticks, time changes, timezone changes, or time format changes when TextClock is not visible
am: e12cd3bb3b

Change-Id: I4ce1dcc5184f8cf03904a19631b9efe4be1b47fa

commit | commitdiff | tree

Andreas Huber [Wed, 5 Oct 2016 22:35:11 +0000 (22:35 +0000)]

Merge "Start hw-binder threadpool on HwBinder.getService() call." am: 5d49f802a4 am: 553866e9c3
am: d7dc327bc1

Change-Id: I2544d226f095865fd0ef5b8c2b39b94ca6bee5c1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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