Commit Graph

321133 Commits

Author SHA1 Message Date
Hyunyoung Song
537a788091 Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
am: bb4aeb19be

Change-Id: Ie9996ca6a1197dbaf877229c932eba758e15eb5d
2017-06-07 07:58:58 +00:00
TreeHugger Robot
bb4aeb19be Merge "Change Android default icon b/35314247 Test: manual" into oc-dev 2017-06-07 07:50:21 +00:00
Michael Wright
d581113dc1 Merge "Actually wait until the display is ready." into oc-dev
am: 496267f93b

Change-Id: I41bf93f65c215cc841485c7570c7a7e78a0fdf93
2017-06-07 07:32:49 +00:00
TreeHugger Robot
496267f93b Merge "Actually wait until the display is ready." into oc-dev 2017-06-07 07:22:59 +00:00
Tyler Freeman
8cb653925b Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
am: ac36c42a86

Change-Id: Ib30211346cbce8dbb0853469c17994f23b7c456d
2017-06-07 06:38:38 +00:00
TreeHugger Robot
ac36c42a86 Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev 2017-06-07 06:33:10 +00:00
Jorim Jaggi
3a981207ce Merge "Fix crash in test" into oc-dev
am: d5ece513ec

Change-Id: I923f532600fe7b3fe372fd4cf2469c2ea2b03569
2017-06-07 04:20:40 +00:00
TreeHugger Robot
d5ece513ec Merge "Fix crash in test" into oc-dev 2017-06-07 04:12:50 +00:00
Android Build Merger (Role)
721ecfd21a Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am: 8d06d8cbf1" into oc-dev-plus-aosp 2017-06-07 03:50:37 +00:00
Doris Liu
a41b26481c Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
am: 8d06d8cbf1

Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969
2017-06-07 03:49:44 +00:00
Hugo Benichi
335a1d36ea Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd am: 24912bb93d
am: 41415facc8

Change-Id: Ic93c6170813b8c43176d57b534e405500c4639c1
2017-06-07 03:47:17 +00:00
Doris Liu
8d06d8cbf1 Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev 2017-06-07 03:43:13 +00:00
Hugo Benichi
41415facc8 Merge "Revert "Captive portal login shows specific network name"" am: 7f423d00dd
am: 24912bb93d

Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78
2017-06-07 03:41:13 +00:00
Hugo Benichi
24912bb93d Merge "Revert "Captive portal login shows specific network name""
am: 7f423d00dd

Change-Id: I0d77f19cadbf5905215ae576e66057a259f2348e
2017-06-07 03:32:09 +00:00
Hugo Benichi
7f423d00dd Merge "Revert "Captive portal login shows specific network name"" 2017-06-07 03:23:18 +00:00
Hugo Benichi
ef0884f2e5 Revert "Captive portal login shows specific network name"
This reverts commit 8032ff32ff.

Several branches are broken because of this.

Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d
2017-06-07 03:22:20 +00:00
Hugo Benichi
8d60db5241 Merge "Captive portal login shows specific network name" am: ea7322d17e am: d4cb33b83f
am: 6f2d79464d

Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd
2017-06-07 02:56:15 +00:00
Hugo Benichi
6f2d79464d Merge "Captive portal login shows specific network name" am: ea7322d17e
am: d4cb33b83f

Change-Id: Ie52f17dced7db6dfb6c58f935bf976ff72fa723d
2017-06-07 02:49:05 +00:00
Hugo Benichi
d4cb33b83f Merge "Captive portal login shows specific network name"
am: ea7322d17e

Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66
2017-06-07 02:42:36 +00:00
Hugo Benichi
ea7322d17e Merge "Captive portal login shows specific network name" 2017-06-07 02:33:04 +00:00
Doris Liu
88bb31b954 Better handle non-recommended use and warn against it in JavaDoc
BUG: 62386748
Test: Follow repro steps in b/62358678. The issue is no
longer reproducible

Change-Id: Ic3cec7c4947296224edb5365d81988d4da7ee5e1
2017-06-07 01:41:34 +00:00
Tyler Freeman
319a34ae87 Vibrator: Allow priority vibrations in low-power mode for accessibility.
This is mainly for Wear devices that don't have speakers.

Bug: 37543478

Test: Manual:
1. Activate low power mode `adb shell dumpsys battery unplug && adb shell settings put global low_power 1`
2. Then see if Alarm/Timer will vibrate.
3. Send a Hangout Test notification, make sure it does NOT vibrate.

On phones there should be no change. Alarms will not vibrate.

Change-Id: Ia6dffa7e528886e7c84390dbb33b44f298c7afa4
2017-06-06 18:12:50 -07:00
Evan Rosky
2b64c87366 Merge "Don't report focusableViewAvailable on add" into oc-dev
am: 8d4b72c68a

Change-Id: I4169c2ecf3890946090e4c171a666292262118f6
2017-06-07 01:09:17 +00:00
Evan Rosky
8d4b72c68a Merge "Don't report focusableViewAvailable on add" into oc-dev 2017-06-07 01:02:21 +00:00
Felipe Leme
4d47d7ad46 Merge "Fixed autofill filter comparison." into oc-dev
am: 72f2d98c5a

Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505
2017-06-07 00:55:27 +00:00
Felipe Leme
34e7f3b6ba Merge "Improved debug to diagnose Save issues." into oc-dev
am: be4420cf13

Change-Id: Id65b8d62403af8883503d5b31903d73751f33bf2
2017-06-07 00:51:31 +00:00
Felipe Leme
08365011a2 Merge "Use initial value on save when value didn't change." into oc-dev
am: 2e723982d5

Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d
2017-06-07 00:46:53 +00:00
Felipe Leme
fc4604f719 Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
am: 49231f183f

Change-Id: I5d182201cc568caa894dddd6352cbf6abb83a03b
2017-06-07 00:38:40 +00:00
Marco Nelissen
3f4a368a7c Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c
am: 6596f721fd

Change-Id: Iaf21b4182d659b4ffc5b2e514c7a4dfcb15cc143
2017-06-07 00:31:38 +00:00
Felipe Leme
72f2d98c5a Merge "Fixed autofill filter comparison." into oc-dev 2017-06-07 00:30:53 +00:00
Felipe Leme
be4420cf13 Merge "Improved debug to diagnose Save issues." into oc-dev 2017-06-07 00:26:12 +00:00
Felipe Leme
2e723982d5 Merge "Use initial value on save when value didn't change." into oc-dev 2017-06-07 00:25:11 +00:00
Marco Nelissen
031a20a6c7 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8 am: 9e4e6c4b7c
am: 2c1d4f8f7b

Change-Id: I90250994c72bd9cc54ebb87df3f0f7f510417ef1
2017-06-07 00:24:23 +00:00
Felipe Leme
49231f183f Merge "Don't show AUTOFILL menu when text is selected." into oc-dev 2017-06-07 00:24:03 +00:00
Marco Nelissen
6596f721fd Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8
am: 9e4e6c4b7c

Change-Id: I96b9977d0bd218e3c13dcd177b8033657a023d14
2017-06-07 00:20:21 +00:00
Marco Nelissen
2c1d4f8f7b Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8 am: db9d2588b8
am: 9e4e6c4b7c

Change-Id: I1d028759fecc34081daf0be653a1b729e0e048ac
2017-06-07 00:16:34 +00:00
Marco Nelissen
9e4e6c4b7c Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3 am: d7fe3ea6a8
am: db9d2588b8

Change-Id: I8da5c1b0f6fb3d7676c463c354167abce71f8124
2017-06-07 00:10:27 +00:00
Jorim Jaggi
fd3b1a1b76 Fix crash in test
Test: runtest systemui
Change-Id: I841b6ed21fb101e7873b218521c480c904f361f8
Fixes: 62389344
2017-06-06 17:04:19 -07:00
Marco Nelissen
db9d2588b8 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887 am: 4d9e6150f3
am: d7fe3ea6a8

Change-Id: Ic5a7104241d36e82418ce5a2a43595d2fa4bff47
2017-06-07 00:04:12 +00:00
Marco Nelissen
d7fe3ea6a8 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3 am: ce5c72e887
am: 4d9e6150f3

Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103
2017-06-06 23:54:55 +00:00
Rob Carr
8296054d4e Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
am: 3946916d56

Change-Id: Ia2d5ff30183d8588319dc4aa24f5512f3db75e55
2017-06-06 23:52:56 +00:00
Marco Nelissen
4d9e6150f3 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113 am: 69b6a382a3
am: ce5c72e887

Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b
2017-06-06 23:45:51 +00:00
Felipe Leme
9a1b6b0eb2 Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am: 301fc823f3

Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891
2017-06-06 23:44:42 +00:00
Todd Kennedy
7e05bb7793 Merge "Handle renamed packages during default grants" into oc-dev
am: bfc083c3a0

Change-Id: I068bb7548d1c972c3824185e5ab933a7b48c387b
2017-06-06 23:41:06 +00:00
Marco Nelissen
ce5c72e887 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1 am: e18e8c4113
am: 69b6a382a3

Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0
2017-06-06 23:39:57 +00:00
Marco Nelissen
69b6a382a3 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2 am: 3272cf26c1
am: e18e8c4113

Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
2017-06-06 23:33:50 +00:00
Rob Carr
3946916d56 Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev 2017-06-06 23:33:04 +00:00
Felipe Leme
301fc823f3 Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev 2017-06-06 23:31:01 +00:00
Todd Kennedy
bfc083c3a0 Merge "Handle renamed packages during default grants" into oc-dev 2017-06-06 23:29:10 +00:00
Marco Nelissen
e18e8c4113 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546 am: 6d5bc9a3c2
am: 3272cf26c1

Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
2017-06-06 23:28:27 +00:00