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

Lucas Dupin [Tue, 1 Aug 2017 21:04:39 +0000 (21:04 +0000)]

Merge "Volume slider content description" into oc-mr1-dev
am: 34c949d2dc

Change-Id: I2acce419f4fb34a0b2d9ae46680c4acbbad60668

commit | commitdiff | tree

Lucas Dupin [Tue, 1 Aug 2017 20:49:39 +0000 (20:49 +0000)]

Merge "Volume slider content description" into oc-mr1-dev

commit | commitdiff | tree

Previr Rangroo [Tue, 1 Aug 2017 20:49:18 +0000 (20:49 +0000)]

Merge "Add new Dolby Vision Profile types" into oc-mr1-dev
am: 2ca4449d6b

Change-Id: I164e07c43d0538835759e734cea871503431ceb9

commit | commitdiff | tree

Love Khanna [Tue, 1 Aug 2017 20:36:06 +0000 (20:36 +0000)]

Merge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d
am: 1ce17014ce

Change-Id: I2171884ee232c3a94e9f764a516dcb1e302789fc

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Aug 2017 20:32:19 +0000 (20:32 +0000)]

Merge "Fix issue #64224738: Document return value of IBinder.transact()" into oc-mr1-dev
am: 47e6cc34bb

Change-Id: I8777f2dc71392fadfce534b1323e0f8ec8601427

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 20:31:01 +0000 (20:31 +0000)]

Merge "Add new Dolby Vision Profile types" into oc-mr1-dev

commit | commitdiff | tree

Adam Cohen [Tue, 1 Aug 2017 20:27:07 +0000 (20:27 +0000)]

Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am: 0151c395b5
am: 537c9c407e

Change-Id: Icf80d49a1541f57afcf77d4e7a59771f485ad47b

commit | commitdiff | tree

Love Khanna [Tue, 1 Aug 2017 20:22:09 +0000 (20:22 +0000)]

Merge "Set default value for T3T_PMM." into oc-dr1-dev am: 756d93964d
am: 7d8f6ab8e1

Change-Id: Ibb31cfee564cb74b23fdd2fd613829209e600500

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 20:16:06 +0000 (20:16 +0000)]

Merge "Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d am: d789b7b99f" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 20:12:44 +0000 (20:12 +0000)]

Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d
am: d789b7b99f

Change-Id: I1797d5fb9806f403ca113774382ed94d28f78f5d

commit | commitdiff | tree

Adam Cohen [Tue, 1 Aug 2017 20:11:03 +0000 (20:11 +0000)]

Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev am: 0151c395b5
am: 06a108c297

Change-Id: I45139ffa0da676ed80147f474d757600b725f585

commit | commitdiff | tree

Love Khanna [Tue, 1 Aug 2017 20:07:57 +0000 (20:07 +0000)]

Merge "Set default value for T3T_PMM." into oc-dr1-dev
am: 756d93964d

Change-Id: If491a922902bc18d282e4c3c3b4a689d78eac897

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 20:07:56 +0000 (20:07 +0000)]

Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d
am: 29b1a86af3

Change-Id: Ieace05c849161fefa9e911968c3306f93e65aea3

commit | commitdiff | tree

Love Khanna [Tue, 1 Aug 2017 20:03:44 +0000 (20:03 +0000)]

Merge "Set default value for T3T_PMM." into oc-dr1-dev
am: 756d93964d

Change-Id: Idf050b3f7a144a5074b33677269305d9eadd312d

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Aug 2017 20:01:32 +0000 (20:01 +0000)]

Merge "Fix issue #64224738: Document return value of IBinder.transact()" into oc-mr1-dev

commit | commitdiff | tree

Adam Cohen [Tue, 1 Aug 2017 19:57:28 +0000 (19:57 +0000)]

Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am: 0151c395b5

Change-Id: I027d106b11eb23bc056451c65cb89266cfea12e1

commit | commitdiff | tree

Adam Cohen [Tue, 1 Aug 2017 19:56:04 +0000 (19:56 +0000)]

Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am: 0151c395b5

Change-Id: I2ae775926cdd52e2e0fb00cd2c2fb2b7dc92e863

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 19:53:00 +0000 (19:53 +0000)]

Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am: 7d08ca6e4d

Change-Id: Id345173efdfb2ceed7449680ad9d9c252fbf8be2

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 19:52:08 +0000 (19:52 +0000)]

Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am: 7d08ca6e4d

Change-Id: I8e2c578cb564b2bc2de7c793eb40dea2639fa04e

commit | commitdiff | tree

Fyodor Kupolov [Tue, 1 Aug 2017 19:51:22 +0000 (19:51 +0000)]

Merge "Log package parse timings" into oc-mr1-dev
am: cd0d29e9fc

Change-Id: I5f0a4cffef76cc0b5124791009bd96e0a9078d3e

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 19:48:12 +0000 (19:48 +0000)]

Merge "Set default value for T3T_PMM." into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 19:46:29 +0000 (19:46 +0000)]

Merge "Log package parse timings" into oc-mr1-dev

commit | commitdiff | tree

Adam Cohen [Tue, 1 Aug 2017 19:41:42 +0000 (19:41 +0000)]

Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 19:41:10 +0000 (19:41 +0000)]

Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev

commit | commitdiff | tree

Felipe Leme [Tue, 1 Aug 2017 19:40:27 +0000 (19:40 +0000)]

Merge "Minor Autofill javadoc fix." into oc-mr1-dev
am: 7fecc73f52

Change-Id: Ia1dafe5e6be8df7b331f735da1d0c59c72f68891

commit | commitdiff | tree

Felipe Leme [Tue, 1 Aug 2017 19:33:25 +0000 (19:33 +0000)]

Merge "Minor Autofill javadoc fix." into oc-mr1-dev

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:20:30 +0000 (19:20 +0000)]

Merge "Reword analog audio not supported notification" into oc-dr1-dev am: 69840ca338
am: fb80072f99

Change-Id: Ic33159b91376eaec49f4115b1bf91419edbe6d21

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 19:17:31 +0000 (19:17 +0000)]

Merge "Merge "Reword analog audio not supported notification" into oc-dr1-dev am: 69840ca338 am: 89163cf020" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:15:49 +0000 (19:15 +0000)]

Merge "Reword analog audio not supported notification" into oc-dr1-dev am: 69840ca338
am: 89163cf020

Change-Id: Idf481243ae12d62e2fe492d7834ef0d8e7476a04

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 19:15:16 +0000 (19:15 +0000)]

Merge "Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am: 50d25dc00c am: 5d55b72645" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Tue, 1 Aug 2017 19:11:57 +0000 (19:11 +0000)]

Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am: 50d25dc00c
am: 5d55b72645

Change-Id: Ic5f17ce732774c02cd77810873b17ffd7ee33da5

commit | commitdiff | tree

Adam Lesinski [Tue, 1 Aug 2017 19:10:24 +0000 (19:10 +0000)]

Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev am: 50d25dc00c
am: c199e3fdf1

Change-Id: I9a0748044e5409853c13a72589b1cb505956ce50

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:03:57 +0000 (19:03 +0000)]

Merge "Reword analog audio not supported notification" into oc-dr1-dev
am: 69840ca338

Change-Id: Id3dc3a226f4830cd7ec748db826283d4889d82e0

commit | commitdiff | tree

Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:03:55 +0000 (19:03 +0000)]

Merge "Reword analog audio not supported notification" into oc-dr1-dev
am: 69840ca338

Change-Id: I6a9a611c13de7a63e6d5bdbf4718827f2295a28b

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 19:02:01 +0000 (19:02 +0000)]

Merge "Cleanup QS dialogs" into oc-dr1-dev am: cb5e0e63b4
am: 49ade8dc97

Change-Id: I59c1c114355a6e416b0ecba515e340e8c7e65668

commit | commitdiff | tree

Adam Lesinski [Tue, 1 Aug 2017 18:58:54 +0000 (18:58 +0000)]

Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
am: 50d25dc00c

Change-Id: Idfbbe397c5019d4f01502a5ee2ce7a04cd7efdba

commit | commitdiff | tree

Adam Lesinski [Tue, 1 Aug 2017 18:58:54 +0000 (18:58 +0000)]

Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
am: 50d25dc00c

Change-Id: I33fc54b3ae91f9e616022ccf2f6cf7e5440e0b25

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 18:57:13 +0000 (18:57 +0000)]

Merge "Merge "Cleanup QS dialogs" into oc-dr1-dev am: cb5e0e63b4 am: 41f4ab44a2" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 18:55:16 +0000 (18:55 +0000)]

Merge "Cleanup QS dialogs" into oc-dr1-dev am: cb5e0e63b4
am: 41f4ab44a2

Change-Id: I86f7a4bd3722a5980c0641d9f441afcc4044222c

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 18:51:53 +0000 (18:51 +0000)]

Merge "Reword analog audio not supported notification" into oc-dr1-dev

commit | commitdiff | tree

Calin Juravle [Tue, 1 Aug 2017 18:51:28 +0000 (18:51 +0000)]

Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
am: 565cab11ff

Change-Id: I11f2a6d1df31d1a27ce5295bcdf6fbbd540060bc

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 18:48:01 +0000 (18:48 +0000)]

Merge "Cleanup QS dialogs" into oc-dr1-dev
am: cb5e0e63b4

Change-Id: Ib51f630bfe644e9deaec73c32dc4f3d6aa9237b5

commit | commitdiff | tree

Adam Lesinski [Tue, 1 Aug 2017 18:47:42 +0000 (18:47 +0000)]

Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 18:47:22 +0000 (18:47 +0000)]

Merge "Cleanup QS dialogs" into oc-dr1-dev
am: cb5e0e63b4

Change-Id: Iae6cbee1ff7901bc36f38343e822b99063e8fe57

commit | commitdiff | tree

Calin Juravle [Tue, 1 Aug 2017 18:38:05 +0000 (18:38 +0000)]

Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev

* changes:
Use the class loader context when optimizing secondary dex files
Add DexClassLoader to the list of supported class loaders

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 18:36:36 +0000 (18:36 +0000)]

Merge "Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am: 39a556f1d8 am: 9e7e827d05" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Alison Cichowlas [Tue, 1 Aug 2017 18:33:41 +0000 (18:33 +0000)]

Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am: 39a556f1d8
am: b7ac4ca5a8

Change-Id: I320e50928e251d62fcbe852e13c8d87792aad81c

commit | commitdiff | tree

Alison Cichowlas [Tue, 1 Aug 2017 18:33:20 +0000 (18:33 +0000)]

Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am: 39a556f1d8
am: 9e7e827d05

Change-Id: I4c041cd9b5c62eacde3afea19188f0d4a5ea94a6

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 18:31:15 +0000 (18:31 +0000)]

Merge "Cleanup QS dialogs" into oc-dr1-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Aug 2017 18:20:34 +0000 (18:20 +0000)]

Merge "Fix issue #64140901: Maps crashed entering PIP right after..." into oc-mr1-dev
am: bd3d2900a3

Change-Id: I2f2f6d3c6177f1324421643e01e9bd6cf20b6d75

commit | commitdiff | tree

Alison Cichowlas [Tue, 1 Aug 2017 18:18:49 +0000 (18:18 +0000)]

Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am: 39a556f1d8

Change-Id: Idd341f7969c40184327428fc27b9f597dab57905

commit | commitdiff | tree

Alison Cichowlas [Tue, 1 Aug 2017 18:18:45 +0000 (18:18 +0000)]

Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am: 39a556f1d8

Change-Id: I51580faadf97d828d5b2c4d7adba99cd7d36d4f2

commit | commitdiff | tree

Alison Cichowlas [Tue, 1 Aug 2017 18:06:39 +0000 (18:06 +0000)]

Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 1 Aug 2017 18:06:13 +0000 (18:06 +0000)]

Merge "Fix issue #64140901: Maps crashed entering PIP right after..." into oc-mr1-dev

commit | commitdiff | tree

Tomasz Wasilczyk [Tue, 1 Aug 2017 17:59:37 +0000 (17:59 +0000)]

Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev
am: f299ab10e7

Change-Id: Ia2955b23a8e07a7ca921c93187454c488be08041

commit | commitdiff | tree

Tomasz Wasilczyk [Tue, 1 Aug 2017 17:43:02 +0000 (17:43 +0000)]

Merge "Add permission annotation to RadioManager methods." into oc-mr1-dev

commit | commitdiff | tree

Lucas Dupin [Tue, 1 Aug 2017 17:36:10 +0000 (10:36 -0700)]

Volume slider content description

Volume, ring and acessibility sliders now report their names
when talk back is on.

Examples:
26% acessibility seek control, use volume keys to adjust.
0% ring seek control, disabled.

Change-Id: I0a775a9b90254c9f338b9f4f38efbff10f626853
Fixes: 62354047
Test: Turn talk back on, tap on volume sliders

commit | commitdiff | tree

Seigo Nonaka [Tue, 1 Aug 2017 17:35:14 +0000 (17:35 +0000)]

Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev
am: 1c34ba15b5

Change-Id: I6082a49060d322c068b9af4e5b6e169cff6a86bb

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 17:29:35 +0000 (17:29 +0000)]

Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]

Set default value for T3T_PMM.

If HCEF Application does not provide the T3T PMM value, set the
default value (FFFFFFFFFFFFFFFF) as per NCI specification.

Bug: 64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
(cherry picked from commit 20a77e973f62f145ab7b3a4822ce34407c0ca476)

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 17:04:44 +0000 (17:04 +0000)]

Merge "Merge "Fix QS wifi scan state" into oc-dr1-dev am: ce099ba8bc am: 9b08d7758b" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 17:01:38 +0000 (17:01 +0000)]

Merge "Fix QS wifi scan state" into oc-dr1-dev am: ce099ba8bc
am: a18e39e6af

Change-Id: Ib939563246c8ff709e8c2d5e867548a98f81cc8f

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 17:01:38 +0000 (17:01 +0000)]

Merge "Fix QS wifi scan state" into oc-dr1-dev am: ce099ba8bc
am: 9b08d7758b

Change-Id: Iec7997260ffc57eb7016e71189af1854bc8e3015

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 16:51:19 +0000 (16:51 +0000)]

Merge "Fix QS wifi scan state" into oc-dr1-dev
am: ce099ba8bc

Change-Id: I314e569a00bf8679739f8e25e8eaa6af76c8c5ce

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 16:51:18 +0000 (16:51 +0000)]

Merge "Fix QS wifi scan state" into oc-dr1-dev
am: ce099ba8bc

Change-Id: Ibd2879449d580e73631e2199b68e78eaae53e788

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 16:41:43 +0000 (16:41 +0000)]

Merge "Fix QS wifi scan state" into oc-dr1-dev

commit | commitdiff | tree

Jason Monk [Fri, 28 Jul 2017 18:35:13 +0000 (14:35 -0400)]

Make it easier to click on phone nav buttons

When touches fall through the normal click targets, redirect them
to the nearest view.

Test: runtest systemui
Change-Id: I48267d9b1e15bf8dbe8725b72326751b03196efa
Fixes: 64080938

commit | commitdiff | tree

Makoto Onuki [Tue, 1 Aug 2017 16:26:14 +0000 (16:26 +0000)]

Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
am: f6764fb7f7

Change-Id: I3cfd72a897157c29d19956be302dbc47cffc03db

commit | commitdiff | tree

Makoto Onuki [Tue, 1 Aug 2017 16:11:27 +0000 (16:11 +0000)]

Merge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev

commit | commitdiff | tree

Paul Mclean [Tue, 1 Aug 2017 15:51:09 +0000 (15:51 +0000)]

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am: f3562ffdfb
am: 18d64cf8fe

Change-Id: I58ccad1327cf6153c5acc8e498aaaa44b8bfd6c6

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:45:42 +0000 (15:45 +0000)]

Merge "Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am: f3562ffdfb am: 3e62b611f0" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Paul Mclean [Tue, 1 Aug 2017 15:43:51 +0000 (15:43 +0000)]

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev am: f3562ffdfb
am: 3e62b611f0

Change-Id: I4d5c511c043048e79b4846febda85f521fb59f31

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:43:03 +0000 (15:43 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours am: 8d2fceae4a -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:41:40 +0000 (15:41 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours am: 08674f3a25 -s ours" into oc-mr1-dev-plus-aosp

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours
am: 8d2fceae4a -s ours

Change-Id: I841376129cb7ebc1bcccde8d5b82b3b96e657513

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours
am: 08674f3a25 -s ours

Change-Id: I08a17c4bfc3ec26a707b903a7f244a6f9387cc30

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:35:42 +0000 (15:35 +0000)]

Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: cd68805540" into oc-dr1-dev-plus-aosp am: bd52fdab6b" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Paul Mclean [Tue, 1 Aug 2017 15:35:05 +0000 (15:35 +0000)]

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am: f3562ffdfb

Change-Id: I0304bf7c72a340f4bebebea89d2e934ae5830b33

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 15:32:57 +0000 (15:32 +0000)]

Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: cd68805540" into oc-dr1-dev-plus-aosp
am: bd52fdab6b

Change-Id: I44d425037ff844f69669983f84baf2539537f2b1

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:32:44 +0000 (15:32 +0000)]

Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: cd68805540 am: 20b54acfa8" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Paul Mclean [Tue, 1 Aug 2017 15:32:21 +0000 (15:32 +0000)]

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am: f3562ffdfb

Change-Id: I7af6e0b15e2a09c636a2d540714bfc5dd2d459f9

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:32:09 +0000 (15:32 +0000)]

Merge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: 5e76d54639" into oc-dr1-dev-plus-aosp am: cb7faac044" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 15:31:16 +0000 (15:31 +0000)]

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: cd68805540
am: 20b54acfa8

Change-Id: Ie25d37fa283f37924e07caf9ed0cfb850e2c710d

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 15:30:17 +0000 (15:30 +0000)]

Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: 5e76d54639" into oc-dr1-dev-plus-aosp
am: cb7faac044

Change-Id: I098430c5e2f0fedcbffa64ee53daf348e8f0928d

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:29:55 +0000 (15:29 +0000)]

Merge changes from topic 'am-94906183e52945938953177851714b42' into oc-mr1-dev-plus-aosp

* changes:
Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a am: 5223106231 am: 995d020232
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours am: 17e2448c26 -s ours am: 0dbabf02f2 -s ours am: 636750bd98 -s ours

commit | commitdiff | tree

Paul Mclean [Tue, 1 Aug 2017 15:28:27 +0000 (15:28 +0000)]

Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 15:25:59 +0000 (15:25 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a am: 5223106231
am: d387ade2f3

Change-Id: I51e56faaadd2a9ab20192e1867daaf59b567bea0

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 15:24:58 +0000 (15:24 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a am: 5223106231
am: 995d020232

Change-Id: Idba21de2b3f3dc24e91bbeaa5179c9b4c86cf2e8

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 15:24:37 +0000 (15:24 +0000)]

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours am: 17e2448c26 -s ours am: 0dbabf02f2 -s ours
am: 4dcf4740c4 -s ours

Change-Id: I9554a163f16bfb5030128d7184c06b6dae23dce5

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 040c26f636 -s ours

Change-Id: I2ff8751dcedf1648b145a559c0dabce42f944bf0

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 040c26f636 -s ours

Change-Id: I696a2a7a8ca66a4f901640e4f83c6c31f2c43d4d

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 15:24:00 +0000 (15:24 +0000)]

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours am: 17e2448c26 -s ours am: 0dbabf02f2 -s ours
am: 636750bd98 -s ours

Change-Id: I95fed2b7514f5d27b1091fc2176ec3d7413b2747

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 15:18:52 +0000 (15:18 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:18:48 +0000 (15:18 +0000)]

Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: cd68805540" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 1 Aug 2017 15:17:25 +0000 (15:17 +0000)]

Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d am: 5e76d54639" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 15:16:45 +0000 (15:16 +0000)]

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d
am: cd68805540

Change-Id: Iaf585d7d9489cc35b834b6907232ad9dd3185ec7

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 15:15:26 +0000 (15:15 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am: 502986f72a am: 257910c493
am: 6591568f27

Change-Id: I1b952ccc528999e3dbe58a16ba025a1634ddc06d

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 15:15:06 +0000 (15:15 +0000)]

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d
am: cd68805540

Change-Id: I5c2264ef11bb4e3275e1b32b0b8f6eb44fffd500

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 15:14:56 +0000 (15:14 +0000)]

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276 am: d88f4b723d
am: 5e76d54639

Change-Id: Ia8c8aa458f3b8e57eaa7253fe87bad1efe5e23c9

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 15:14:02 +0000 (15:14 +0000)]

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours am: ff55799950 -s ours am: 17e2448c26 -s ours am: 7cf8e71e33 -s ours
am: f94f0f3c64 -s ours

Change-Id: Iecd2b076021a844f688f8221e204c22300ed1c93