OSDN Git Service
android-build-team Robot [Fri, 21 Apr 2017 20:41:52 +0000 (20:41 +0000)]
Merge cherrypicks of [
2007123,
2089669,
2072002,
2094113,
1989895,
2094094,
2017568,
2054111,
2054025,
2074928,
2066476,
2092431,
2053944,
2095243,
2092549,
2065088,
2007730,
2008313,
2053983,
2025333,
2094716,
2026590,
2059276,
2089422,
2080090] into nyc-mr2-pixel-monthly-release
Change-Id: I97aaec17443e66c586b65a2c2921e7ed13e64c83
android-build-team Robot [Fri, 21 Apr 2017 20:40:15 +0000 (20:40 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into snap-temp-L87400000056978794
Ajay Panicker [Tue, 11 Apr 2017 21:45:40 +0000 (14:45 -0700)]
Prevent OPP from opening files that aren't sent over Bluetooth
Change-Id: I425bd0b5ffb920bb28128814f2c30deeb0e4b196
Jack He [Mon, 13 Mar 2017 17:37:06 +0000 (10:37 -0700)]
OPP: Restrict file based URI access to external storage
Change-Id: I05d77d2d798e79a210d58eebfb1baece5d84651d
android-build-team Robot [Fri, 21 Apr 2017 17:28:44 +0000 (17:28 +0000)]
release-request-
762540b1-1728-41bc-a9ce-
e977f3e2683f-for-git_nyc-mr2-pixel-monthly-release-
3888830 snap-temp-L22300000056915770
Change-Id: Ia1416940252865464558e06705b730372fca6d4e
android-build-team Robot [Fri, 21 Apr 2017 17:28:37 +0000 (17:28 +0000)]
release-request-
762540b1-1728-41bc-a9ce-
e977f3e2683f-for-git_nyc-mr2-pixel-monthly-release-
3888830 snap-temp-L22300000056915770 (snap-temp-branch)
Change-Id: Ib343d223bbc6395c9eb1f4cd168185d32643b1e6
android-build-team Robot [Thu, 20 Apr 2017 22:39:53 +0000 (22:39 +0000)]
Merge cherrypicks of [
2089422,
2053944,
2094094,
2007730,
2072002,
2065088,
1989895,
2080090,
2026590,
2008313,
2089669,
2059276,
2094716,
2066476,
2053983,
2007123,
2017568,
2054111,
2054025,
2095243,
2092431,
2092549,
2025333,
2099168,
2074928] into nyc-mr2-pixel-monthly-release
Change-Id: I952a9abd3036c56267b791fd19e625e004811867
android-build-team Robot [Thu, 20 Apr 2017 22:37:43 +0000 (22:37 +0000)]
Merge "Prevent OPP from opening files that aren't sent over Bluetooth" into snap-temp-L07900000056674784
Ajay Panicker [Tue, 11 Apr 2017 21:45:40 +0000 (14:45 -0700)]
Prevent OPP from opening files that aren't sent over Bluetooth
Change-Id: I0c3d60926afd1937a31ec063211160d9cd8a9cfc
Jack He [Mon, 13 Mar 2017 17:37:06 +0000 (10:37 -0700)]
OPP: Restrict file based URI access to external storage
Change-Id: Icad55763f2478586544a4bbd233b820c7f69b658
Bill Yi [Fri, 3 Feb 2017 06:24:10 +0000 (22:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I395f067904206f54d76ff06dbe1366ddc0a64a8a
Auto-generated-cl: translation import
Ajay Panicker [Fri, 20 Jan 2017 21:08:10 +0000 (13:08 -0800)]
Change scan downgrading to be app independent
Before this patch, every time an app started a new scan it would reset the
timer to downgrade apps down to opportunistic. Now each app is kept track
of individually so that another app doing frequent short scans doesn't cause
a long scanning app to avoid downgrading.
Fixes:
34224062
Test: Tested scanning multiple times with multiple apps / TestTracker:73279
Change-Id: Ibcae9115dcd0fb5325f7bc9fc5d6e0fe4bf6e062
(cherry picked from commit
65e839fa45222955a605f6270a240edc68b21617)
Jakub Pawlowski [Fri, 20 Jan 2017 20:49:20 +0000 (12:49 -0800)]
Remove advertiser during unregistration
When advertiser is being unregistered in non-regular flow, i.e. due to
failure to start advertising, or when started with timeout, remove
client instance from map.
Bug:
34440704
Test: sl4a ConcurrentBleAdvertising:test_timeout
Change-Id: Id3bb43e0412238bb5e465faaf51892770cad0e24
Jack He [Wed, 18 Jan 2017 00:13:48 +0000 (16:13 -0800)]
Add counters for true number of events being logged
* The metrics module drops oldest event when event size goes beyond its
logging capacity
* The understand whether events were dropped, we want to log the true
number of events.
Bug:
33694310
Test: Code compilation
Change-Id: I381e1cbdf6d08ec2d6e98a53cd27593b700b3d2a
Jack He [Thu, 22 Dec 2016 20:30:26 +0000 (12:30 -0800)]
Fix A2DP metrics session duration
* Add one extra item in the A2DPSession message to keep track of audio
playback time for A2DP source
Bug:
33694310
Test: code compilation
Merged-In: Iee1e47997bf9cf9ba3f7f812c965eab36f19c0f4
Change-Id: Iee1e47997bf9cf9ba3f7f812c965eab36f19c0f4
(cherry picked from commit
4308e8f5f34b668f48cb50fbbdac77e45d04e432)
Zheng Zhang [Wed, 4 Jan 2017 19:56:15 +0000 (19:56 +0000)]
DO NOT MERGE ANYWHERE: Let audio HAL know when BT is turned off
am:
9de0d81629 -s ours
Change-Id: I01f8129affe539c061a0feec8d025f19c2d0c5fe
Zheng Zhang [Tue, 3 Jan 2017 18:20:57 +0000 (10:20 -0800)]
DO NOT MERGE ANYWHERE: Let audio HAL know when BT is turned off
Audio HAL needs setParams("hfp_enable=false") when BT is turned off
since if it does not, then
the next enable setParams("hfp_enable=true") does not succeed due to
audio HAL being in a weird stage.
Bug:
29937812
Bug:
33893861
(cherry picked from commit I111e38cbe578fe3eca66b07da8ad9204d064a02c)
Change-Id: Ic47348ee1347f68dde23c830ceed8bcdcba4dce7
Marie Janssen [Wed, 28 Dec 2016 22:10:21 +0000 (14:10 -0800)]
Move state dumpsys (to BluetoothManagerService)
BluetoothManagerService will dump basic state about Bluetooth now for
standard dumpsys arguments. Move it from here and track which apps enable /
disable Bluetooth.
Test: enable/disable a few times, check that apps are recorded correctly
Bug:
33692282
Change-Id: I7505ba25a5cafda061fa23774cc31a6b83909d34
(cherry picked from commit
4f768f68b35a237052bbbb8570ff1896828c1e05)
Ajay Panicker [Thu, 15 Dec 2016 01:50:01 +0000 (17:50 -0800)]
Prevent Null Pointer Exception caused by empty remote device properties
Bug:
33092708
Test: runtest bluetooth
Change-Id: I6d7bfd9baaa428692183a64cc7ae87438862d518
(cherry picked from commit
9f2682b75aab6ac9eff1d4ac5956df402d98d1c1)
Ajay Panicker [Thu, 15 Dec 2016 02:43:07 +0000 (18:43 -0800)]
Prevent SQL query from having a bad where clause
Bug:
33092708
Test: Sanity test MAP on carkit
Change-Id: I6c7f54f60877cf2c57df9b3521604660321214ff
(cherry picked from commit
0552994436e2afdec3d35fed5aac0f87e8e3e0bb)
Ajay Panicker [Tue, 6 Dec 2016 18:09:53 +0000 (18:09 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce am:
48f7628944 am:
5bdf052376 am:
850fec4b84 am:
260eb9a356 am:
a00a7fdd51
am:
190f774cb9
Change-Id: Ieb4f898abf780b7c56e36599a99995cdbbdae3cd
Ajay Panicker [Tue, 6 Dec 2016 18:05:52 +0000 (18:05 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce am:
48f7628944 am:
5bdf052376 am:
850fec4b84 am:
260eb9a356
am:
a00a7fdd51
Change-Id: Icd6a71d9d263dafd937c6fb08c9036745cd2191c
Ajay Panicker [Tue, 6 Dec 2016 18:01:52 +0000 (18:01 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce am:
48f7628944 am:
5bdf052376 am:
850fec4b84
am:
260eb9a356
Change-Id: I81c69b38a2109210a329902d1c97b1805674104e
Ajay Panicker [Tue, 6 Dec 2016 17:57:21 +0000 (17:57 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce am:
48f7628944 am:
5bdf052376
am:
850fec4b84
Change-Id: Id621186af8281ffe908cc0c5b5f55efb0cc08da2
Ajay Panicker [Tue, 6 Dec 2016 17:53:21 +0000 (17:53 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce am:
48f7628944
am:
5bdf052376
Change-Id: Ie8a36d18260805dc547836bbc498eb2a624c9b66
Ajay Panicker [Tue, 6 Dec 2016 17:48:51 +0000 (17:48 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff am:
8b498077ce
am:
48f7628944
Change-Id: Iedc33b52ba742afa8aea3c550d97880aa986538e
Ajay Panicker [Tue, 6 Dec 2016 17:45:20 +0000 (17:45 +0000)]
resolve merge conflicts of
f606637 to mnc-dev am:
846c09a4ff
am:
8b498077ce
Change-Id: I44ffb224cf88bd92ec7a590bc3f0d327050e5109
Ajay Panicker [Tue, 6 Dec 2016 17:41:20 +0000 (17:41 +0000)]
resolve merge conflicts of
f606637 to mnc-dev
am:
846c09a4ff
Change-Id: Idf327a36530c6ead418310e25d9e4944687aa807
Ajay Panicker [Tue, 6 Dec 2016 03:23:49 +0000 (19:23 -0800)]
resolve merge conflicts of
f606637 to mnc-dev
Change-Id: I2e516b0eb36973e097d7837479377a7063b16765
Ajay Panicker [Tue, 6 Dec 2016 02:52:26 +0000 (02:52 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed am:
c37f27194b
am:
2f1531712d
Change-Id: I7544a341b02cb6a6820d0f16d9d7ba0011f263ee
Ajay Panicker [Tue, 6 Dec 2016 02:49:56 +0000 (02:49 +0000)]
Remove MANAGE_DOCUMENTS permission as it isn't needed
am:
c37f27194b
Change-Id: I60c7f1ac1f5263751882b93bd20635bca05aba10
Ajay Panicker [Thu, 17 Nov 2016 23:50:36 +0000 (15:50 -0800)]
Remove MANAGE_DOCUMENTS permission as it isn't needed
Bug:
32612586
Change-Id: Iebe7dc9b198ce99d5921f5a349ba9d5d4424d156
Jakub Pawlowski [Thu, 10 Nov 2016 00:47:21 +0000 (16:47 -0800)]
BLE OOB Pairing - parse address type (3/5)
When address type is not parsed, creating bond to devices not using
random address is impossible.
Bug:
32780409
Test: try pairing with nRF52DK using random address
Change-Id: Ifae63995e5ffb3a5071d0c993a0e15c0b6e8a7eb
(cherry picked from commit
33d233cc3a1be101258f7ab3a11fe186300ddf47)
Jakub Pawlowski [Thu, 28 Jul 2016 12:19:11 +0000 (05:19 -0700)]
Add LE Secure Connection data parsing (2/4)
Bug:
30460956
Change-Id: Ie5c3ad96e7a834c9dc0a6791cf2cd24ecaeb927e
(cherry picked from commit
1d768333363310f093b6249a5f9c70ad1545c136)
Bill Yi [Fri, 4 Nov 2016 22:37:19 +0000 (15:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie9213a7735fc09c4bad0bce5fe38a9c3fbe5e0bd
Auto-generated-cl: translation import
Chris Manton [Thu, 3 Nov 2016 00:56:01 +0000 (00:56 +0000)]
Merge "DO NOT MERGE BLE Check and send scan response data" into cw-f-dev
am:
e108406e30
Change-Id: I58b0dffb7ef82786c6cdc3fea381c04d97ccbdd2
Chris Manton [Thu, 3 Nov 2016 00:56:00 +0000 (00:56 +0000)]
DO NOT MERGE BLE Check and send scan response data
am:
6bb2114adf
Change-Id: I97ebca38b9a8d5e05decaa1b8a79d6ed789fb078
TreeHugger Robot [Thu, 3 Nov 2016 00:52:06 +0000 (00:52 +0000)]
Merge "DO NOT MERGE BLE Check and send scan response data" into cw-f-dev
Chris Manton [Tue, 1 Nov 2016 03:48:42 +0000 (20:48 -0700)]
DO NOT MERGE BLE Check and send scan response data
If there is scan response data, load it up during
when start advertising. The current stack does
not provide callback for these calls.
Bug:
32539880
Test: Verified scan response occurs with CL
Change-Id: I33effbf3aa3a60c3353d4ca7708ea06df8a05a7d
Christine Hallstrom [Tue, 1 Nov 2016 21:47:50 +0000 (21:47 +0000)]
Disable HFP audio path when HFP call goes on hold/resume when goes off hold
am:
3ee63fdfb7
Change-Id: I12411fe421f62465360c7c03e2084baf403e2616
Christine Hallstrom [Thu, 27 Oct 2016 20:14:08 +0000 (13:14 -0700)]
Disable HFP audio path when HFP call goes on hold/resume when goes off hold
This fixes the issue where a cellular call made to a watch when an
HFP call is in progress causes the cellular audio to go through the
HFP path.
Bug:
32164561
Change-Id: I179ba4e1f1a1e76496f3062cc29bc20014fe5661
Ajay Panicker [Sat, 22 Oct 2016 02:15:26 +0000 (02:15 +0000)]
Prevent bonded device from being removed from the property map
am:
c4b1ccb468
Change-Id: I9d41d8834a5524c98bcb1e1d1ff2e67deb0a9501
Ajay Panicker [Fri, 21 Oct 2016 23:22:11 +0000 (16:22 -0700)]
Prevent bonded device from being removed from the property map
Bug:
31947953
Test: Manual
Change-Id: Ia2d25b305c07949a9251af83e855db4511ff887f
Ajay Panicker [Thu, 20 Oct 2016 23:02:44 +0000 (23:02 +0000)]
Add additional logging for device properties
am:
055babc4ab
Change-Id: I4bd929045faa9a0c59d639bb56ee5d56dfdfac42
Ajay Panicker [Thu, 20 Oct 2016 19:56:34 +0000 (12:56 -0700)]
Add additional logging for device properties
Bug:
31947953
Test: Manual
Change-Id: I7e23b55c03e7f0382d59efe9a94221ed4bdf57ab
Bryce Lee [Tue, 18 Oct 2016 16:32:49 +0000 (16:32 +0000)]
Merge "Implement new API for retrieving supported Bluetooth profiles." into cw-f-dev
Wei Liu [Mon, 10 Oct 2016 21:13:29 +0000 (14:13 -0700)]
Add some debug logs to the HeadsetClientService.
b/
31976064
Change-Id: I13602fbe6ef45f039a15d36ea0d1ac3802a9fddd
Bryce Lee [Sun, 9 Oct 2016 19:58:54 +0000 (12:58 -0700)]
Implement new API for retrieving supported Bluetooth profiles.
Bug:
26451648
Change-Id: I552882034e0289b643377d14bac4fb01c9018046
Andre Eisenbach [Fri, 7 Oct 2016 17:32:58 +0000 (17:32 +0000)]
Ensure LE scan clients are removed when the related app dies
am:
5185d1989c
Change-Id: I1e88954325ae3483442391357579fbf614805e46
Andre Eisenbach [Fri, 7 Oct 2016 00:39:31 +0000 (17:39 -0700)]
Ensure LE scan clients are removed when the related app dies
Use the passed in ScanClient in handleStopScan() to ensure that the
client appDied flag is in the correct state to ensure proper removal of
the client application reference.
Bug:
30681588
Change-Id: I0e0067a8e21ebd5f89870a7054b1f4092fe63ae1
Pavlin Radoslavov [Thu, 29 Sep 2016 01:59:20 +0000 (01:59 +0000)]
Cleanup BluetoothPbapReceiver log messages
am:
c295ebb2a7
Change-Id: I08de1ce6fa6b40077a86787455155a0a7f5f0141
Pavlin Radoslavov [Wed, 28 Sep 2016 23:58:07 +0000 (16:58 -0700)]
Cleanup BluetoothPbapReceiver log messages
Bug:
31442739
Bug:
31457305
Test: manual - checked logcat output for (lack of) excessive logs
Change-Id: I76f32dd950afd0a2949f38bfa6c0d4212b83357c
(cherry picked from commit
f36fc254ad196339a59c2ab00b555f4d8f601718)
Andre Eisenbach [Sat, 24 Sep 2016 00:22:41 +0000 (00:22 +0000)]
Limit number of stored device properties
am:
e8d2b5c0f5
Change-Id: I02e2934b8afc9018ca0036e369a4569f2528f8a9
Andre Eisenbach [Thu, 22 Sep 2016 21:30:32 +0000 (14:30 -0700)]
Limit number of stored device properties
Bug:
31651689
Change-Id: I6e31b4f89d6ebf9e6a0c6df5ea4e1a7be61a125a
Pavlin Radoslavov [Fri, 23 Sep 2016 00:23:21 +0000 (00:23 +0000)]
Merge "Enable debug logs by default in BluetoothPbapReceiver" into nyc-mr1-dev
am:
6f54bb4950
Change-Id: I68f80abf8a78eb6e7fd9b9c3d3112b10da8286c1
Pavlin Radoslavov [Fri, 23 Sep 2016 00:23:20 +0000 (00:23 +0000)]
Enable debug logs by default in BluetoothPbapReceiver
am:
dda1ef8844
Change-Id: Ic7117c244513f9d47b50596c93d117b251ec755d
Pavlin Radoslavov [Fri, 23 Sep 2016 00:23:11 +0000 (00:23 +0000)]
Enable debug logs for Bluetooth AdapterService
am:
baf3b9b6c4
Change-Id: I3e7869b4f1c6ccd3ecf501af8737864edefa57ab
TreeHugger Robot [Fri, 23 Sep 2016 00:08:58 +0000 (00:08 +0000)]
Merge "Enable debug logs by default in BluetoothPbapReceiver" into nyc-mr1-dev
pkanwar [Thu, 22 Sep 2016 05:20:52 +0000 (05:20 +0000)]
Merge "Collect number of paired BT devices." into nyc-mr1-dev
am:
2b8f0acc2c
Change-Id: I07a24d222bafa0cfd4a049bf2971a130a245d2a6
pkanwar [Thu, 22 Sep 2016 05:20:52 +0000 (05:20 +0000)]
Collect number of paired BT devices.
am:
f4386904eb
Change-Id: I57553542fa8201d1353adee0a02947f01e088b89
Pavlin Radoslavov [Thu, 22 Sep 2016 00:46:07 +0000 (17:46 -0700)]
Enable debug logs for Bluetooth AdapterService
Enabled log messages that are useful to debug the AdapterService state.
Remaining log messages are controlled by AdapterService.VERBOSE flag
and are disabled by default.
Bug:
31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7d81fd605f64e64f29aee37314821384234b286d
(cherry picked from commit
32a92489e9779d10c613a57d86135a7de6d3d7c4)
Pavlin Radoslavov [Thu, 15 Sep 2016 20:15:41 +0000 (13:15 -0700)]
Enable debug logs by default in BluetoothPbapReceiver
Enabled more logs to help identify issues when Bluetooth
is started because of PBAP.
Bug:
31442739
Bug:
31457305
Test: manual - checked logcat output for (lack of) excessive logs
Change-Id: I6348fe57a8b3546a8152416a5db95b8b2226e166
(cherry picked from commit
beacc3b09d1192c70c6385c5666e5706f7662a75)
TreeHugger Robot [Wed, 21 Sep 2016 22:57:23 +0000 (22:57 +0000)]
Merge "Collect number of paired BT devices." into nyc-mr1-dev
pkanwar [Tue, 20 Sep 2016 00:27:52 +0000 (17:27 -0700)]
Collect number of paired BT devices.
Bug:
31602591
Change-Id: I61adee8b20d57e2a1e284ed21a46d1766f059d4a
Ajay Panicker [Wed, 21 Sep 2016 06:05:17 +0000 (06:05 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours am:
8305951cca am:
8eb38035db am:
1bd3e02a8a am:
3998910222 -s ours am:
1981d50808 am:
bee9046a6b
am:
6bdeca6be2
Change-Id: Ie80cfc49a15762d0d91a740d377fb7e20351cbbb
Ajay Panicker [Wed, 21 Sep 2016 06:05:13 +0000 (06:05 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3 am:
b8b865d786 am:
5b10905e4f am:
ed611c8943 -s ours am:
dbf0fcea18 am:
95416561d3
am:
8214d20dea
Change-Id: I10882f06ec96517f70c28cec8dfac99a279d9fb7
Ajay Panicker [Wed, 21 Sep 2016 06:04:49 +0000 (06:04 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev am:
60b2ea959d -s ours am:
fcc8d6c900 am:
64998914de am:
0d4475fc01 -s ours am:
5c950df332 am:
1dc5800553 am:
e45190af67 am:
72c9d444c3 -s ours am:
fd4fdc2086 am:
585b49b657
am:
f319b3c15f
Change-Id: Ib09f2df08fc4649c8d1da95bba1ed1c20d6f80f9
Ajay Panicker [Wed, 21 Sep 2016 06:04:43 +0000 (06:04 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c am:
2f7e244816 -s ours am:
01bb2d1aac am:
5d2069d9dc am:
21a74c67ca am:
3dbe82ee89 -s ours am:
409014735a am:
91a29a46c7
am:
39b5a4c9aa
Change-Id: Ifd3733f4605e9e7b257b90f5aa8cb62f6807d056
Ajay Panicker [Wed, 21 Sep 2016 05:42:19 +0000 (05:42 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours am:
8305951cca am:
8eb38035db am:
1bd3e02a8a am:
3998910222 -s ours am:
1981d50808
am:
bee9046a6b
Change-Id: Ib386994982f2ece85c8e727ce67a6fb30e6ab07a
Ajay Panicker [Wed, 21 Sep 2016 05:42:16 +0000 (05:42 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3 am:
b8b865d786 am:
5b10905e4f am:
ed611c8943 -s ours am:
dbf0fcea18
am:
95416561d3
Change-Id: I8e3409b7912dc0a6eb79b14806079621330771e8
Ajay Panicker [Wed, 21 Sep 2016 05:41:51 +0000 (05:41 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev am:
60b2ea959d -s ours am:
fcc8d6c900 am:
64998914de am:
0d4475fc01 -s ours am:
5c950df332 am:
1dc5800553 am:
e45190af67 am:
72c9d444c3 -s ours am:
fd4fdc2086
am:
585b49b657
Change-Id: I691045af3fa321236ab70ad23e068eedc66ade3a
Ajay Panicker [Wed, 21 Sep 2016 05:41:46 +0000 (05:41 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c am:
2f7e244816 -s ours am:
01bb2d1aac am:
5d2069d9dc am:
21a74c67ca am:
3dbe82ee89 -s ours am:
409014735a
am:
91a29a46c7
Change-Id: I2f6f8b5b30c476a6b5b0833d986a6d602c947035
Ajay Panicker [Wed, 21 Sep 2016 05:25:38 +0000 (05:25 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5 am:
93d6266c04 am:
3512fd433a am:
eebe586729 -s ours am:
cb5b3f1045 am:
e8b3f00d9f
am:
99e5445002
Change-Id: Ib47fe55418c3a518f82e71aac8c1c6d25edf1c24
Ajay Panicker [Wed, 21 Sep 2016 04:16:34 +0000 (04:16 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5 am:
93d6266c04 am:
3512fd433a am:
eebe586729 -s ours am:
cb5b3f1045
am:
e8b3f00d9f
Change-Id: I6046781c590f1b5ff891d8eb726d71a4ff151364
Ajay Panicker [Wed, 21 Sep 2016 04:15:02 +0000 (04:15 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours am:
8305951cca am:
8eb38035db am:
1bd3e02a8a am:
3998910222 -s ours
am:
1981d50808
Change-Id: Id009d4da1f5df9afa36a8cdd30eac22d7fba97cf
Ajay Panicker [Wed, 21 Sep 2016 04:14:58 +0000 (04:14 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3 am:
b8b865d786 am:
5b10905e4f am:
ed611c8943 -s ours
am:
dbf0fcea18
Change-Id: I66b49929c7ed85f07f9d1317c9ee87aa08ad224e
Ajay Panicker [Wed, 21 Sep 2016 04:14:36 +0000 (04:14 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev am:
60b2ea959d -s ours am:
fcc8d6c900 am:
64998914de am:
0d4475fc01 -s ours am:
5c950df332 am:
1dc5800553 am:
e45190af67 am:
72c9d444c3 -s ours
am:
fd4fdc2086
Change-Id: Ie1f9aab57f23ef266f6ef4be50bd5db7b13286bc
Ajay Panicker [Wed, 21 Sep 2016 04:14:31 +0000 (04:14 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c am:
2f7e244816 -s ours am:
01bb2d1aac am:
5d2069d9dc am:
21a74c67ca am:
3dbe82ee89 -s ours
am:
409014735a
Change-Id: Ia6f3cae8acd5ba260d1751a3bed825cb17ed4157
Ajay Panicker [Wed, 21 Sep 2016 03:30:50 +0000 (03:30 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5 am:
93d6266c04 am:
3512fd433a am:
eebe586729 -s ours
am:
cb5b3f1045
Change-Id: Icd1c4d0cc713239e8405f118239411798b363ec4
Ajay Panicker [Wed, 21 Sep 2016 03:27:34 +0000 (03:27 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours am:
8305951cca am:
8eb38035db am:
1bd3e02a8a
am:
3998910222 -s ours
Change-Id: I70bfe58ce090142cca39f7a7a4392ede22233420
Ajay Panicker [Wed, 21 Sep 2016 03:27:28 +0000 (03:27 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3 am:
b8b865d786 am:
5b10905e4f
am:
ed611c8943 -s ours
Change-Id: I2adc0e26334ae8e113e7b0dcf4007d0d2ade4fa3
Ajay Panicker [Wed, 21 Sep 2016 03:27:03 +0000 (03:27 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev am:
60b2ea959d -s ours am:
fcc8d6c900 am:
64998914de am:
0d4475fc01 -s ours am:
5c950df332 am:
1dc5800553 am:
e45190af67
am:
72c9d444c3 -s ours
Change-Id: I69d37a74d8d4fe28de81b66a683040a2e67616ad
Ajay Panicker [Wed, 21 Sep 2016 03:26:37 +0000 (03:26 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c am:
2f7e244816 -s ours am:
01bb2d1aac am:
5d2069d9dc am:
21a74c67ca
am:
3dbe82ee89 -s ours
Change-Id: Ib93c5a5a44158f8c4137b5ff32d60e6c78b04508
Ajay Panicker [Wed, 21 Sep 2016 03:15:17 +0000 (03:15 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5 am:
93d6266c04 am:
3512fd433a
am:
eebe586729 -s ours
Change-Id: Ibf81f4cbec6d85dd7a04f7436f9b37df840f9221
Ajay Panicker [Wed, 21 Sep 2016 03:12:13 +0000 (03:12 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours am:
8305951cca am:
8eb38035db
am:
1bd3e02a8a
Change-Id: I76fad54c596e03425fae75109ef29409cc08f2e0
Ajay Panicker [Wed, 21 Sep 2016 03:10:46 +0000 (03:10 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3 am:
b8b865d786
am:
5b10905e4f
Change-Id: Ia877cdf3963562522cfab0c616666fffaa8d49fa
Ajay Panicker [Wed, 21 Sep 2016 02:57:59 +0000 (02:57 +0000)]
Fix setPairingConfirmation permissions issue (1/2) am:
df3304a333 am:
f8a47ce8ee am:
3ea7d86110 am:
ccca20484c am:
4a20ca7bae am:
8e9f9f4bd8
am:
9166d903bc
Change-Id: If486bbc25cda349d6a0298041f0c07a07f0ebe02
Andre Eisenbach [Wed, 21 Sep 2016 02:57:38 +0000 (02:57 +0000)]
Merge "Do not downgrade filtered scans to opportunistic" into nyc-mr1-dev
am:
5730ef9c85
Change-Id: Ib2d4434a41cf6f334436fe1febcab300e1c2635c
Andre Eisenbach [Wed, 21 Sep 2016 02:57:38 +0000 (02:57 +0000)]
Do not downgrade filtered scans to opportunistic
am:
8d6abb0a65
Change-Id: I4e3427a9b3a3155023f10a3f90b8182415b26293
Ajay Panicker [Wed, 21 Sep 2016 02:57:01 +0000 (02:57 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours am:
8305951cca
am:
8eb38035db
Change-Id: If56e630962e992a8396c8276f2af88d981fdf1a9
Ajay Panicker [Wed, 21 Sep 2016 02:56:57 +0000 (02:56 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours am:
107bf18aa3
am:
b8b865d786
Change-Id: I33ae4ede54f9e324aae18e7bdc5a9925f330ece5
Ajay Panicker [Wed, 21 Sep 2016 02:47:32 +0000 (02:47 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev am:
60b2ea959d -s ours am:
fcc8d6c900 am:
64998914de am:
0d4475fc01 -s ours am:
5c950df332 am:
1dc5800553
am:
e45190af67
Change-Id: I7558ac8a10b01f11be01a0fe4fc3a5ed1e37b329
Ajay Panicker [Wed, 21 Sep 2016 02:47:27 +0000 (02:47 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c am:
2f7e244816 -s ours am:
01bb2d1aac am:
5d2069d9dc
am:
21a74c67ca
Change-Id: I7bdc0971bba6d81b537d791288b3517bd91178a6
Ajay Panicker [Wed, 21 Sep 2016 02:40:36 +0000 (02:40 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5 am:
93d6266c04
am:
3512fd433a
Change-Id: I4d2bfb289f4cd685a07998df19459c2f5afb254c
Ajay Panicker [Wed, 21 Sep 2016 02:37:40 +0000 (02:37 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2)" into lmp-mr1-dev am:
0ccca8ac62 am:
56fc3a7642 am:
5bc4962e53 -s ours
am:
8305951cca
Change-Id: I92d2761c392537a1e49a5392e224c1809b311f98
Ajay Panicker [Wed, 21 Sep 2016 02:37:38 +0000 (02:37 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3dd11d0a34 am:
28dc531ac7 am:
460561cb28 -s ours
am:
107bf18aa3
Change-Id: Ice840bd87ac5248e89287bd0699442acdbc68681
Ajay Panicker [Wed, 21 Sep 2016 02:31:26 +0000 (02:31 +0000)]
Merge "[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours" into lmp-dev am:
60b2ea959d -s ours am:
fcc8d6c900 am:
64998914de am:
0d4475fc01 -s ours am:
5c950df332
am:
1dc5800553
Change-Id: I8bca79ec92f18fba4977c3b2179908752b1c0d93
Ajay Panicker [Wed, 21 Sep 2016 02:31:21 +0000 (02:31 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
3ccc668ff8 am:
2c3e8b5898 am:
77a38cb641 -s ours am:
1a3a6accdc -s ours am:
05a136ed33 am:
285c44140c am:
2f7e244816 -s ours am:
01bb2d1aac
am:
5d2069d9dc
Change-Id: I5f880aa9e6720349ddd1dae938a6653481e5c65d
Ajay Panicker [Wed, 21 Sep 2016 02:26:18 +0000 (02:26 +0000)]
Fix setPairingConfirmation permissions issue (1/2) am:
df3304a333 am:
f8a47ce8ee am:
3ea7d86110 am:
ccca20484c am:
4a20ca7bae
am:
8e9f9f4bd8
Change-Id: Iecae3b133a96b2195c64894f55a2330534834d5b
Ajay Panicker [Wed, 21 Sep 2016 02:24:49 +0000 (02:24 +0000)]
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (1/2) am:
554f13336e -s ours am:
8fe2b32637 am:
0c98432a94 am:
5ff155974f -s ours am:
0fb4bfd5b5
am:
93d6266c04
Change-Id: If5eca2ff7bae19928a0ed411c16da795aea1f183
OSDN Git Service
