OSDN Git Service
Jian Sun [Wed, 7 Jun 2017 20:37:45 +0000 (20:37 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
am:
8d5b58a660
Change-Id: Id381a515c44253dc2c3cfa7a74e855fda981580f
Jian Sun [Wed, 7 Jun 2017 20:31:00 +0000 (20:31 +0000)]
Merge "Notify registered packages of visible accounts change when authenticators get uninstalled." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 20:21:26 +0000 (20:21 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
am:
6e96251d92
Change-Id: Ie1d25ecf377a023833f29c01f093831f049166fd
Julia Reynolds [Wed, 7 Jun 2017 20:12:21 +0000 (20:12 +0000)]
Merge "Revert "Change default for group alert behavior"" into oc-dev
Doris Liu [Wed, 7 Jun 2017 19:40:53 +0000 (19:40 +0000)]
Merge "Better error message for AVD" into oc-dev
am:
cabf9cdc2e
Change-Id: I6e63b81fd2168780d23a88d7340812b55db98497
Doris Liu [Wed, 7 Jun 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Better error message for AVD" into oc-dev
Jeff Sharkey [Wed, 7 Jun 2017 19:13:01 +0000 (19:13 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
am:
6746aa8c4d
Change-Id: I32f223228c45a4949ebf53c1ab73d20fa9950ed6
Jeff Sharkey [Wed, 7 Jun 2017 19:03:54 +0000 (19:03 +0000)]
Merge "Remove old FUSE bypass now that we have sdcardfs." into oc-dev
Todd Kennedy [Wed, 7 Jun 2017 18:50:33 +0000 (18:50 +0000)]
Merge "always adjust per-user application info" into oc-dev
am:
91a9d65e42
Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]
Merge "always adjust per-user application info" into oc-dev
Makoto Onuki [Wed, 7 Jun 2017 18:40:46 +0000 (18:40 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am:
28afa23a8f
Change-Id: I3d1079365f13400d1f23f6e61122e00c67432dd1
Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]
Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
Selim Cinek [Wed, 7 Jun 2017 18:25:12 +0000 (18:25 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am:
295dd7193e
Change-Id: I1f41744ec2cc5d820e7381858d5974b17db8d893
TreeHugger Robot [Wed, 7 Jun 2017 18:23:11 +0000 (18:23 +0000)]
Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
Selim Cinek [Wed, 7 Jun 2017 18:13:25 +0000 (18:13 +0000)]
Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
Jason Monk [Wed, 7 Jun 2017 17:28:24 +0000 (17:28 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am:
463985178c
Change-Id: I4f1d959c130a008aad49c4aab0aa225bfb035ab3
Jason Monk [Wed, 7 Jun 2017 17:17:43 +0000 (17:17 +0000)]
Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
John Reck [Wed, 7 Jun 2017 16:49:12 +0000 (16:49 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
am:
d3e78478aa
Change-Id: I7d96db34b1894e1064116b830a8fb159ad4c57b0
John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]
Merge "Clear native shader when Paint shader changes" into oc-dev
Albert Chaulk [Mon, 5 Jun 2017 23:35:23 +0000 (19:35 -0400)]
Add a WM API to query the touch region for the input method window
This is needed by VR to handle keyboards that display a window larger
than the interactable region
Bug:
62194867
Test: Manually with prints
Change-Id: I7288956ed8da8d24e7c46ffa8f27461f7abbca5e
(cherry picked from commit
56162a0a51e2aa752a500d941869f1af652eabbf)
Daniel Sandler [Wed, 7 Jun 2017 15:02:00 +0000 (15:02 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
am:
630e7841e5
Change-Id: Idde8d539f4f49bcf171e060d6c6483e375748346
Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]
Merge "Use correct timebase in fg service notifications." into oc-dev
Julia Reynolds [Wed, 7 Jun 2017 14:12:09 +0000 (14:12 +0000)]
Revert "Change default for group alert behavior"
This reverts commit
8f7828ebe7fc6d87e0de112cfda2823fd5818cb2.
Mutes sound on legacy apps that use their summaries to make sound
Change-Id: I635b1428ee247c0b7753f58343637e64da1c981d
Fixes:
62387153
Wale Ogunwale [Wed, 7 Jun 2017 13:50:25 +0000 (13:50 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
am:
7925f817d0
Change-Id: I0b957a0a67a9e245d51dce610acef97d6b72fa04
Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]
Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev
Jason Monk [Wed, 7 Jun 2017 13:15:54 +0000 (09:15 -0400)]
Make DND tile primary toggle remember favorite zen
Test: manual
Change-Id: I2b589dbabf4bd7704d4df968ecbd986604e3b757
Fixes:
37794901
Hyunyoung Song [Wed, 7 Jun 2017 09:04:17 +0000 (09:04 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev
am:
bb4aeb19be
Change-Id: I7a80c68f227d2596f3863b9f234d31a7143ca33c
Michael Wright [Wed, 7 Jun 2017 09:00:53 +0000 (09:00 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
am:
496267f93b
Change-Id: I40d9fb13190db81472cde320cccd9a868ea21516
TreeHugger Robot [Wed, 7 Jun 2017 07:50:14 +0000 (07:50 +0000)]
Merge "Change Android default icon b/
35314247 Test: manual" into oc-dev
TreeHugger Robot [Wed, 7 Jun 2017 07:22:52 +0000 (07:22 +0000)]
Merge "Actually wait until the display is ready." into oc-dev
Tyler Freeman [Wed, 7 Jun 2017 06:48:58 +0000 (06:48 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev am:
ac36c42a86
am:
8cb653925b
Change-Id: I7abd446e96368b50eeff92ea134aeea6999f7c7a
Tyler Freeman [Wed, 7 Jun 2017 06:38:38 +0000 (06:38 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
am:
ac36c42a86
Change-Id: Ib30211346cbce8dbb0853469c17994f23b7c456d
TreeHugger Robot [Wed, 7 Jun 2017 06:33:03 +0000 (06:33 +0000)]
Merge "Vibrator: Allow priority vibrations in low-power mode for accessibility." into oc-dev
Roozbeh Pournader [Wed, 7 Jun 2017 06:21:40 +0000 (06:21 +0000)]
Merge "Move tests with private APIs to coretests"
Qingxi Li [Wed, 7 Jun 2017 04:50:21 +0000 (04:50 +0000)]
Merge "Only show the "Disable eSIM" when eSIM profile is enabled"
Jorim Jaggi [Wed, 7 Jun 2017 04:27:53 +0000 (04:27 +0000)]
Merge "Fix crash in test" into oc-dev am:
d5ece513ec
am:
3a981207ce
Change-Id: I0f564ed2cee6ad4e45968704a4c64029644bbc4c
Jorim Jaggi [Wed, 7 Jun 2017 04:20:40 +0000 (04:20 +0000)]
Merge "Fix crash in test" into oc-dev
am:
d5ece513ec
Change-Id: I923f532600fe7b3fe372fd4cf2469c2ea2b03569
TreeHugger Robot [Wed, 7 Jun 2017 04:12:44 +0000 (04:12 +0000)]
Merge "Fix crash in test" into oc-dev
Doris Liu [Wed, 7 Jun 2017 03:58:45 +0000 (03:58 +0000)]
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am:
8d06d8cbf1" into oc-dev-plus-aosp
am:
721ecfd21a
Change-Id: Iec199dd0cfe7beace7549d3e16e888458fd0306c
Hugo Benichi [Wed, 7 Jun 2017 03:54:12 +0000 (03:54 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am:
7f423d00dd am:
24912bb93d am:
41415facc8
am:
335a1d36ea
Change-Id: Ib6285780806a9bbffc9bb302085e78f72c27b1be
Android Build Merger (Role) [Wed, 7 Jun 2017 03:50:33 +0000 (03:50 +0000)]
Merge "Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev am:
8d06d8cbf1" into oc-dev-plus-aosp
Doris Liu [Wed, 7 Jun 2017 03:49:44 +0000 (03:49 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
am:
8d06d8cbf1
Change-Id: I3e8680067b360ed5792f9a9d1be953561fca7969
Hugo Benichi [Wed, 7 Jun 2017 03:47:17 +0000 (03:47 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am:
7f423d00dd am:
24912bb93d
am:
41415facc8
Change-Id: Ic93c6170813b8c43176d57b534e405500c4639c1
Doris Liu [Wed, 7 Jun 2017 03:43:07 +0000 (03:43 +0000)]
Merge "Better handle non-recommended use and warn against it in JavaDoc" into oc-dev
Hugo Benichi [Wed, 7 Jun 2017 03:41:13 +0000 (03:41 +0000)]
Merge "Revert "Captive portal login shows specific network name"" am:
7f423d00dd
am:
24912bb93d
Change-Id: Ief5a666699e64cf5d5fc79de1b7964f473898f78
Hugo Benichi [Wed, 7 Jun 2017 03:32:09 +0000 (03:32 +0000)]
Merge "Revert "Captive portal login shows specific network name""
am:
7f423d00dd
Change-Id: I0d77f19cadbf5905215ae576e66057a259f2348e
Hugo Benichi [Wed, 7 Jun 2017 03:23:16 +0000 (03:23 +0000)]
Merge "Revert "Captive portal login shows specific network name""
Hugo Benichi [Wed, 7 Jun 2017 03:22:20 +0000 (03:22 +0000)]
Revert "Captive portal login shows specific network name"
This reverts commit
8032ff32ff9c2b6684bd365059f88a858272b633.
Several branches are broken because of this.
Change-Id: I2d9f8b1cc8f93ed8de7d1e01d49c7cd29417820d
Hugo Benichi [Wed, 7 Jun 2017 03:03:12 +0000 (03:03 +0000)]
Merge "Captive portal login shows specific network name" am:
ea7322d17e am:
d4cb33b83f am:
6f2d79464d
am:
8d60db5241
Change-Id: I9484e2d577ca547bbff4b516fcb445b4e8cdcdef
Hugo Benichi [Wed, 7 Jun 2017 02:56:15 +0000 (02:56 +0000)]
Merge "Captive portal login shows specific network name" am:
ea7322d17e am:
d4cb33b83f
am:
6f2d79464d
Change-Id: I88dc4240bc4a8eb84bc3edd7a9f5a873296075fd
Hugo Benichi [Wed, 7 Jun 2017 02:49:05 +0000 (02:49 +0000)]
Merge "Captive portal login shows specific network name" am:
ea7322d17e
am:
d4cb33b83f
Change-Id: Ie52f17dced7db6dfb6c58f935bf976ff72fa723d
Hugo Benichi [Wed, 7 Jun 2017 02:42:36 +0000 (02:42 +0000)]
Merge "Captive portal login shows specific network name"
am:
ea7322d17e
Change-Id: I48abfa9523854ea3f30883e92d6d3011d41c6a66
TreeHugger Robot [Wed, 7 Jun 2017 02:36:12 +0000 (02:36 +0000)]
Merge "Remove unnecessary code"
Hugo Benichi [Wed, 7 Jun 2017 02:33:02 +0000 (02:33 +0000)]
Merge "Captive portal login shows specific network name"
Andrew Sapperstein [Wed, 7 Jun 2017 02:21:53 +0000 (02:21 +0000)]
Merge "Add config_headlineFontFamily."
TreeHugger Robot [Wed, 7 Jun 2017 02:20:59 +0000 (02:20 +0000)]
Merge "Add strings for improving Wifi wrong password UX"
Andrew Sapperstein [Tue, 6 Jun 2017 01:30:06 +0000 (18:30 -0700)]
Add config_headlineFontFamily.
Creates a config string called config_headlineFontFamily that allows
vendors to override the default font family if they so desire.
Bug:
36855735
Test: ag/
2360364
Change-Id: I145e33650d0feec2a52132ac46322c51a23d8ccd
Doris Liu [Tue, 6 Jun 2017 21:56:02 +0000 (14:56 -0700)]
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
TreeHugger Robot [Wed, 7 Jun 2017 01:23:31 +0000 (01:23 +0000)]
Merge "Fix "OK" speed label string."
Evan Rosky [Wed, 7 Jun 2017 01:19:12 +0000 (01:19 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev am:
8d4b72c68a
am:
2b64c87366
Change-Id: I76ffe2869425314f43b0fc2044b8bb8d80619689
Tyler Freeman [Fri, 5 May 2017 00:23:35 +0000 (17:23 -0700)]
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
Evan Rosky [Wed, 7 Jun 2017 01:09:17 +0000 (01:09 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev
am:
8d4b72c68a
Change-Id: I4169c2ecf3890946090e4c171a666292262118f6
Android Build Merger (Role) [Wed, 7 Jun 2017 01:07:26 +0000 (01:07 +0000)]
Merge "Merge "Fixed autofill filter comparison." into oc-dev am:
72f2d98c5a am:
4d47d7ad46"
Felipe Leme [Wed, 7 Jun 2017 01:05:39 +0000 (01:05 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev am:
72f2d98c5a
am:
4d47d7ad46
Change-Id: Ic6d4af3752da2672ce172f09022e0dfaf1bd0810
TreeHugger Robot [Wed, 7 Jun 2017 01:05:16 +0000 (01:05 +0000)]
Merge changes from topic 'dungeon-master'
* changes:
Hide redundant foreground service notifications.
Updates to Dianne's Dungeon.
Felipe Leme [Wed, 7 Jun 2017 01:02:34 +0000 (01:02 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev am:
be4420cf13
am:
34e7f3b6ba
Change-Id: I86366b96742aafd1c9f6f9f7a1dc278f0275e3ff
Evan Rosky [Wed, 7 Jun 2017 01:02:13 +0000 (01:02 +0000)]
Merge "Don't report focusableViewAvailable on add" into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:57:16 +0000 (00:57 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev am:
2e723982d5
am:
08365011a2
Change-Id: I38b2e8096b7fe43a294afe400af093b49616335d
Felipe Leme [Wed, 7 Jun 2017 00:55:27 +0000 (00:55 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
am:
72f2d98c5a
Change-Id: I1fef87940fe08d875d3d449a830bd652871e2505
Felipe Leme [Wed, 7 Jun 2017 00:51:31 +0000 (00:51 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev
am:
be4420cf13
Change-Id: Id65b8d62403af8883503d5b31903d73751f33bf2
Felipe Leme [Wed, 7 Jun 2017 00:48:54 +0000 (00:48 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev am:
49231f183f
am:
fc4604f719
Change-Id: I73c6181f7fdd4b2b4c38338c13d9bf439199617f
Felipe Leme [Wed, 7 Jun 2017 00:46:53 +0000 (00:46 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev
am:
2e723982d5
Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d
TreeHugger Robot [Wed, 7 Jun 2017 00:45:01 +0000 (00:45 +0000)]
Merge "Replace mockito with a mock class in DynamicLayoutTest"
Marco Nelissen [Wed, 7 Jun 2017 00:39:56 +0000 (00:39 +0000)]
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
am:
3f4a368a7c
Change-Id: I9675446964d2bd5672fe87674571dae517f5ba3d
Felipe Leme [Wed, 7 Jun 2017 00:38:40 +0000 (00:38 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
am:
49231f183f
Change-Id: I5d182201cc568caa894dddd6352cbf6abb83a03b
Marco Nelissen [Wed, 7 Jun 2017 00:31:38 +0000 (00:31 +0000)]
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
Marco Nelissen [Wed, 7 Jun 2017 00:31:33 +0000 (00:31 +0000)]
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
am:
031a20a6c7
Change-Id: I5039c6fc8c0a18fcf14edd30f94975fff6c1fc35
Felipe Leme [Wed, 7 Jun 2017 00:30:48 +0000 (00:30 +0000)]
Merge "Fixed autofill filter comparison." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:26:05 +0000 (00:26 +0000)]
Merge "Improved debug to diagnose Save issues." into oc-dev
Felipe Leme [Wed, 7 Jun 2017 00:25:01 +0000 (00:25 +0000)]
Merge "Use initial value on save when value didn't change." into oc-dev
Marco Nelissen [Wed, 7 Jun 2017 00:24:23 +0000 (00:24 +0000)]
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
Felipe Leme [Wed, 7 Jun 2017 00:23:59 +0000 (00:23 +0000)]
Merge "Don't show AUTOFILL menu when text is selected." into oc-dev
Marco Nelissen [Wed, 7 Jun 2017 00:20:21 +0000 (00:20 +0000)]
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
Antony Sargent [Wed, 7 Jun 2017 00:17:44 +0000 (17:17 -0700)]
Add strings for improving Wifi wrong password UX
Bug:
33245941
Test: none
Change-Id: If7bc95c70aa6067255d61de5a4a3d71fcfe76886
Marco Nelissen [Wed, 7 Jun 2017 00:16:34 +0000 (00:16 +0000)]
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
Marco Nelissen [Wed, 7 Jun 2017 00:10:27 +0000 (00:10 +0000)]
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
Jorim Jaggi [Wed, 7 Jun 2017 00:04:19 +0000 (17:04 -0700)]
Fix crash in test
Test: runtest systemui
Change-Id: I841b6ed21fb101e7873b218521c480c904f361f8
Fixes:
62389344
Marco Nelissen [Wed, 7 Jun 2017 00:04:12 +0000 (00:04 +0000)]
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
Rob Carr [Wed, 7 Jun 2017 00:03:51 +0000 (00:03 +0000)]
Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev am:
3946916d56
am:
8296054d4e
Change-Id: Iaf35647355f48300199d888eb884a23750c0059b
Sundeep Ghuman [Tue, 6 Jun 2017 23:56:44 +0000 (16:56 -0700)]
Fix "OK" speed label string.
Bug: b/
35628911
Test: NA
Change-Id: I5fe343338c683b72ad8c12d586dd7ef3dd639d0a
Marco Nelissen [Tue, 6 Jun 2017 23:54:55 +0000 (23:54 +0000)]
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
Felipe Leme [Tue, 6 Jun 2017 23:53:16 +0000 (23:53 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev am:
301fc823f3
am:
9a1b6b0eb2
Change-Id: Ifbda0a75a79e644763e83baf86a7823310a56f5b
Rob Carr [Tue, 6 Jun 2017 23:52:56 +0000 (23:52 +0000)]
Merge "SurfaceView: Correct inverted alpha detection condition." into oc-dev
am:
3946916d56
Change-Id: Ia2d5ff30183d8588319dc4aa24f5512f3db75e55
Android Build Merger (Role) [Tue, 6 Jun 2017 23:49:09 +0000 (23:49 +0000)]
Merge "Merge "Handle renamed packages during default grants" into oc-dev am:
bfc083c3a0 am:
7e05bb7793"
Todd Kennedy [Tue, 6 Jun 2017 23:48:19 +0000 (23:48 +0000)]
Merge "Handle renamed packages during default grants" into oc-dev am:
bfc083c3a0
am:
7e05bb7793
Change-Id: Ib4e3b2799c2a104fd203b6e64e86d6181567b177
Christine Franks [Tue, 6 Jun 2017 23:47:37 +0000 (23:47 +0000)]
Merge "Add TRON counter for demo user creation"
sunjian [Mon, 5 Jun 2017 19:16:59 +0000 (12:16 -0700)]
Notify registered packages of visible accounts change when
authenticators get uninstalled.
Bug:
38332496
Test: manual
Change-Id: I877d52d511deb177d07f9e602d84f33fd0fd2c82
Marco Nelissen [Tue, 6 Jun 2017 23:45:51 +0000 (23:45 +0000)]
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
Felipe Leme [Tue, 6 Jun 2017 23:44:42 +0000 (23:44 +0000)]
Merge "Catch WindowManager exceptions so they don't crash the system." into oc-dev
am:
301fc823f3
Change-Id: Ib28ae2a7b3614fa73fa4e1b08e5607f7d6011891
Isai Damier [Tue, 6 Jun 2017 23:43:44 +0000 (23:43 +0000)]
Merge "Redundant/duplicate method to close Streams Fixes:
62304559 Test: the code compiles which mean polymorphism works. No additional tests necessary Change-Id: I3d366f12c1f176213979da6b050957bc2adb2938"