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

(root) / android-x86 / frameworks-base.git / log

Brad Ebinger [Thu, 25 May 2017 23:50:59 +0000 (23:50 +0000)]

Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840 am: 689edc736f" into oc-dev-plus-aosp
am: f5fb04573b

Change-Id: I3447422054e0f563e9314686c1638c43e7df296e

commit | commitdiff | tree

Oleksiy Avramchenko [Thu, 25 May 2017 23:49:46 +0000 (23:49 +0000)]

Merge "Force a light to be set for the first time" into oc-dev am: 9ddb0f8691 -s ours
am: bf7443156d -s ours

Change-Id: I770eabd9e59158a984581d1e9ae14b9bf02adfd5

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 23:46:42 +0000 (23:46 +0000)]

Merge "Fixed memory leak with the inflater" into oc-dev am: 3d5fd7a959
am: 9cd34aa978

Change-Id: I8466a554dbe03eb83f8f737ff76b159dde0fc532

commit | commitdiff | tree

Chet Haase [Thu, 25 May 2017 23:43:20 +0000 (23:43 +0000)]

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev am: 68311f8712
am: 4b35637a4a

Change-Id: If37d42fffcd17cec5e00f92c8a24215cc5425751

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 23:40:28 +0000 (23:40 +0000)]

Merge "Fixed an issue when inflating too many notifications" into oc-dev am: 3a6f2a30ce
am: d68026a77f

Change-Id: I6200bed8201730d2c26e4882277e3632558c403d

commit | commitdiff | tree

Chad Brubaker [Thu, 25 May 2017 23:36:50 +0000 (23:36 +0000)]

Merge "Handle install time ephemeral permissions" into oc-dev am: dc89202d1a
am: 32b9061d2c

Change-Id: Ie6072d3704e9bdecbc4b55c93e3aca129c31e620

commit | commitdiff | tree

Jason Monk [Thu, 25 May 2017 23:34:27 +0000 (23:34 +0000)]

Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev am: 34b64f2559
am: dd7ab998fd -s ours

Change-Id: I9b4bea605ac491e9d8d577cc1fdf17a8957c9a8d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 May 2017 23:12:05 +0000 (23:12 +0000)]

Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840 am: 689edc736f" into oc-dev-plus-aosp

commit | commitdiff | tree

Oleksiy Avramchenko [Thu, 25 May 2017 23:10:24 +0000 (23:10 +0000)]

Merge "Force a light to be set for the first time" into oc-dev
am: 9ddb0f8691 -s ours

Change-Id: I45be47b28daa351915890459cbf9046a28d65812

commit | commitdiff | tree

Brad Ebinger [Thu, 25 May 2017 23:10:21 +0000 (23:10 +0000)]

Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c am: be34238840
am: 689edc736f

Change-Id: Ifd9fc089d7165506f6953e810c040de868f5bafe

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 23:08:11 +0000 (23:08 +0000)]

Merge "Fixed memory leak with the inflater" into oc-dev
am: 3d5fd7a959

Change-Id: I90d93918d1b188d09f6d2cf3ed70ceed38b07086

commit | commitdiff | tree

Chet Haase [Thu, 25 May 2017 23:05:43 +0000 (23:05 +0000)]

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev
am: 68311f8712

Change-Id: I5c5a18d57e5658262793f0bd67f8a9febda055cd

commit | commitdiff | tree

Brad Ebinger [Thu, 25 May 2017 23:00:29 +0000 (23:00 +0000)]

Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am: 25ce41cf4c
am: be34238840

Change-Id: Ie399093e992c7b15c72927080b5c20d378738785

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 22:54:59 +0000 (22:54 +0000)]

Merge "Force a light to be set for the first time" into oc-dev

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 22:54:08 +0000 (22:54 +0000)]

Merge "Fixed memory leak with the inflater" into oc-dev

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 22:53:54 +0000 (22:53 +0000)]

Merge "Fixed an issue when inflating too many notifications" into oc-dev
am: 3a6f2a30ce

Change-Id: Ic2a82150d08eb70762c08822b040860e79f66b0b

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 22:51:14 +0000 (22:51 +0000)]

Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev

commit | commitdiff | tree

Brad Ebinger [Thu, 25 May 2017 22:51:11 +0000 (22:51 +0000)]

Merge "Add IMEI_NOT_ACCEPTED error code for IMS"
am: 25ce41cf4c

Change-Id: Ic24b93e215995a18e1a2ecbb647af0cc8e1f67cb

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 22:42:11 +0000 (22:42 +0000)]

Merge "Fixed an issue when inflating too many notifications" into oc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 25 May 2017 22:40:49 +0000 (22:40 +0000)]

Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev am: e6bf4f808d
am: e90447d155

Change-Id: Icfd11d69ae943e6a96c229fbb3d7ebcf47dd2f92

commit | commitdiff | tree

Chad Brubaker [Thu, 25 May 2017 22:36:15 +0000 (22:36 +0000)]

Merge "Handle install time ephemeral permissions" into oc-dev
am: dc89202d1a

Change-Id: I4da687bd1f5008788e54cc03309a01b060d1829e

commit | commitdiff | tree

Brad Ebinger [Thu, 25 May 2017 22:31:51 +0000 (22:31 +0000)]

Merge "Add IMEI_NOT_ACCEPTED error code for IMS"

commit | commitdiff | tree

Jason Monk [Thu, 25 May 2017 22:30:40 +0000 (22:30 +0000)]

Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev
am: 34b64f2559

Change-Id: I412152b803be5a4e70b018c38ec3bbda76a51a01

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 22:28:24 +0000 (22:28 +0000)]

Merge "Handle install time ephemeral permissions" into oc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 25 May 2017 22:28:32 +0000 (22:28 +0000)]

Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev
am: e6bf4f808d

Change-Id: Ie81e000348bd6a4e247c40681202965285f2584c

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 22:21:23 +0000 (22:21 +0000)]

Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev

commit | commitdiff | tree

Jaekyun Seok [Thu, 25 May 2017 22:17:44 +0000 (22:17 +0000)]

Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev am: a941e29c55
am: a3bf175d8a

Change-Id: Id12f519492f588c53206f6ee035e0ee9943eca72

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 22:14:57 +0000 (22:14 +0000)]

Merge "Don't dismiss keyguard if guest has Pin/Pattern/PW set"

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 22:14:31 +0000 (22:14 +0000)]

Merge "Allow the creation of IMPORTANCE_NONE channels" into oc-dev

commit | commitdiff | tree

Jaekyun Seok [Thu, 25 May 2017 22:05:51 +0000 (22:05 +0000)]

Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev
am: a941e29c55

Change-Id: I47bf589cf849a81a310d0890156bf7c937dd354a

commit | commitdiff | tree

Jason Monk [Thu, 25 May 2017 22:00:15 +0000 (22:00 +0000)]

Merge "Fix up the QS gutter" into oc-dev am: 78ee090f78
am: f4968f3c98

Change-Id: I9b7d99aa2b519c8c9629dbec32d22c906f0456f7

commit | commitdiff | tree

Adrian Roos [Thu, 25 May 2017 21:58:04 +0000 (21:58 +0000)]

Merge "AOD: Fix camera icon visibility" into oc-dev am: f3a50f1675
am: 9404678b89

Change-Id: I741b93c818389d30a8795997898b5550c37bb02a

commit | commitdiff | tree

Jason Monk [Thu, 25 May 2017 21:52:02 +0000 (21:52 +0000)]

Merge "Fix up the QS gutter" into oc-dev
am: 78ee090f78

Change-Id: I84250204436869ad18365acc42688fd6455f94a4

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 21:50:52 +0000 (21:50 +0000)]

Merge "Add a function to verify if idmap is made from given target/overlay packages" into oc-dev

commit | commitdiff | tree

Adrian Roos [Thu, 25 May 2017 21:48:37 +0000 (21:48 +0000)]

Merge "AOD: Fix camera icon visibility" into oc-dev
am: f3a50f1675

Change-Id: I012732902d2f076e247f69f297bc4613ad4d0e94

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 21:41:47 +0000 (21:41 +0000)]

Merge "Fix up the QS gutter" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 21:40:50 +0000 (21:40 +0000)]

Merge "AOD: Fix camera icon visibility" into oc-dev

commit | commitdiff | tree

Bryce Lee [Thu, 25 May 2017 21:08:26 +0000 (21:08 +0000)]

Merge "Use cached keyguard flags during relaunch." into oc-dev am: 9eb635c428
am: 15cb2a966c

Change-Id: I182715d3c0222d1f7ef140b0062692f515b36100

commit | commitdiff | tree

Bryce Lee [Thu, 25 May 2017 21:06:14 +0000 (21:06 +0000)]

Merge "Do not remove task until all activities have been destroyed." into oc-dev am: f18c5862e8
am: 6704d6e810

Change-Id: Ic719fbd29a0bf43c6180bd3fa5d5bb822ae10a9a

commit | commitdiff | tree

Alexey Polyudov [Thu, 25 May 2017 21:00:18 +0000 (21:00 +0000)]

Merge "sensors: pass sensor handle along with injected event"

commit | commitdiff | tree

Bryce Lee [Thu, 25 May 2017 20:53:49 +0000 (20:53 +0000)]

Merge "Use cached keyguard flags during relaunch." into oc-dev
am: 9eb635c428

Change-Id: I33a077d03618fdebebdd36af2e0db103fbd7ce3d

commit | commitdiff | tree

Lorenzo Colitti [Thu, 25 May 2017 20:53:25 +0000 (20:53 +0000)]

Merge "Allow vendor code to link to libandroid_net."

commit | commitdiff | tree

Bryce Lee [Thu, 25 May 2017 20:51:09 +0000 (20:51 +0000)]

Merge "Do not remove task until all activities have been destroyed." into oc-dev
am: f18c5862e8

Change-Id: Id35bc99e1c6871fc16935f901710c2f7b1fc567e

commit | commitdiff | tree

Winson Chung [Thu, 25 May 2017 20:45:51 +0000 (20:45 +0000)]

Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev am: ef4e38f96f
am: 407e77c299

Change-Id: I5efc89253b286f49e82767063a41ca54698b4bf8

commit | commitdiff | tree

Bryce Lee [Thu, 25 May 2017 20:43:30 +0000 (20:43 +0000)]

Merge "Use cached keyguard flags during relaunch." into oc-dev

commit | commitdiff | tree

Bryce Lee [Thu, 25 May 2017 20:42:15 +0000 (20:42 +0000)]

Merge "Do not remove task until all activities have been destroyed." into oc-dev

commit | commitdiff | tree

Winson Chung [Thu, 25 May 2017 20:36:30 +0000 (20:36 +0000)]

Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev
am: ef4e38f96f

Change-Id: If433030b4fdd9885fc67ee3025fc30fd60eb3880

commit | commitdiff | tree

Mady Mellor [Thu, 25 May 2017 20:32:05 +0000 (20:32 +0000)]

Merge "Dont reset the menu state if the menu is showing during an update" into oc-dev am: 814d666f76
am: 1987e6212c

Change-Id: I0862181ad6fcb37b8bd01a500c0f5d8d83254619

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 20:30:21 +0000 (20:30 +0000)]

Merge "Ensure that windows are drawn before starting transition into PiP." into oc-dev

commit | commitdiff | tree

Mady Mellor [Thu, 25 May 2017 20:20:40 +0000 (20:20 +0000)]

Merge "Dont reset the menu state if the menu is showing during an update" into oc-dev
am: 814d666f76

Change-Id: I0b31d86447dd53236f5e4253cea79ab47902c7fe

commit | commitdiff | tree

Mathieu Chartier [Thu, 25 May 2017 20:10:04 +0000 (20:10 +0000)]

Merge "Update preloaded classes for O" into oc-dev am: 9fb12725f2
am: e8a23b11c0

Change-Id: I07f192c701858c01bfe779b2ffecffc5ebad16e6

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 20:08:54 +0000 (20:08 +0000)]

Merge "Don’t reset the menu state if the menu is showing during an update" into oc-dev

commit | commitdiff | tree

Mathieu Chartier [Thu, 25 May 2017 20:00:57 +0000 (20:00 +0000)]

Merge "Update preloaded classes for O" into oc-dev
am: 9fb12725f2

Change-Id: I27200ac2f8858f755d7ff1d9fa4cc7f7eb406705

commit | commitdiff | tree

Kevin Chyn [Thu, 25 May 2017 19:59:57 +0000 (19:59 +0000)]

Merge "ClientMonitor should only send cancel() once to fp daemon" into oc-dev am: d3d1c558eb
am: 69f082fceb

Change-Id: Idc4175302e5fefb8656aea0dade652605420aa6e

commit | commitdiff | tree

Tyler Gunn [Thu, 25 May 2017 19:55:00 +0000 (19:55 +0000)]

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev am: 95f4f14e0b
am: 0aea0d2c53

Change-Id: I76805ba85bfac39cdaa3ddd2b8340423e4c7ffbe

commit | commitdiff | tree

Mathieu Chartier [Thu, 25 May 2017 19:54:38 +0000 (19:54 +0000)]

Merge "Update preloaded classes for O" into oc-dev

commit | commitdiff | tree

Kevin Chyn [Thu, 25 May 2017 19:53:16 +0000 (19:53 +0000)]

Merge "ClientMonitor should only send cancel() once to fp daemon" into oc-dev
am: d3d1c558eb

Change-Id: Iff80bb545a1c75256f76541b09cc642796945cf9

commit | commitdiff | tree

Soonil Nagarkar [Thu, 25 May 2017 19:51:01 +0000 (19:51 +0000)]

Merge "Properly battery blame throttled location requests"

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 19:45:45 +0000 (19:45 +0000)]

Merge "ClientMonitor should only send cancel() once to fp daemon" into oc-dev

commit | commitdiff | tree

Tyler Gunn [Thu, 25 May 2017 19:44:32 +0000 (19:44 +0000)]

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev
am: 95f4f14e0b

Change-Id: If762616920b266064cd1ee5520d5778ebb1475a7

commit | commitdiff | tree

Selim Cinek [Thu, 25 May 2017 17:27:28 +0000 (10:27 -0700)]

Fixed memory leak with the inflater

Because min priority children could be removed from
their parents after the removal, a new inflation task
would be started, leading to the view being instantly
readded again. This lead to memory leaks.

It also fixes a bug where the inflation would not inflate
enough views that could lead to crashes / wrong layouts.

Finally there was a indexing error when handling removal
of group summaries.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java
Change-Id: Iac242946bd30060967ee7877560d40e63f39f996
Fixes: 62067645

commit | commitdiff | tree

Sudheer Shanka [Thu, 25 May 2017 19:35:28 +0000 (19:35 +0000)]

Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev am: 975ee1f25a
am: e406d52628

Change-Id: I090dfd872aa04c2c1af8e30c5faf834db05ba61e

commit | commitdiff | tree

Tyler Gunn [Thu, 25 May 2017 19:33:58 +0000 (19:33 +0000)]

Merge "Add ability to add existing connection AND set parent at the same time." into oc-dev

commit | commitdiff | tree

Adrian Roos [Thu, 25 May 2017 19:33:17 +0000 (12:33 -0700)]

AOD: Fix camera icon visibility

Fixes a bug where the camera icon could become
visible in AOD even though it should not.

Fixes: 62038727
Test: Trigger ambient display, uninstall button provider plugin, observe camera button does not show
Change-Id: Ie97085dff58b6ecd0157126e30b86138f585d454

commit | commitdiff | tree

Sudheer Shanka [Thu, 25 May 2017 19:26:58 +0000 (19:26 +0000)]

Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev
am: 975ee1f25a

Change-Id: I2872b5a97aa8912655505d0c180f70706002d10e

commit | commitdiff | tree

Etan Cohen [Thu, 25 May 2017 19:25:54 +0000 (19:25 +0000)]

Merge "[AWARE] Metrics framework"

commit | commitdiff | tree

William Harmon [Thu, 25 May 2017 19:21:37 +0000 (19:21 +0000)]

Merge "Fix NPE in UserManager.getUserName(). Unlike all other calls to getUserInfo(), getUserName() was the only one that did not check for null. This has led to NPEs like in b/37589362. Test: none. :( Not sure how to force the race where getUserInfo() returns null. Verified manually that getUserName() still works."

commit | commitdiff | tree

Jason Monk [Tue, 23 May 2017 14:42:59 +0000 (10:42 -0400)]

Add test to verify all sysui tests extend the right stuff

And then make it pass.

Test: runtest systemui
Fixes: 38500852
Change-Id: I377164219e4a4f4d1a99f11ef06da03c2b527eb0

commit | commitdiff | tree

Sudheer Shanka [Thu, 25 May 2017 19:17:44 +0000 (19:17 +0000)]

Merge "[PackageManagerService]:Fix system app can't uninstall apps silently" into oc-dev

commit | commitdiff | tree

Tony Mak [Thu, 25 May 2017 19:17:25 +0000 (19:17 +0000)]

Merge "Fix permission is not granted to work profile system app by default" into oc-dev am: 0995b177ab
am: cb545cb5e2

Change-Id: I6264cd7ef5a570ef40c53b74ee6dbc97ad3215c1

commit | commitdiff | tree

Julia Reynolds [Thu, 25 May 2017 19:11:41 +0000 (19:11 +0000)]

Merge "Fix backup and restore of package blocks" into oc-dev am: 2686322e71
am: a878ee86ad

Change-Id: I902c07dd5ef4fff5bdab273b2ed81d15f4680d9a

commit | commitdiff | tree

Tony Mak [Thu, 25 May 2017 19:09:24 +0000 (19:09 +0000)]

Merge "Fix permission is not granted to work profile system app by default" into oc-dev
am: 0995b177ab

Change-Id: I0fa9263de3416837f361247ddd95b69cc70b1575

commit | commitdiff | tree

John Reck [Thu, 25 May 2017 19:09:23 +0000 (19:09 +0000)]

Merge "Creating HW bitmaps from RenderNode" into oc-dev am: d63b77c627
am: df26122880

Change-Id: I7af81dd30eac562d50540bfb0ac60ffe4270530d

commit | commitdiff | tree

Julia Reynolds [Thu, 25 May 2017 19:03:53 +0000 (19:03 +0000)]

Merge "Fix backup and restore of package blocks" into oc-dev
am: 2686322e71

Change-Id: Ic6d42f58038d7a4feead2f5a3c2c03f11f71e79e

commit | commitdiff | tree

John Reck [Thu, 25 May 2017 19:01:10 +0000 (19:01 +0000)]

Merge "Creating HW bitmaps from RenderNode" into oc-dev
am: d63b77c627

Change-Id: Ia95a9f190c36999f70fdadbe45e1774beab80988

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 19:00:53 +0000 (19:00 +0000)]

Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev am: c8124cb94c
am: 79160ff86b

Change-Id: Id7a00b5e2e544cac3e9de54a7d610b7a3e4c899d

commit | commitdiff | tree

Kevin Chyn [Thu, 25 May 2017 18:29:08 +0000 (11:29 -0700)]

Don't dismiss keyguard if guest has Pin/Pattern/PW set

Fixes: 38140390

Test: 1) create a guest, make sure if no pw is set keyguard dismisses
2) set a pw for the guest, make sure keyguard doesn't dismiss
3) lockout fingerprint by failing fp 5 times, then switch back to guest.
make sure error message is on bottom of screen.

Change-Id: Ic66fb3ac3e9bb62ac068f36208c73ffc14fe78d5

commit | commitdiff | tree

Tony Mak [Thu, 25 May 2017 18:57:32 +0000 (18:57 +0000)]

Merge "Fix permission is not granted to work profile system app by default" into oc-dev

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 18:54:14 +0000 (18:54 +0000)]

Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev
am: c8124cb94c

Change-Id: I10f0767e85c25e6257ab2d4f02e5a7d8a0ef6fac

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:48:56 +0000 (18:48 +0000)]

Merge "Fix backup and restore of package blocks" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:48:18 +0000 (18:48 +0000)]

Merge "Creating HW bitmaps from RenderNode" into oc-dev

commit | commitdiff | tree

Winson Chung [Wed, 24 May 2017 19:13:33 +0000 (12:13 -0700)]

Ensure that windows are drawn before starting transition into PiP.

- Building upon ag/2125930, we ensure that all windows are drawn before
starting the enter PiP animation.

Bug: 37420370
Test: bit FrameworksServicesTests:com.android.server.wm.BoundsAnimationControllerTests
Test: android.server.cts.ActivityManagerPinnedStackTests

Change-Id: I73fb71681f62bbc684efedbd3d40c3e1a670db46

commit | commitdiff | tree

Felipe Leme [Thu, 25 May 2017 18:39:09 +0000 (18:39 +0000)]

Merge "docs: Clarifying code snippet for View.autoFill()" into oc-dev

commit | commitdiff | tree

Erik Wolsheimer [Thu, 25 May 2017 18:36:02 +0000 (18:36 +0000)]

Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev am: 4c6a49ed47
am: 837e4b34b2

Change-Id: I402f0b15f529d9456b603d30cac09134316ee4e4

commit | commitdiff | tree

Makoto Onuki [Thu, 25 May 2017 18:27:52 +0000 (18:27 +0000)]

Merge "Working around bugreport crash issues" into oc-dev am: 5176a4cda3
am: 44cb1486f3

Change-Id: I70495f11952e9d234d74fa3fd7149dec70fb7350

commit | commitdiff | tree

Erik Wolsheimer [Thu, 25 May 2017 18:22:57 +0000 (18:22 +0000)]

Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev
am: 4c6a49ed47

Change-Id: Ib92f2dbad240bae9f46a23aa61eb2b7d09a96896

commit | commitdiff | tree

Jason Monk [Wed, 24 May 2017 18:57:10 +0000 (14:57 -0400)]

Fix up the QS gutter

- Don't show when collapsed, show divider instead
- Don't show when no notifications
- Animate between states while expanding/collapsing
- Other visual cleanup

Test: visual
Change-Id: I923c963fa70d63601b6a181299b04c5fc49922bb
Fixes: 38199857
Fixes: 38483355
Fixes: 38409326
Fixes: 38417776

commit | commitdiff | tree

Makoto Onuki [Thu, 25 May 2017 18:19:18 +0000 (18:19 +0000)]

Merge "Working around bugreport crash issues" into oc-dev
am: 5176a4cda3

Change-Id: Id5f50a4fad73b51079685b86839ccbe9912c2148

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:11:47 +0000 (18:11 +0000)]

Merge "wifi: override equals method for WifiSsid"

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:10:22 +0000 (18:10 +0000)]

Merge "Respect empty vibration effect configs in PhoneWindowManager and VibratorService" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 18:07:23 +0000 (18:07 +0000)]

Merge "Working around bugreport crash issues" into oc-dev

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 25 May 2017 17:42:41 +0000 (17:42 +0000)]

Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev am: 906948e7e2
am: d939f92dd0

Change-Id: If83f2175a06961cbe30ab1dfe9b849752ba882f3

commit | commitdiff | tree

Will Harmon [Thu, 18 May 2017 22:41:15 +0000 (15:41 -0700)]

Fix NPE in UserManager.getUserName(). Unlike all other calls to
getUserInfo(), getUserName() was the only one that did not check for
null. This has led to NPEs like in b/37589362.
Test: none. :( Not sure how to force the race where getUserInfo()
returns null. Verified manually that getUserName() still works.

Change-Id: I98ef06fe99ba760ae0194ec256fc9d1f39d3b7e5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 25 May 2017 17:32:23 +0000 (17:32 +0000)]

Merge "Merge "Fix guest tint" into oc-dev am: 70d4423eb6 am: dd4a9a2a18"

commit | commitdiff | tree

TreeHugger Robot [Thu, 25 May 2017 17:31:05 +0000 (17:31 +0000)]

Merge "Add Keyguard bottom area overlay."

commit | commitdiff | tree

Jason Monk [Thu, 25 May 2017 17:30:07 +0000 (17:30 +0000)]

Merge "Fix guest tint" into oc-dev am: 70d4423eb6
am: dd4a9a2a18

Change-Id: I6a765657f600b3d13028c26ba8c9726265721b59

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 25 May 2017 17:25:34 +0000 (17:25 +0000)]

Merge "Camera2: Fix broken onCaptureBufferLost callback" into oc-dev
am: 906948e7e2

Change-Id: I0007db72b0ca923c0e42bbb6ddadf34e927b5612