OSDN Git Service
Mark Renouf [Tue, 1 Nov 2016 19:25:29 +0000 (19:25 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev am:
1b6da1f928
am:
a0f2404725
Change-Id: I13c96d992efcaf9b205032839840be4b03256c68
Mark Renouf [Tue, 1 Nov 2016 19:24:26 +0000 (19:24 +0000)]
Workaround for javac compilation issue of lambda code am:
e065f7c5a9
am:
6ce06e63a7
Change-Id: I9a43b4843667bdab5909765b1afa99c9f7b11053
Mark Renouf [Tue, 1 Nov 2016 19:19:40 +0000 (19:19 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev
am:
1b6da1f928
Change-Id: Id8bef52d6b5f45202217c303ad30302694dac3e4
Mark Renouf [Tue, 1 Nov 2016 19:19:28 +0000 (19:19 +0000)]
Workaround for javac compilation issue of lambda code
am:
e065f7c5a9
Change-Id: I247477c4155ddc154e7fe3f1057a767d1ab74336
Mark Renouf [Tue, 1 Nov 2016 19:13:40 +0000 (19:13 +0000)]
Merge "Workaround for javac compilation issue of lambda code" into cw-f-dev
Bill Yi [Tue, 1 Nov 2016 18:33:35 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
dc359e7b8d -s ours
am:
ea46f852a8 -s ours
Change-Id: Iff4d29701c6e127938f310e52ed04f8ab6d2a8d7
Bill Yi [Tue, 1 Nov 2016 18:32:23 +0000 (18:32 +0000)]
Import translations. DO NOT MERGE am:
5ac1b67317 -s ours
am:
49f81e3c88 -s ours
Change-Id: I53e3ac253896d7829fe2066e34d1b8a83e0c50aa
Bill Yi [Tue, 1 Nov 2016 18:27:23 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
dc359e7b8d -s ours
Change-Id: Ibe9da8e0b11a98d3307eee2c7105e37c851e168b
Bill Yi [Tue, 1 Nov 2016 18:27:21 +0000 (18:27 +0000)]
Import translations. DO NOT MERGE
am:
5ac1b67317 -s ours
Change-Id: Iebeff33fbc1d5c55a8b66bfda258ddb7658df7b7
TreeHugger Robot [Tue, 1 Nov 2016 18:21:45 +0000 (18:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Mark Renouf [Tue, 1 Nov 2016 15:48:24 +0000 (11:48 -0400)]
Workaround for javac compilation issue of lambda code
Since ag/
32554459 some Robolectric tests are compiling
framework code with javac. For reasons unclear so far this
code fails to compile with javac:
> ShortcutService.java:408: error: variable ri might not have been initialized
https://android-build.googleplex.com/builds/submitted/
3416256/angelfish-userdebug/latest/logs
Removing the lambda expressions corrects the issue.
BUG:
32554459
Change-Id: I189c8ef02dc93b46ef6418c1ff14f2312097898a
Chet Haase [Tue, 1 Nov 2016 17:39:55 +0000 (17:39 +0000)]
Merge "Clean up InputConnection.commitContent() javadocs DO NOT MERGE" into nyc-mr1-dev am:
bbae4e6ce6 am:
7ec3be9321
am:
4b5f1d4548
Change-Id: Icea7e623e464a9917170a1d6f345efd7cf238699
Chet Haase [Tue, 1 Nov 2016 17:38:51 +0000 (17:38 +0000)]
Clean up InputConnection.commitContent() javadocs DO NOT MERGE am:
5c0af88764 am:
b76d3363ed
am:
e1dd52264b
Change-Id: I1868f4780becfdc74bad885d14e82c27acc83efa
Chet Haase [Tue, 1 Nov 2016 17:35:34 +0000 (17:35 +0000)]
Merge "Clean up InputConnection.commitContent() javadocs DO NOT MERGE" into nyc-mr1-dev am:
bbae4e6ce6
am:
7ec3be9321
Change-Id: I8dc81e849c6cac05a5e80925f3e82b67ed97ec5a
Chet Haase [Tue, 1 Nov 2016 17:34:44 +0000 (17:34 +0000)]
Clean up InputConnection.commitContent() javadocs DO NOT MERGE am:
5c0af88764
am:
b76d3363ed
Change-Id: I4df49b5d49a45514d0d73f17c6bba8b7cb5962d5
Chet Haase [Tue, 1 Nov 2016 17:30:51 +0000 (17:30 +0000)]
Merge "Clean up InputConnection.commitContent() javadocs DO NOT MERGE" into nyc-mr1-dev
am:
bbae4e6ce6
Change-Id: I69397eccd0894146e673297dedf3de44125aef04
Chet Haase [Tue, 1 Nov 2016 17:30:47 +0000 (17:30 +0000)]
Clean up InputConnection.commitContent() javadocs DO NOT MERGE
am:
5c0af88764
Change-Id: I1f0147cbac31a7e68bc89601e1952f5a35971885
Andreas Gampe [Tue, 1 Nov 2016 17:28:47 +0000 (17:28 +0000)]
Merge "Zygote: Avoid string concatentation for systrace" am:
8bcd159234 am:
fdfc79a878
am:
8a8f33416b
Change-Id: Idf1ecf65a9a4d1dc11c37e824ce876543da8efaa
Chet Haase [Tue, 1 Nov 2016 17:25:38 +0000 (17:25 +0000)]
Merge "Clean up InputConnection.commitContent() javadocs DO NOT MERGE" into nyc-mr1-dev
Andreas Gampe [Tue, 1 Nov 2016 17:24:19 +0000 (17:24 +0000)]
Merge "Zygote: Avoid string concatentation for systrace" am:
8bcd159234
am:
fdfc79a878
Change-Id: I105f07f2b2ca925139da6fc78641ee486eb68410
Andreas Gampe [Tue, 1 Nov 2016 17:19:44 +0000 (17:19 +0000)]
Merge "Zygote: Avoid string concatentation for systrace"
am:
8bcd159234
Change-Id: I484e5a56b790f57d097970f727959438debafafb
Treehugger Robot [Tue, 1 Nov 2016 15:38:49 +0000 (15:38 +0000)]
Merge "Zygote: Avoid string concatentation for systrace"
Bill Yi [Tue, 1 Nov 2016 08:06:53 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e82b728101 -s ours am:
c0ff60f272 -s ours
am:
cf8be6d4e0 -s ours
Change-Id: I5230dc3bb40e16f487e7e36fb8bed0d007bf3f6a
Bill Yi [Tue, 1 Nov 2016 08:05:56 +0000 (08:05 +0000)]
Import translations. DO NOT MERGE am:
9be72645f6 -s ours am:
71f1b1182f -s ours
am:
5b5862c1a8 -s ours
Change-Id: I796872bffa4268623bd9378f4b5ce2549de875cc
Bill Yi [Tue, 1 Nov 2016 08:01:13 +0000 (08:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
e82b728101 -s ours
am:
c0ff60f272 -s ours
Change-Id: Idb46ad6bc668e3e86b964c0a9e74581116b56812
Bill Yi [Tue, 1 Nov 2016 08:00:22 +0000 (08:00 +0000)]
Import translations. DO NOT MERGE am:
9be72645f6 -s ours
am:
71f1b1182f -s ours
Change-Id: I017bf74b651d9b4245601f4b85720fa89c470fa9
Bill Yi [Tue, 1 Nov 2016 07:56:08 +0000 (07:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
ab8eca82f8 -s ours
Change-Id: I1ba0b3e59f30b47a0e9a748121d8c3974b1c9aa1
Bill Yi [Tue, 1 Nov 2016 07:56:02 +0000 (07:56 +0000)]
Import translations. DO NOT MERGE
am:
9a74480636 -s ours
Change-Id: I6b047207d6e7118e1e4009c565058c71ddc3bf28
Bill Yi [Tue, 1 Nov 2016 07:56:00 +0000 (07:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e82b728101 -s ours
Change-Id: Ic904dea0b0cddcacaff7cff6665769637f121982
Bill Yi [Tue, 1 Nov 2016 07:55:57 +0000 (07:55 +0000)]
Import translations. DO NOT MERGE
am:
9be72645f6 -s ours
Change-Id: Ia239b769421432abdb5097d041537c02d74a75c6
TreeHugger Robot [Tue, 1 Nov 2016 07:30:55 +0000 (07:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 1 Nov 2016 07:23:55 +0000 (07:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Tue, 1 Nov 2016 06:03:43 +0000 (23:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I40881014752e3a1f1d95542a543f49925c4dff16
Auto-generated-cl: translation import
Bill Yi [Tue, 1 Nov 2016 05:57:11 +0000 (22:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fcdd721174d9228394afa5ad39de02a3fb309a5
Auto-generated-cl: translation import
Damien Bargiacchi [Tue, 1 Nov 2016 01:53:15 +0000 (01:53 +0000)]
Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev am:
71a865d22d
am:
cb3a109506
Change-Id: I44ed3b052960f10954db7dd536b7f874cde4a97e
Damien Bargiacchi [Tue, 1 Nov 2016 01:52:09 +0000 (01:52 +0000)]
Allow boot clock to be toggled between 12 and 24 hour format am:
9071db1d37
am:
3400dffcad
Change-Id: Ic4df64d163845547416ef1280ae2ba2f1b41efda
Damien Bargiacchi [Tue, 1 Nov 2016 01:46:41 +0000 (01:46 +0000)]
Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev
am:
71a865d22d
Change-Id: I2530e1710742ab2ead8627004fa46aad410d455c
Damien Bargiacchi [Tue, 1 Nov 2016 01:46:37 +0000 (01:46 +0000)]
Allow boot clock to be toggled between 12 and 24 hour format
am:
9071db1d37
Change-Id: Ief7d44034df3a59adc2f65ba79154a1ee933040c
TreeHugger Robot [Tue, 1 Nov 2016 01:39:59 +0000 (01:39 +0000)]
Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev
Makoto Onuki [Tue, 1 Nov 2016 01:23:10 +0000 (01:23 +0000)]
Always scan the Settings app for updated shortcuts. am:
ac2898228e am:
f0644d03a2
am:
4eb38c75f4
Change-Id: Ifc5c7d4493703bb16788165ea60c8a35408b259b
Makoto Onuki [Tue, 1 Nov 2016 01:17:30 +0000 (01:17 +0000)]
Always scan the Settings app for updated shortcuts. am:
ac2898228e
am:
f0644d03a2
Change-Id: I513b505be9cd3b273b76bd3d8578326400ddceb3
Makoto Onuki [Tue, 1 Nov 2016 01:12:34 +0000 (01:12 +0000)]
Always scan the Settings app for updated shortcuts.
am:
ac2898228e
Change-Id: I64f476ec3b4003e87004ab6c05536f91e659d39e
Chet Haase [Thu, 13 Oct 2016 22:49:09 +0000 (15:49 -0700)]
Clean up InputConnection.commitContent() javadocs DO NOT MERGE
Test: docs only, no test apart from verifying that it builds
Bug: #
32158219 clean up InputConnection.commitContent() javadocs
Change-Id: I9b438d6b14aa8bc868fe41f7e0fe22b0e83800fb
Makoto Onuki [Mon, 31 Oct 2016 22:32:17 +0000 (15:32 -0700)]
Always scan the Settings app for updated shortcuts.
The setting apps' version code is 25 for both DR and MR1, so the
shortcut manager will not notice when it's changed.
Let's just always scan this app.
Bug
32554059
Change-Id: Ia05363b30a5eeb989dc4c44cf5dbd71cde96de96
Bill Yi [Mon, 31 Oct 2016 21:59:45 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie85b9335611ca2c49a71797d54ed80ee711cf423
Auto-generated-cl: translation import
Sanket Agarwal [Mon, 31 Oct 2016 19:29:56 +0000 (19:29 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am:
ba63f32ed5 am:
50cc13cc18
am:
9e33f453a3
Change-Id: I509fc113b64e7fac13ff666dd194a118b65b002c
Sanket Agarwal [Mon, 31 Oct 2016 19:25:34 +0000 (19:25 +0000)]
Merge "Configuration for priority/auto-connection for PAN." am:
ba63f32ed5
am:
50cc13cc18
Change-Id: I6725098623dba530db325f6b12d5193f9f2629e7
Sanket Agarwal [Mon, 31 Oct 2016 19:19:30 +0000 (19:19 +0000)]
Merge "Configuration for priority/auto-connection for PAN."
am:
ba63f32ed5
Change-Id: I00ecde6e7f1c64f704341c7a96e476f1a11bdaea
Sanket Agarwal [Mon, 31 Oct 2016 19:08:53 +0000 (19:08 +0000)]
Merge "Configuration for priority/auto-connection for PAN."
Marie Janssen [Mon, 31 Oct 2016 18:54:23 +0000 (18:54 +0000)]
resolve merge conflicts of
6a31a5c to stage-aosp-master am:
879a5169ec
am:
635d528877
Change-Id: I9a59aa4c657019ee06117591cb1a0bda4c67ea96
Marie Janssen [Mon, 31 Oct 2016 18:47:52 +0000 (18:47 +0000)]
resolve merge conflicts of
6a31a5c to stage-aosp-master
am:
879a5169ec
Change-Id: Ib6321dee7357920c73b135fbe465998dc4469e66
Marie Janssen [Mon, 31 Oct 2016 18:00:06 +0000 (11:00 -0700)]
resolve merge conflicts of
6a31a5c to stage-aosp-master
Change-Id: I29f2085f4656b0b57896ef505ef6a50cdbd1b194
Sanket Agarwal [Thu, 4 Aug 2016 23:16:20 +0000 (16:16 -0700)]
Configuration for priority/auto-connection for PAN.
We protect the auto-connection via a flag so that it is only enabled on
some devices.
Bug: b/
30679978
Change-Id: I5b7f273e09a659b561913d5c6f3a76feb245e6ce
(cherry picked from commit
1f09d5f255980488cabd55a5c44a5737e24541d8)
Brad Ebinger [Mon, 31 Oct 2016 17:22:46 +0000 (17:22 +0000)]
Merge "Modify AIDLs to include Session.Info" am:
78a63c1cf0 am:
9e4d4ee484
am:
3030cd855b
Change-Id: I4d9b66c81f4f9fbebeacd9aede566f660c4b1bb8
Treehugger Robot [Mon, 31 Oct 2016 17:20:39 +0000 (17:20 +0000)]
Merge "Bluetooth: prevent enabling BLE in airplane mode"
Brad Ebinger [Mon, 31 Oct 2016 17:17:57 +0000 (17:17 +0000)]
Merge "Modify AIDLs to include Session.Info" am:
78a63c1cf0
am:
9e4d4ee484
Change-Id: I9da7f4106bfec8ebba4515223a9dba40ffdaef20
Brad Ebinger [Mon, 31 Oct 2016 17:12:26 +0000 (17:12 +0000)]
Merge "Modify AIDLs to include Session.Info"
am:
78a63c1cf0
Change-Id: I0549ace3cc383bebac86a8b49cb87f631aecb552
Brad Ebinger [Mon, 31 Oct 2016 17:04:50 +0000 (17:04 +0000)]
Merge "Modify AIDLs to include Session.Info"
Marie Janssen [Tue, 25 Oct 2016 17:47:51 +0000 (10:47 -0700)]
Bluetooth: prevent enabling BLE in airplane mode
Enabling BLE in airplane mode puts BluetoothManagerService in an
unexpected state which causes Bluetooth to be on when airplane mode
is disabled.
Also fixes a bug where a crash of a BLE client would trigger a restart
into ON mode.
Test: SL4A BleBackgroundScanTest:test_airplane_mode_disables_ble
Bug:
32140251
Bug:
32140271
Bug:
32369494
Change-Id: Ie65157e65c3a1ca914f567a7a0c631175d1e5835
Aga Madurska [Mon, 31 Oct 2016 11:59:29 +0000 (11:59 +0000)]
Update colors for the round scroll bar. am:
5177264735
am:
c78b695126
Change-Id: Iffaab844f7c0fab11cc429f06b450eb190737bc5
Aga Madurska [Mon, 31 Oct 2016 11:53:51 +0000 (11:53 +0000)]
Update colors for the round scroll bar.
am:
5177264735
Change-Id: I576d9149292cc23ac72a734d5ac3986d199f7db8
Aga Madurska [Mon, 31 Oct 2016 10:33:27 +0000 (10:33 +0000)]
Update colors for the round scroll bar.
Bug:
32536003
Change-Id: I35503c089bc918493aab3288580f81d7b780d671
Andreas Gampe [Sat, 29 Oct 2016 01:19:30 +0000 (18:19 -0700)]
Zygote: Avoid string concatentation for systrace
Avoid the allocation of an unneeded string. With more than 4000
classes being preloaded, this adds up.
Test: m
Test: device boots
Change-Id: I61f10f61ebdd08d17e09aaedd8bf54cc40c41838
Damien Bargiacchi [Sat, 29 Oct 2016 00:38:22 +0000 (17:38 -0700)]
Allow boot clock to be toggled between 12 and 24 hour format
Bug:
32461548
Change-Id: I414192e6d9f3ae44267f4a360e35647f18c420b4
Sanket Agarwal [Fri, 28 Oct 2016 20:28:50 +0000 (20:28 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533 am:
958dab93cd
am:
9527a19cbc
Change-Id: I9590f32bad7a3fccaf4479d3ffd004d2b7a91dad
Brad Ebinger [Fri, 28 Oct 2016 20:26:51 +0000 (20:26 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master am:
aacbdf59d6
am:
ccd8315969
Change-Id: If1e6819430977bf3978bbbf23f0f32fcb1c460d4
Brad Ebinger [Fri, 28 Oct 2016 20:25:34 +0000 (20:25 +0000)]
Modify AIDLs to include Session.Info am:
b32d4f8b5c
am:
668a6fa227
Change-Id: I7afb3692f4f26c37b96c98d7a1e173576dd7620b
Sanket Agarwal [Fri, 28 Oct 2016 20:19:14 +0000 (20:19 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)" am:
678ba24533
am:
958dab93cd
Change-Id: Ie21c9be4b7177179ea4588d2832d0bbf72e7a3c1
Brad Ebinger [Fri, 28 Oct 2016 20:17:15 +0000 (20:17 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
am:
aacbdf59d6
Change-Id: I272539ea7124fa18e42ee6f06c89d3ffca449934
Brad Ebinger [Fri, 28 Oct 2016 20:17:03 +0000 (20:17 +0000)]
Modify AIDLs to include Session.Info
am:
b32d4f8b5c
Change-Id: Ibbac4c74b5a0c4fcd5524c97acef5fc078d80cb7
Sanket Agarwal [Fri, 28 Oct 2016 20:13:57 +0000 (20:13 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
am:
678ba24533
Change-Id: I77553f45f3d5de04e9b443e425f15afb8946e237
Brad Ebinger [Fri, 28 Oct 2016 20:09:53 +0000 (20:09 +0000)]
Merge "Modify AIDLs to include Session.Info" into stage-aosp-master
Sanket Agarwal [Fri, 28 Oct 2016 20:01:58 +0000 (20:01 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
Brad Ebinger [Mon, 24 Oct 2016 23:40:49 +0000 (16:40 -0700)]
Modify AIDLs to include Session.Info
Modifies the IConnectionService.aidl file to include Session.Info
information to pass from Telecom to Telephony, which is used to start
external Sessions in Telephony from Telecom.
Test: Manual testing and Unit Tests pass
Bug:
26571395
Change-Id: Ia09a0abfa13d5167542d4c67465ea9aa1930b58b
Sanket Agarwal [Tue, 28 Jun 2016 03:13:54 +0000 (20:13 -0700)]
Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.
Bug: b/
29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit
dbeab2c6e12693fe9b06b6a680677da5325c9230)
(cherry picked from commit
40bb6f3f8fc02600fe24301c11e804196ced3531)
Igor Murashkin [Fri, 28 Oct 2016 18:00:11 +0000 (18:00 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555 am:
d0d99d8a3d
am:
4aa38633fe
Change-Id: I5016b537d38a03b494fb3c4a3952af8c054302d3
Igor Murashkin [Fri, 28 Oct 2016 17:55:12 +0000 (17:55 +0000)]
Merge "app_process: Forward -cp/-classpath to ART." am:
4a4a8f1555
am:
d0d99d8a3d
Change-Id: Ia7bea2370daeb77ab23a797546f8f7c437902516
Igor Murashkin [Fri, 28 Oct 2016 17:48:15 +0000 (17:48 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
am:
4a4a8f1555
Change-Id: If7773d6bae3f4f13aa7f0c883b1c20319d85c747
Treehugger Robot [Fri, 28 Oct 2016 17:34:46 +0000 (17:34 +0000)]
Merge "app_process: Forward -cp/-classpath to ART."
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:19:57 +0000 (12:19 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88 am:
29d6af7fe7
am:
0cf19a9a27
Change-Id: I2e87d2f2a7484b6720152083299b1521f9c517bc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:15:19 +0000 (12:15 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9" am:
ec3e884e88
am:
29d6af7fe7
Change-Id: I6693fe79836e88d022d393d2bee5d811cb2dcdfc
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 12:05:56 +0000 (12:05 +0000)]
Merge "Track libcore change
16fa17012b56e990ced91cd023dee33f96deedf9"
am:
ec3e884e88
Change-Id: Ibf708f685bf8cb8e5f88423b48ed05986c223651
Przemyslaw Szczepaniak [Fri, 28 Oct 2016 11:57:07 +0000 (11:57 +0000)]
Mitchell Wills [Fri, 28 Oct 2016 06:35:28 +0000 (06:35 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
a657136264
Change-Id: Ib597a86f8c79bca3c7db66736bf2cbcd11b29f48
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Mitchell Wills [Fri, 28 Oct 2016 05:04:31 +0000 (05:04 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework"" am:
77281bbaf4 -s ours
am:
e1d1740534
Change-Id: I9b2080a5ea044c1f444b77d4c1d9309fe306f5c8
Mitchell Wills [Fri, 28 Oct 2016 04:58:50 +0000 (04:58 +0000)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
am:
77281bbaf4 -s ours
Change-Id: I85645a2301cba10b1612c5ec851412d4e1c6d947
Mitchell Wills [Wed, 31 Aug 2016 23:15:37 +0000 (16:15 -0700)]
Revert "DO NOT MERGE Revert "Add Bluetooth toggle prompts - framework""
This reverts commit
6a80a4b05acacd3fd07583a3bb6185e9770215eb.
Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593
(cherry picked from commit
b38028128bb9878971f8b5a85b90b3f303fec0ba)
Jakub Pawlowski [Fri, 28 Oct 2016 03:01:56 +0000 (03:01 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21 am:
81d5ecb7a6
am:
61d0088923
Change-Id: I83c82b17064ee958fff6a98d90a0b351205ccf54
Jakub Pawlowski [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Separate LE scanner from GATT client (1/4)" am:
87c997ca21
am:
81d5ecb7a6
Change-Id: If7688706be45e72e3ab98a35d3712ddae9d508a6
Marie Janssen [Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours am:
98f664b903
am:
7ad32238f6
Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6
Marie Janssen [Fri, 28 Oct 2016 02:52:00 +0000 (02:52 +0000)]
Merge "Add Bluetooth toggle prompts - framework" am:
a062ce698b -s ours
am:
98f664b903
Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7
Jakub Pawlowski [Fri, 28 Oct 2016 02:50:54 +0000 (02:50 +0000)]
Merge "Separate LE scanner from GATT client (1/4)"
am:
87c997ca21
Change-Id: I8fdf97a457d7566b4e0048624d47a6cfea693f13
Marie Janssen [Fri, 28 Oct 2016 02:45:26 +0000 (02:45 +0000)]
Merge "Add Bluetooth toggle prompts - framework"
am:
a062ce698b -s ours
Change-Id: I426b2378c9153286557498fe80c2469caa6a4888
Fyodor Kupolov [Fri, 28 Oct 2016 00:40:22 +0000 (00:40 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0 am:
74bd9b1f56
am:
9b006e28f9
Change-Id: Icc26dab845ded7813abea322dd3898364a96f4c3
Fyodor Kupolov [Fri, 28 Oct 2016 00:39:12 +0000 (00:39 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6 am:
7c9a91094d
am:
c9102f2ae2
Change-Id: I28e06c6345e847ade9a89824675302fdf58e1ba9
Fyodor Kupolov [Fri, 28 Oct 2016 00:31:47 +0000 (00:31 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev am:
e97969b4d0
am:
74bd9b1f56
Change-Id: I56b83ec38059af3d15d3ad123ebe96bf7330dbbe
Fyodor Kupolov [Fri, 28 Oct 2016 00:30:43 +0000 (00:30 +0000)]
[DO NOT MERGE] Only setSize if -s arg is specified am:
b87a491de6
am:
7c9a91094d
Change-Id: I386176cef3812d13a0b5e1583e55b470e4fc312d
Fyodor Kupolov [Fri, 28 Oct 2016 00:21:12 +0000 (00:21 +0000)]
Merge "[DO NOT MERGE] Only setSize if -s arg is specified" into nyc-mr1-dev
am:
e97969b4d0
Change-Id: I0888cc3e628cd004887ecf0cac5fa718dc1d0f15
OSDN Git Service
