OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Fix QS wifi scan state" into oc-dr1-dev am: ce099ba8bc
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

6 years agoMerge "Fix QS wifi scan state" into oc-dr1-dev
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

6 years agoMerge "Fix QS wifi scan state" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 16:41:43 +0000 (16:41 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev

6 years agoMerge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
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

6 years agoMerge "Revert "Reduce duplicate strings due to the package cache."" into oc-mr1-dev
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

6 years agoMerge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic...
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

6 years agoMerge "Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection...
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

6 years agoMerge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic...
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

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 ...
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

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 ...
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours
Bill Yi [Tue, 1 Aug 2017 15:41:13 +0000 (15:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636  -s ours
am: 8d2fceae4a  -s ours

Change-Id: I841376129cb7ebc1bcccde8d5b82b3b96e657513

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours
Bill Yi [Tue, 1 Aug 2017 15:40:03 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636  -s ours
am: 08674f3a25  -s ours

Change-Id: I08a17c4bfc3ec26a707b903a7f244a6f9387cc30

6 years agoMerge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd...
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

6 years agoMerge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic...
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

6 years agoMerge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am:...
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

6 years agoMerge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am:...
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

6 years agoMerge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic...
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

6 years agoMerge "Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276...
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

6 years agoMerge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am:...
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

6 years agoMerge changes from topic 'am-94906183e52945938953177851714b42' into oc-mr1-dev-plus...
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

6 years agoMerge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am...
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 15:24:32 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 040c26f636  -s ours

Change-Id: I2ff8751dcedf1648b145a559c0dabce42f944bf0

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 15:24:27 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 040c26f636  -s ours

Change-Id: I696a2a7a8ca66a4f901640e4f83c6c31f2c43d4d

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 15:18:52 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am:...
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

6 years agoMerge "Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am:...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276...
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am...
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am...
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26 am...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd am: b5da08a276
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b am: 9295f58d26
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev am: f18599a15b
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler...
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

6 years agoMerge "power: gps: add gps read timeout" into cw-f-dev
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev
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

6 years agoDO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
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

6 years agoMerge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am...
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

6 years agoMerge "Merge "Disable AOD when accessibility color inversion is on." into oc-dr1...
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

6 years agoMerge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev am...
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

6 years agoMerge changes I49a76582,Iac4b75bc into cw-f-dev
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

6 years agoMerge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev
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

6 years agoFix QS wifi scan state
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

6 years agoMerge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
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

6 years agoMerge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
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

6 years agoMerge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev
Neil Fuller [Tue, 1 Aug 2017 14:06:19 +0000 (14:06 +0000)]
Merge "Remove redundant TODOs from PackageTracker" into oc-mr1-dev

6 years agoMerge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
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

6 years agoMerge "PrintManagerService: Don't prune services on all package change events." into...
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

6 years agoMerge "PrintManagerService: Don't prune services on all package change events." into...
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

6 years agoMerge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
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

6 years agoPrintManagerService: Don't prune services on all package change events.
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

6 years agoMerge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev
Neil Fuller [Tue, 1 Aug 2017 10:06:16 +0000 (10:06 +0000)]
Merge "Add a new constant to TimeZoneRulesDataContract" into oc-mr1-dev

6 years agoMerge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
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

6 years agoMerge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev
Neil Fuller [Tue, 1 Aug 2017 09:11:18 +0000 (09:11 +0000)]
Merge "Fix tracing call for RulesManagerService startup" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 08:15:31 +0000 (08:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: f2b81340f5  -s ours

Change-Id: Ib215cd0c63c44e547519b9beacc903b05de1ef24

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 1 Aug 2017 08:07:54 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 4dd25981b9  -s ours

Change-Id: I0c3f52c12d789e16e5e340f3f6960caa3a00d2c0

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 08:05:33 +0000 (08:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 07:58:07 +0000 (07:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 ...
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours
Bill Yi [Tue, 1 Aug 2017 07:48:01 +0000 (07:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9  -s ours
am: 18a4f6b083  -s ours

Change-Id: I94ebb6cf7bfcc632a8fa9fc608519f53b05f0a51

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9 -s ours
Bill Yi [Tue, 1 Aug 2017 07:48:01 +0000 (07:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7eca0300b9  -s ours
am: fb80235f41  -s ours

Change-Id: Ia65005887ed720a1d90fe93f5bc86a285c38df0c

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 07:41:04 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7eca0300b9  -s ours

Change-Id: I28041089f69930af33b4ab93d031a2c2efceb0ab

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 07:41:01 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7eca0300b9  -s ours

Change-Id: I0a52d4ad04ee589d80dd34f218eba693097aa979

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 07:32:58 +0000 (07:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee
Yohei Yukawa [Tue, 1 Aug 2017 06:23:47 +0000 (06:23 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee
am: dd730a1796

Change-Id: I47e49fdb37ad53ef18c9f4839317480a51d92cca

6 years agoMerge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee
Yohei Yukawa [Tue, 1 Aug 2017 06:17:58 +0000 (06:17 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev am: dbd60cd6ee
am: 0da3dce9b4

Change-Id: Ice71e70788d42c33271f9a3b1612fe142da9b561

6 years agoMerge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:11:09 +0000 (06:11 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am: dbd60cd6ee

Change-Id: I919a34c60181f4582992d4d7bf7838b66051b39d

6 years agoMerge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:11:02 +0000 (06:11 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am: dbd60cd6ee

Change-Id: I5b6ff8bb9913fb43386c51fd47ae5e80e76541f2

6 years agoMerge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:01:20 +0000 (06:01 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev

6 years agoMerge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
Hugo Benichi [Tue, 1 Aug 2017 05:27:59 +0000 (05:27 +0000)]
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
am: 4f48862d0f  -s ours

Change-Id: I66aa7d2d7128272bedc04568dbdcb759a3be8afe

6 years agoMerge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 05:17:52 +0000 (05:17 +0000)]
Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev

6 years agoMerge "power: gps: add gps read timeout" into oc-mr1-dev
z00208928 [Tue, 1 Aug 2017 03:54:56 +0000 (03:54 +0000)]
Merge "power: gps: add gps read timeout" into oc-mr1-dev
am: 7e22a7eed3

Change-Id: Ic4a3d52b13d978de62a22656095c78094024eb90

6 years agoMerge "power: gps: add gps read timeout" into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 03:47:09 +0000 (03:47 +0000)]
Merge "power: gps: add gps read timeout" into oc-mr1-dev

6 years agoNsdManager: remove duplicated argument validation
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
NsdManager: remove duplicated argument validation

This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.

This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.

This patch also includes a couple of other small cleanups.

Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug: 35362108
Bug: 37013369
Bug: 62044295
Bug: 63826516
Merged-In: Iaad13e13976e9bf8f508d7188f823f8184ac414b

(cherry pick from commit ff3e6ccca1715ae72c6499cc7c894d27f46e8403)

Change-Id: I5e6a1ecc6b98069ef0089bbceecf73f7692df227

6 years agoMerge "Add documentation on oneway transaction ordering." into oc-mr1-dev
Dianne Hackborn [Tue, 1 Aug 2017 02:28:46 +0000 (02:28 +0000)]
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev
am: 0b8f281637

Change-Id: Id6d9e01440abc7940a1e39edf6a5eee3b83d83b7

6 years agoMerge "Add documentation on oneway transaction ordering." into oc-mr1-dev
TreeHugger Robot [Tue, 1 Aug 2017 02:21:21 +0000 (02:21 +0000)]
Merge "Add documentation on oneway transaction ordering." into oc-mr1-dev

6 years agoMerge "Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev...
Android Build Merger (Role) [Tue, 1 Aug 2017 02:19:31 +0000 (02:19 +0000)]
Merge "Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev am: 46b2968ff9" into oc-mr1-dev-plus-aosp

6 years agoMerge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev
Michael Plass [Tue, 1 Aug 2017 02:14:37 +0000 (02:14 +0000)]
Merge "Document WifiManager.getConnectionInfo permission" into oc-mr1-dev
am: 46b2968ff9

Change-Id: I5503d3cc37c2371e86430bab1897d87f702c748f

6 years agoMerge "Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated...
Android Build Merger (Role) [Tue, 1 Aug 2017 02:13:38 +0000 (02:13 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841  -s ours am: 65d806d043  -s ours am: 6b2d37ca25  -s ours am: 1831989a6e  -s ours am: e0947f27d1  -s ours" into oc-mr1-dev-plus-aosp

6 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
Tyler Freeman [Tue, 1 Aug 2017 02:09:44 +0000 (02:09 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841  -s ours am: 65d806d043  -s ours am: 6b2d37ca25  -s ours am: a4f4b537cc  -s ours
am: b9c03e5c13  -s ours

Change-Id: I92382698bd92d54b1d463aa80573e11daae3b477

6 years agoMerge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchrono...
Tyler Freeman [Tue, 1 Aug 2017 02:08:42 +0000 (02:08 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841  -s ours am: 65d806d043  -s ours am: 6b2d37ca25  -s ours am: 1831989a6e  -s ours
am: e0947f27d1  -s ours

Change-Id: Id7fc08b5774c84e1ebb73a37d95070e8310a90f3

6 years agoMerge "Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated...
Android Build Merger (Role) [Tue, 1 Aug 2017 02:04:36 +0000 (02:04 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am: a053eaa841  -s ours am: 65d806d043  -s ours am: 6b2d37ca25  -s ours am: 1831989a6e  -s ours am: c20422ab40  -s ours" into oc-mr1-dev-plus-aosp