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

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

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

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: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

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

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

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

commit | commitdiff | tree

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

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

Change-Id: I87ec29fb8b0ec5f61841b0596f0628d1e6cb0c71

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 15:12:15 +0000 (15:12 +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

Change-Id: Ie1a18b001d85450f6458f33b75b0f2f3965a81a9

commit | commitdiff | tree

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

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

Change-Id: I86eb04b02e44eb827509888746010d18bba8a997

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 15:10:35 +0000 (15:10 +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

Change-Id: I5b252535638054e87fb3cc6069d51a6c4da7dce0

commit | commitdiff | tree

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

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

Change-Id: I413cdc0d2075cbad6f5409318ad58e394733a5e3

commit | commitdiff | tree

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

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

Change-Id: I63d677df2353fff2d2e786e25b0dc416837f1581

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 15:03:31 +0000 (15:03 +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

Change-Id: Idf2184eb808068366384031694c7fa89fe49c8bb

commit | commitdiff | tree

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

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

Change-Id: I538ec037d1eb1b2ef8970d527a2d9aa53fd7fad8

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:56:23 +0000 (14:56 +0000)]

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

Change-Id: Ic615cfdefcf6a226c868e9203e74070e9000a931

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 14:55:26 +0000 (14:55 +0000)]

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

Change-Id: Ia38655a26410e9ea78e394e5c59e052739f041a6

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:52:13 +0000 (14:52 +0000)]

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

Change-Id: Idae1def3c8dc80d7f5e3cd83438553cf099541a7

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 14:50:36 +0000 (14:50 +0000)]

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

Change-Id: Idc2217a66f60caa783957fd6caeaafa1ff1615bc

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]

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

Change-Id: I5d96dd73affe79880583347e32a95be8510a5462

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 14:38:02 +0000 (10:38 -0400)]

Cleanup QS dialogs

Test: manual
Change-Id: I3a87b171d9000ac6628f3d83fc2a817136dc3010
Fixes: 64159285
Fixes: 64158814

commit | commitdiff | tree

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

Merge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b
am: 9295f58d26

Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]

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

Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29

commit | commitdiff | tree

Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am: 456b91561d -s ours
am: ff55799950 -s ours

Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70

commit | commitdiff | tree

Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]

Merge "power: gps: add gps read timeout" into cw-f-dev

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev
am: f18599a15b

Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f

commit | commitdiff | tree

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

DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am: 456b91561d -s ours

Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 1 Aug 2017 14:23:11 +0000 (14:23 +0000)]

Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am: 861b35e1df
am: d536ba3f41

Change-Id: Ie3a3f9ad7f4294fbfa4f4162b026e1df2e5cf641

commit | commitdiff | tree

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

Merge "Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am: 861b35e1df am: 7662de2771" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 1 Aug 2017 14:16:46 +0000 (14:16 +0000)]

Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am: 861b35e1df
am: 7662de2771

Change-Id: Ib93c18b5b04030d8b0840ce8a813bd57a982e1d0

commit | commitdiff | tree

Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]

Merge changes I49a76582,Iac4b75bc into cw-f-dev

* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking

commit | commitdiff | tree

Neil Fuller [Tue, 1 Aug 2017 14:14:33 +0000 (14:14 +0000)]

Merge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev
am: d4ea42d8db

Change-Id: I878e8bf78e83e93a2e80b3485676553b94026612

commit | commitdiff | tree

Jason Monk [Tue, 1 Aug 2017 14:13:43 +0000 (10:13 -0400)]

Fix QS wifi scan state

Test: manual
Change-Id: Icc4e627f1248b5749801ad532220b3b9fade036d
Fixes: 63648257

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 1 Aug 2017 14:09:10 +0000 (14:09 +0000)]

Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am: 861b35e1df

Change-Id: Ib0c2a708e2556fc604631891666b70a841a1129a

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 1 Aug 2017 14:08:36 +0000 (14:08 +0000)]

Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am: 861b35e1df

Change-Id: I4ee3ad06138a66b47bca6e56fbbd0bd970d91e08

commit | commitdiff | tree

Neil Fuller [Tue, 1 Aug 2017 14:06:19 +0000 (14:06 +0000)]

Merge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev

commit | commitdiff | tree

Geoffrey Pitsch [Tue, 1 Aug 2017 14:00:22 +0000 (14:00 +0000)]

Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev

commit | commitdiff | tree

Narayan Kamath [Tue, 1 Aug 2017 11:46:53 +0000 (11:46 +0000)]

Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev
am: 735ed6c011

Change-Id: I320bc044611da195b13b5976b827a70edc71bcb3

commit | commitdiff | tree

Narayan Kamath [Tue, 1 Aug 2017 11:38:45 +0000 (11:38 +0000)]

Merge "PrintManagerService: Don't prune services on all package change events." into oc-mr1-dev

commit | commitdiff | tree

Neil Fuller [Tue, 1 Aug 2017 10:12:17 +0000 (10:12 +0000)]

Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
am: 70ddf0932b

Change-Id: I5cf42b8926f4e0d22bff50d90a007b6c04530b8b

commit | commitdiff | tree

Narayan Kamath [Mon, 31 Jul 2017 10:10:50 +0000 (11:10 +0100)]

PrintManagerService: Don't prune services on all package change events.

We should only need to prune services if the package that changed
had a print service or has been changed to have a print service.

Bug: 63019430
Test: Manual; observed that the print spooler isn't started up.
Test: run cts -m CtsPrintTestCases

Change-Id: I32df27e4b1d11615cf6053dd3d35c2b60068d0d3

commit | commitdiff | tree

Neil Fuller [Tue, 1 Aug 2017 10:06:16 +0000 (10:06 +0000)]

Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev

commit | commitdiff | tree

Neil Fuller [Tue, 1 Aug 2017 09:19:12 +0000 (09:19 +0000)]

Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
am: ce24dd382d

Change-Id: Ifadd27aa8f05efc2244aef76fa18e6ee245b72e2

commit | commitdiff | tree

Neil Fuller [Tue, 1 Aug 2017 09:11:18 +0000 (09:11 +0000)]

Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev

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

Change-Id: Ib215cd0c63c44e547519b9beacc903b05de1ef24

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 4dd25981b9 -s ours

Change-Id: I0c3f52c12d789e16e5e340f3f6960caa3a00d2c0

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 08:05:33 +0000 (08:05 +0000)]

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

commit | commitdiff | tree

TreeHugger Robot [Tue, 1 Aug 2017 07:58:07 +0000 (07:58 +0000)]

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

commit | commitdiff | tree

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

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours am: fb80235f41 -s ours" into oc-mr1-dev-plus-aosp

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours
am: 18a4f6b083 -s ours

Change-Id: I94ebb6cf7bfcc632a8fa9fc608519f53b05f0a51