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

Bill Yi [Mon, 3 Apr 2017 02:25:51 +0000 (02:25 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8f59f867f9 -s ours
am: 14f8818989 -s ours

Change-Id: I6e42ae3f5cf5a704b1f3c350af378bd178ac6714

commit | commitdiff | tree

Bill Yi [Mon, 3 Apr 2017 02:18:48 +0000 (02:18 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 8f59f867f9 -s ours

Change-Id: Ief3fa9c34e3a1959e193d35cea0b0ace7168411e

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 02:11:39 +0000 (02:11 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Roozbeh Pournader [Mon, 3 Apr 2017 00:27:42 +0000 (00:27 +0000)]

Merge "Override bidi property of new emojis" into oc-dev
am: 21a5edcc24

Change-Id: Ie37451b8234f1e5c06bb20f1c26e8f832006f3e3

commit | commitdiff | tree

TreeHugger Robot [Mon, 3 Apr 2017 00:21:50 +0000 (00:21 +0000)]

Merge "Override bidi property of new emojis" into oc-dev

commit | commitdiff | tree

Hugo Benichi [Mon, 3 Apr 2017 00:00:19 +0000 (00:00 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps" am: db104b2367 am: 146914c0d5
am: bf1b181c63

Change-Id: Id4c980a2a1ef7f51b6a06c7c8636160437e99b84

commit | commitdiff | tree

Hugo Benichi [Sun, 2 Apr 2017 23:53:46 +0000 (23:53 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps" am: db104b2367
am: 146914c0d5

Change-Id: I4d0430a6a5b3a1f97cdc4cf9590e5b0a798ae04f

commit | commitdiff | tree

Hugo Benichi [Sun, 2 Apr 2017 23:47:15 +0000 (23:47 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps"
am: db104b2367

Change-Id: If08e0088ab25f1494aaf3a339a38e7a8e343d910

commit | commitdiff | tree

Hugo Benichi [Sun, 2 Apr 2017 23:40:25 +0000 (23:40 +0000)]

Merge "ConnectivityService: log wakelock activity in dumps"

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:17:29 +0000 (09:17 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2c697884a3 -s ours
am: d6cbc60edc -s ours

Change-Id: I6d4593dd6e87a4da1518ee4ef397b3872c58660e

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:16:19 +0000 (09:16 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: bcd194eb04 -s ours
am: 4448f63145 -s ours

Change-Id: I44a2fcad7ce27350d110263ce2083b489bb47762

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:15:09 +0000 (09:15 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1058478d5b -s ours
am: c29576d8ab -s ours

Change-Id: I6be632590f27cfa2beefe42b4fb597a76a479cb1

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:13:59 +0000 (09:13 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 69dd99c741 -s ours
am: 932a818776 -s ours

Change-Id: I69cc4dc851739b9d09bd82790c0a9202922a5a28

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:12:51 +0000 (09:12 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e1a2ddeee8 -s ours
am: 11a1d54f70 -s ours

Change-Id: Ifd5eccfa888ab90d240fe7a56adbb6dd12cfc7f5

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:07:28 +0000 (09:07 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 45d02673c5 -s ours
am: 6139220455 -s ours

Change-Id: Idfb1bf95e80395e1739a63843a09ea6a37287dbf

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:06:23 +0000 (09:06 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2c697884a3 -s ours

Change-Id: I2e43884e9fda71b912361b12c5d26873ccd92953

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:06:15 +0000 (09:06 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ae1e284380 -s ours
am: d81d46b334 -s ours

Change-Id: Ifb3d5693ccd59babe6855ce13ce018e489cb9f89

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:05:11 +0000 (09:05 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: bcd194eb04 -s ours

Change-Id: Ide3209a7be2b5f32cced831c4bfb0f4ae8e1b278

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:05:04 +0000 (09:05 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0bbfc26ecb -s ours
am: f83dc01d39 -s ours

Change-Id: Ibd10986f74a2da231ebb892985e2fba6fecf6312

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:04:04 +0000 (09:04 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1058478d5b -s ours

Change-Id: Ie6758133479cfb44940dc63719595362d407c61e

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:02:57 +0000 (09:02 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 69dd99c741 -s ours

Change-Id: I1eb25a2afadf68bd8a44195debb4846bca36d193

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:01:34 +0000 (09:01 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e1a2ddeee8 -s ours

Change-Id: Ic3d74dd044e7da852eeea96744c209d3741a00d5

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 09:00:22 +0000 (09:00 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 45d02673c5 -s ours

Change-Id: I251062605b0d0a5ea912a510cac39ab6326f6496

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:59:14 +0000 (08:59 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f13c6c2a4c -s ours
am: 4fd00b9756 -s ours

Change-Id: Ia7246f6e66ba1e7931aa7dd88f65408e9c3973f8

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:59:11 +0000 (08:59 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ae1e284380 -s ours

Change-Id: Ibb55ea97617f1b4cff17fe66f1ff6bc1b185e4e4

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:58:03 +0000 (08:58 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 89a5b41395 -s ours
am: bb625889e4 -s ours

Change-Id: I0f9a0ed253b77f134522533f5589ba053584888e

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:57:59 +0000 (08:57 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0bbfc26ecb -s ours

Change-Id: I8e14e844175e9d54e1249756a03b4470226a4d39

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:54:42 +0000 (08:54 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4bac557350 -s ours
am: afb631bbd3 -s ours

Change-Id: Ia69bc259d19b21b2099c6e239a93f2b64e72b626

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:54:36 +0000 (08:54 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f13c6c2a4c -s ours

Change-Id: Ic6c474944a6a0a6b0a1a301f3ccd4a8e891ff073

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:53:21 +0000 (08:53 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 68a2d1d674 -s ours
am: 4bdc34e8d7 -s ours

Change-Id: If26b5c46f00ed9e862652692e3206184c32e8989

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:53:18 +0000 (08:53 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 89a5b41395 -s ours

Change-Id: I83d95004dbb353c6b6657091845ea02358ce10bb

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:47:56 +0000 (08:47 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 4bac557350 -s ours

Change-Id: Id582294a639c1037f1f87b4f04ae2d79061e5e57

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:47:36 +0000 (08:47 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 08:46:47 +0000 (08:46 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 68a2d1d674 -s ours

Change-Id: I215a2d1fdcb8654739221d9b00457c9584728e17

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:44:19 +0000 (08:44 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:43:33 +0000 (08:43 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:42:52 +0000 (08:42 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:42:10 +0000 (08:42 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:41:34 +0000 (08:41 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:41:04 +0000 (08:41 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:39:42 +0000 (08:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:39:13 +0000 (08:39 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:38:44 +0000 (08:38 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:38:19 +0000 (08:38 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 08:36:16 +0000 (08:36 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 06:06:04 +0000 (23:06 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Id8d5a50ec7d04eb45dd55d333a178b9a214d05d5

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 06:02:20 +0000 (23:02 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I967ca7ee9e12c4bc83e8bd4bcf9eec0cce0ed031

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 05:30:30 +0000 (22:30 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I896e874391b7951f14ccb3138c21399d4dd0a6e6

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 05:26:48 +0000 (22:26 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I8fe57933ecbc106945b72f306cd10346e4b754a9

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 05:23:03 +0000 (22:23 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6b319f5bbeccf3aeb0b8e68279add98a03389dea

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 05:19:25 +0000 (22:19 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ib67a94c0268dbfcf32025179010422410b19157e

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 05:10:25 +0000 (22:10 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: Ic79825620336a148791f1d88e8744a8dff669b2c

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 05:03:48 +0000 (22:03 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I7b31b10f7d84ab10587b50e6a3d1831a3e71886b

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:59:53 +0000 (21:59 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I87e870cdcec90e173ab587cc65afb8841e9a6411

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:56:25 +0000 (21:56 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I811c247c477f0e53e060d721b7d9b9ba954f3c8b

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:52:56 +0000 (21:52 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I6c846a034570454310571a442fb55eec8295139b

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:49:26 +0000 (21:49 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3732af38b0e535528297ee18e772afd087a4c9c6

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:45:35 +0000 (21:45 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I4afbbdb8355c77f409d59a2ad77430ca73e49ca3

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:12:03 +0000 (04:12 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0ec174802b -s ours
am: a6b312c336 -s ours

Change-Id: I571276a308b3ca0a214182417ca99c91fd013ead

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:06:46 +0000 (04:06 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 0ec174802b -s ours

Change-Id: If10833b148ed1988bc7ff7731fe615e58c86d6c0

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:06:33 +0000 (04:06 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ba09ef4367 -s ours
am: e4dc563787 -s ours

Change-Id: If6792261428def8d09e0a6b92d4522ea011cf996

commit | commitdiff | tree

Bill Yi [Sun, 2 Apr 2017 04:01:12 +0000 (04:01 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: ba09ef4367 -s ours

Change-Id: I3fcc1bfebb680e4f53230cc9be60b7ca4f3bacb8

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 04:00:42 +0000 (04:00 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

TreeHugger Robot [Sun, 2 Apr 2017 03:56:26 +0000 (03:56 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master

commit | commitdiff | tree

nharold [Sun, 2 Apr 2017 00:35:08 +0000 (00:35 +0000)]

Merge changes from topic 'ipsec-transport-impl' am: 464dc5c07e am: f983d89083
am: 8108bef16d

Change-Id: Ie820478fc01f42b5143a63a3422380ce7ec74847

commit | commitdiff | tree

Nathan Harold [Sun, 2 Apr 2017 00:33:17 +0000 (00:33 +0000)]

IpSecManager and IpSecTransform API Cleanup am: 48b566557d am: 5eaf5393a5
am: 37f260f5d8

Change-Id: Ie84a720356466000930030de6f7a9182500afadb

commit | commitdiff | tree

nharold [Sun, 2 Apr 2017 00:27:38 +0000 (00:27 +0000)]

Merge changes from topic 'ipsec-transport-impl' am: 464dc5c07e
am: f983d89083

Change-Id: Ifbee28deb7bee43532b923193cade15dad4ee5b9

commit | commitdiff | tree

Nathan Harold [Sun, 2 Apr 2017 00:26:41 +0000 (00:26 +0000)]

IpSecManager and IpSecTransform API Cleanup am: 48b566557d
am: 5eaf5393a5

Change-Id: I30390e7341265cee055b38ba621f050e8be71f7e

commit | commitdiff | tree

nharold [Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)]

Merge changes from topic 'ipsec-transport-impl'
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f

commit | commitdiff | tree

Nathan Harold [Sun, 2 Apr 2017 00:18:42 +0000 (00:18 +0000)]

IpSecManager and IpSecTransform API Cleanup
am: 48b566557d

Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d

commit | commitdiff | tree

nharold [Sun, 2 Apr 2017 00:10:33 +0000 (00:10 +0000)]

Merge changes from topic 'ipsec-transport-impl'

* changes:
Add Initial IPsec APIs to IpSecService
IpSecManager and IpSecTransform API Cleanup

commit | commitdiff | tree

Bill Yi [Sat, 1 Apr 2017 23:18:41 +0000 (16:18 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I3213f09cb1ad99844c7d745b14ccbbc1f0b4c05f

commit | commitdiff | tree

Bill Yi [Sat, 1 Apr 2017 23:11:07 +0000 (16:11 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 36832302
Change-Id: I61b5291fe0b6b1e6c421756adac398e76566ca5f

commit | commitdiff | tree

Chris Wren [Sat, 1 Apr 2017 16:23:25 +0000 (16:23 +0000)]

Merge "move network notification IDs to central registry" into oc-dev
am: fb54aee325

Change-Id: I0abcea4b9fe43e5c08885413e0f9a419b87b7206

commit | commitdiff | tree

Chris Wren [Sat, 1 Apr 2017 16:15:30 +0000 (16:15 +0000)]

Merge "move network notification IDs to central registry" into oc-dev

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 15:57:39 +0000 (15:57 +0000)]

Merge changes from topic 'bt5-cherry-pickery-1' into oc-dev
am: 187e0108ff

Change-Id: Ifdc2e36e39923744681777144ba696de348375fa

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 15:28:29 +0000 (15:28 +0000)]

Merge changes from topic 'bt5-cherry-pickery-1' into oc-dev

* changes:
  Bluetooth 5 advertising duration refactoring (4/4)
  Bluetooth LE Advertising minor improvements
  Fix advertise data size estimation
  Hide periodic scanning
  Bluetooth API spelling fixes ("wether" -> "whether")

commit | commitdiff | tree

Robert Sesek [Sat, 1 Apr 2017 07:03:31 +0000 (07:03 +0000)]

Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." am: c04b06dc81 am: 8bafcfe81c
am: 7fb2305d9c

Change-Id: Ic95d441495e53d52bcf90536e9602a016543202b

commit | commitdiff | tree

Robert Sesek [Sat, 1 Apr 2017 06:57:55 +0000 (06:57 +0000)]

Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE." am: c04b06dc81
am: 8bafcfe81c

Change-Id: I6e5b9eef6c2a6da1c3185d274afbfdec33d14a7a

commit | commitdiff | tree

Robert Sesek [Sat, 1 Apr 2017 06:53:03 +0000 (06:53 +0000)]

Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."
am: c04b06dc81

Change-Id: I781b676d273738101a6aaf27d523c7b5d7d06596

commit | commitdiff | tree

Treehugger Robot [Sat, 1 Apr 2017 06:46:31 +0000 (06:46 +0000)]

Merge "In MountEmulatedStorage() do not try to mount for mode MOUNT_EXTERNAL_NONE."

commit | commitdiff | tree

Jakub Pawlowski [Fri, 31 Mar 2017 02:10:08 +0000 (19:10 -0700)]

Bluetooth 5 advertising duration refactoring (4/4)

Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432
(cherry picked from commit 5a355610fe6ac0460f7130375de97b4d7bae7ba4)

commit | commitdiff | tree

Jakub Pawlowski [Thu, 30 Mar 2017 18:19:24 +0000 (11:19 -0700)]

Bluetooth LE Advertising minor improvements

This patch adds some additional error checking for the advertising set
parameters, and some more comments.

Test: manual
Bug: 30622771
Change-Id: I87bd44f4179ef63694ad3ed656dc2acc52e40f1e
(cherry picked from commit f4ed33f5fa6ffa3bda6faff773a3fb90b16a760c)

commit | commitdiff | tree

Jakub Pawlowski [Fri, 31 Mar 2017 23:49:13 +0000 (16:49 -0700)]

Fix advertise data size estimation

UUID in service data field can be 2, 4, or 16 bytes long.

Test: manual
Bug: 36553478
Change-Id: Ib5ba2d16065496ca311e8642a15a7ea6bc84d4c1
(cherry picked from commit 72e9e9f81504559ca18b71358203b1b39d9f0581)

commit | commitdiff | tree

Jakub Pawlowski [Thu, 30 Mar 2017 00:00:44 +0000 (17:00 -0700)]

Hide periodic scanning

Bug: 30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
(cherry picked from commit 63fad69a19bbfe78e64d56c9d775ddf6d7cd84c9)

commit | commitdiff | tree

Jakub Pawlowski [Thu, 23 Mar 2017 05:44:09 +0000 (22:44 -0700)]

Bluetooth API spelling fixes ("wether" -> "whether")

Bug: 30622771
Test: manual
Change-Id: I01c8b18d0057f2fd6e477ce2ca0b779321b6c0e6
(cherry picked from commit 08ed924d8922eec0555f6a860d80e6e2770c8a2d)

commit | commitdiff | tree

Diego Perez [Sat, 1 Apr 2017 05:34:51 +0000 (05:34 +0000)]

Merge "Revert "Layoutlib changes to support the new ResourceUrl"" into oc-dev
am: 28119285e8

Change-Id: I2c813a01bf5a41eff58e90973d66bda4438a04d7

commit | commitdiff | tree

TreeHugger Robot [Sat, 1 Apr 2017 05:31:01 +0000 (05:31 +0000)]

Merge "Revert "Layoutlib changes to support the new ResourceUrl"" into oc-dev

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:54:55 +0000 (04:54 +0000)]

Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed am: 8c5b5b0c4b
am: 96e331fb1c

Change-Id: I1522cf1e15178f2680f5483e6bb4e0d30be1bb80

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:49:26 +0000 (04:49 +0000)]

Merge "Bluetooth 5 advertising duration refactoring (4/4)" am: 3946df68ed
am: 8c5b5b0c4b

Change-Id: Iff286d35a01c180459be652de8a2670c745f49c2

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:49:24 +0000 (04:49 +0000)]

Merge "Bluetooth LE Advertising minor improvements" am: 3d84362412 am: 821523d859
am: bb5310743a

Change-Id: I2dbc765a656a10802a1bba43acf6591dda0f25fe

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:44:17 +0000 (04:44 +0000)]

Merge "Bluetooth LE Advertising minor improvements" am: 3d84362412
am: 821523d859

Change-Id: I1c10c8099fa6381a163eb3436ac49872399793f3

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:42:45 +0000 (04:42 +0000)]

Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:40:10 +0000 (04:40 +0000)]

Merge "Bluetooth LE Advertising minor improvements"
am: 3d84362412

Change-Id: Idc51a6673d8c29a22f9bed177ecb949a49480e3a

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:34:50 +0000 (04:34 +0000)]

Merge "Bluetooth 5 advertising duration refactoring (4/4)"

commit | commitdiff | tree

Jakub Pawlowski [Fri, 31 Mar 2017 02:10:08 +0000 (19:10 -0700)]

commit | commitdiff | tree

Jakub Pawlowski [Sat, 1 Apr 2017 04:34:30 +0000 (04:34 +0000)]

Merge "Bluetooth LE Advertising minor improvements"

commit | commitdiff | tree

Jakub Pawlowski [Thu, 30 Mar 2017 18:19:24 +0000 (11:19 -0700)]

commit | commitdiff | tree

Romain Guy [Sat, 1 Apr 2017 04:22:17 +0000 (04:22 +0000)]

Merge changes from topic 'bitmapfactory-options-outdecodecolorspace' into oc-dev
am: 81b292abdf

Change-Id: I75e541ec15651f63a47dac8f20e1955548f87f58

commit | commitdiff | tree

Jason Monk [Sat, 1 Apr 2017 04:20:44 +0000 (04:20 +0000)]

Merge "Fix tuner sub-screens attach" into oc-dev
am: 2579ec1b6d

Change-Id: Ifc1863aacc6629728d5160d28c64b45aea9fb6ba