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

Todd Kennedy [Wed, 7 Jun 2017 19:06:21 +0000 (19:06 +0000)]

Merge "always adjust per-user application info" into oc-dev am: 91a9d65e42 am: 1581bb0b75
am: 443761ae57

Change-Id: I862284b43fe2aeb8ad5f38bb963d0ce30f29ea3e

commit | commitdiff | tree

Makoto Onuki [Wed, 7 Jun 2017 19:03:31 +0000 (19:03 +0000)]

Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f am: 4710a7ad03" into oc-dr1-dev-plus-aosp
am: 27e5b1676b

Change-Id: I9bc71d1f9de44f2b59e6f4f2f4490fdf5c600d09

commit | commitdiff | tree

Makoto Onuki [Wed, 7 Jun 2017 19:01:00 +0000 (19:01 +0000)]

Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f am: dd0f409b16
am: 9476d61c81

Change-Id: I6a608900ae83533be6761cc4de67b827e777878a

commit | commitdiff | tree

Todd Kennedy [Wed, 7 Jun 2017 18:55:19 +0000 (18:55 +0000)]

Merge "always adjust per-user application info" into oc-dev am: 91a9d65e42
am: 1581bb0b75

Change-Id: Ic1935a6051c78ffba6b1963373dc784d711c1c53

commit | commitdiff | tree

Selim Cinek [Wed, 7 Jun 2017 18:53:48 +0000 (18:53 +0000)]

Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 3158673eeb" into oc-dr1-dev-plus-aosp
am: dca73f48ce

Change-Id: I26a9c95a6de441d901f41fdd520d08d178e73d9f

commit | commitdiff | tree

Selim Cinek [Wed, 7 Jun 2017 18:51:24 +0000 (18:51 +0000)]

Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 0151c6886f" into oc-dr1-dev-plus-aosp
am: 0b28195727

Change-Id: I290639670e15542bb073b836e249692014cdd6c8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Jun 2017 18:50:59 +0000 (18:50 +0000)]

Merge "Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f am: 4710a7ad03" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Wed, 7 Jun 2017 18:49:58 +0000 (18:49 +0000)]

Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f
am: 4710a7ad03

Change-Id: I802eeffca56af708e47bcc1932708ac27f8e3262

commit | commitdiff | tree

Makoto Onuki [Wed, 7 Jun 2017 18:47:27 +0000 (18:47 +0000)]

Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev am: 28afa23a8f
am: dd0f409b16

Change-Id: I9567a83070a1203e58615e1f87a3e217371dbc3e

commit | commitdiff | tree

Albert Chaulk [Wed, 7 Jun 2017 18:44:17 +0000 (18:44 +0000)]

Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev am: 44bb9c7281
am: 8411eaf266

Change-Id: I4d97f9110add1be438b0a7ec0dbab3a1ad3ae551

commit | commitdiff | tree

Todd Kennedy [Wed, 7 Jun 2017 18:40:53 +0000 (18:40 +0000)]

Merge "always adjust per-user application info" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Makoto Onuki [Wed, 7 Jun 2017 18:40:44 +0000 (18:40 +0000)]

Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev
am: 28afa23a8f

Change-Id: I4c3561c8496a3892ca7a0ea425b979298b20acde

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Jun 2017 18:35:16 +0000 (18:35 +0000)]

Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 3158673eeb" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Wed, 7 Jun 2017 18:34:18 +0000 (18:34 +0000)]

Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e
am: 3158673eeb

Change-Id: I2001475c549a1ecf1dec7e469bddc3a22ce86b57

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Jun 2017 18:33:57 +0000 (18:33 +0000)]

Merge "Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e am: 0151c6886f" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Makoto Onuki [Wed, 7 Jun 2017 18:33:19 +0000 (18:33 +0000)]

Merge "Fix IndexOutOfRange in dumpsys content." into oc-dev

commit | commitdiff | tree

Selim Cinek [Wed, 7 Jun 2017 18:33:05 +0000 (18:33 +0000)]

Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev am: 295dd7193e
am: 0151c6886f

Change-Id: I9bc738f6bad45e314e077c2250fe3e086571db7a

commit | commitdiff | tree

Albert Chaulk [Wed, 7 Jun 2017 18:29:53 +0000 (18:29 +0000)]

Merge "Add a WM API to query the touch region for the input method window" into oc-dr1-dev
am: 44bb9c7281

Change-Id: I6ed7f3aa0ceef0bac2ec44889bb19c757d07f10d

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Jun 2017 18:23:42 +0000 (18:23 +0000)]

Merge "Don't autoexpand btw notifications"

commit | commitdiff | tree

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

commit | commitdiff | tree

Selim Cinek [Wed, 7 Jun 2017 18:22:09 +0000 (18:22 +0000)]

Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev
am: 295dd7193e

Change-Id: I8b80da001d23932c48e9721ee1f23850cf4dcb31

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Wed, 7 Jun 2017 17:47:56 +0000 (17:47 +0000)]

Merge "Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c am: df8c918129" into oc-dr1-dev-plus-aosp
am: 910563fca0

Change-Id: Ie5c45ad427a6faf60956828389e6194bd162756b

commit | commitdiff | tree

Jason Monk [Wed, 7 Jun 2017 17:43:12 +0000 (17:43 +0000)]

Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c am: 54d49157fd
am: f470c8f3e1

Change-Id: I477dcdfc276eaaa0b71242f7f56bc59b27142c60

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Jun 2017 17:39:26 +0000 (17:39 +0000)]

Merge "Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c am: df8c918129" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Jason Monk [Wed, 7 Jun 2017 17:36:43 +0000 (17:36 +0000)]

Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
am: df8c918129

Change-Id: I27f8a61c638ab63f6b0960884e60b8bed35df812

commit | commitdiff | tree

Jason Monk [Wed, 7 Jun 2017 17:36:36 +0000 (17:36 +0000)]

Merge "Make DND tile primary toggle remember favorite zen" into oc-dev am: 463985178c
am: 54d49157fd

Change-Id: I11fc1d70568497d264cdf76a9fe3687baa62a9ea

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Wed, 7 Jun 2017 17:28:23 +0000 (17:28 +0000)]

Merge "Make DND tile primary toggle remember favorite zen" into oc-dev
am: 463985178c

Change-Id: Iefa8e2707df45004a5ac37094ee93f1fac4721e9

commit | commitdiff | tree

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

commit | commitdiff | tree

John Reck [Wed, 7 Jun 2017 17:11:20 +0000 (17:11 +0000)]

Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: e871596f15" into oc-dr1-dev-plus-aosp
am: 70329318de

Change-Id: I4b49d917620b0659605866063478fd24aa285ba7

commit | commitdiff | tree

John Reck [Wed, 7 Jun 2017 17:06:44 +0000 (17:06 +0000)]

Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: 4ee3fb4c54
am: 1079279d53

Change-Id: I0806c1aea547075a92dfde8b0602ca4deb5cde53

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Jun 2017 17:00:50 +0000 (17:00 +0000)]

Merge "Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa am: e871596f15" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

John Reck [Wed, 7 Jun 2017 16:58:58 +0000 (16:58 +0000)]

Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
am: e871596f15

Change-Id: I9813e607ebaec363fe6cd1c7b389b8c4ce2d5e74

commit | commitdiff | tree

John Reck [Wed, 7 Jun 2017 16:58:09 +0000 (16:58 +0000)]

Merge "Clear native shader when Paint shader changes" into oc-dev am: d3e78478aa
am: 4ee3fb4c54

Change-Id: I9fceeec5fd1db92c7f47f0bcde5278b0e84a6b55

commit | commitdiff | tree

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

commit | commitdiff | tree

John Reck [Wed, 7 Jun 2017 16:49:08 +0000 (16:49 +0000)]

Merge "Clear native shader when Paint shader changes" into oc-dev
am: d3e78478aa

Change-Id: I8d9c87e232ee1bbc77f3c5618f5856e891c78a74

commit | commitdiff | tree

John Reck [Wed, 7 Jun 2017 16:42:43 +0000 (16:42 +0000)]

Merge "Clear native shader when Paint shader changes" into oc-dev

commit | commitdiff | tree

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)

commit | commitdiff | tree

Daniel Sandler [Wed, 7 Jun 2017 15:52:00 +0000 (15:52 +0000)]

Merge "Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5 am: 107bfc46c6" into oc-dr1-dev-plus-aosp
am: 5774a889d7

Change-Id: Iab055c57296302b9fbac93e8a7955781c1b416b8

commit | commitdiff | tree

Daniel Sandler [Wed, 7 Jun 2017 15:49:41 +0000 (15:49 +0000)]

Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5 am: 2fe945c3a9
am: fec9ff30c0

Change-Id: I53a604aa950de58970e9dfb43e5846ecbe56a634

commit | commitdiff | tree

Wale Ogunwale [Wed, 7 Jun 2017 15:47:11 +0000 (15:47 +0000)]

Merge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0 am: 805e32d19d" into oc-dr1-dev-plus-aosp
am: ce8b01a53a

Change-Id: I728b28e0ae326ca03ad020d2c243d9ebc70e1b80

commit | commitdiff | tree

Wale Ogunwale [Wed, 7 Jun 2017 15:45:05 +0000 (15:45 +0000)]

Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0 am: ffbef55373
am: 56fa261fec

Change-Id: I93eb7ccc1a12621dc1a06d4576b788c7fbde1d83

commit | commitdiff | tree

Erik Kline [Wed, 7 Jun 2017 15:42:31 +0000 (15:42 +0000)]

Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3 am: f22995eed5 am: 48c3c00ee1
am: 4a1059ca0e

Change-Id: I2695841bfc31280060754132e589af1ca95911da

commit | commitdiff | tree

Hyunyoung Song [Wed, 7 Jun 2017 15:39:58 +0000 (15:39 +0000)]

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be am: 38568aff22
am: af63dabff9

Change-Id: I3e0df515908b03ff5af350d21f9e113d6606f0b4

commit | commitdiff | tree

Michael Wright [Wed, 7 Jun 2017 15:37:33 +0000 (15:37 +0000)]

Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b am: 9468ded040
am: 7e4ea727e2

Change-Id: I58a0f10a8a8c6e02b70218313319fd0de848c05d

commit | commitdiff | tree

Hugo Benichi [Wed, 7 Jun 2017 15:35:33 +0000 (15:35 +0000)]

Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4 am: 75faf02f04 am: f5b8d18798
am: 6c91a5bfad

Change-Id: I63f264673f4eb34e69a199f39552704196ab6a78

commit | commitdiff | tree

Hyunyoung Song [Wed, 7 Jun 2017 15:33:05 +0000 (15:33 +0000)]

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be am: 537a788091
am: d241ae7bd0

Change-Id: I6ad58d21f8ea2678f7ac954cf34cf55ef2f5b46f

commit | commitdiff | tree

Michael Wright [Wed, 7 Jun 2017 15:30:40 +0000 (15:30 +0000)]

Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b am: d581113dc1
am: 428bb9a193

Change-Id: I39ae10c4776bfabb7f3aadd893f650e9fcda32c7

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Jun 2017 15:10:58 +0000 (15:10 +0000)]

Merge "Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5 am: 107bfc46c6" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Daniel Sandler [Wed, 7 Jun 2017 15:09:57 +0000 (15:09 +0000)]

Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
am: 107bfc46c6

Change-Id: I407983d32ce8d2a6758f0125963d128db496d225

commit | commitdiff | tree

Daniel Sandler [Wed, 7 Jun 2017 15:07:25 +0000 (15:07 +0000)]

Merge "Use correct timebase in fg service notifications." into oc-dev am: 630e7841e5
am: 2fe945c3a9

Change-Id: I5d851b00b92c88bf9b23bbdd021c207714abd6d9

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Jun 2017 15:00:29 +0000 (15:00 +0000)]

Merge "Add a WM API to query the touch region for the input method window"

commit | commitdiff | tree

Daniel Sandler [Wed, 7 Jun 2017 14:56:41 +0000 (14:56 +0000)]

Merge "Use correct timebase in fg service notifications." into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Jun 2017 14:00:43 +0000 (14:00 +0000)]

Merge "Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0 am: 805e32d19d" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Wale Ogunwale [Wed, 7 Jun 2017 13:58:26 +0000 (13:58 +0000)]

Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
am: ffbef55373

Change-Id: I77e47932a4a74ddcebf9138b009407f144d5f725

commit | commitdiff | tree

Wale Ogunwale [Wed, 7 Jun 2017 13:58:22 +0000 (13:58 +0000)]

Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev am: 7925f817d0
am: 805e32d19d

Change-Id: If05930440d7e095b46a0a65ebe1e03fa1741b02b

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wale Ogunwale [Wed, 7 Jun 2017 13:45:02 +0000 (13:45 +0000)]

Merge "Fixed NPE in TaskStack.stepAppWindowAnimation" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Wed, 7 Jun 2017 09:59:43 +0000 (09:59 +0000)]

Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3 am: f22995eed5
am: 48c3c00ee1

Change-Id: I9a05f34035a15b233a44d517f2b2426481679974

commit | commitdiff | tree

Erik Kline [Wed, 7 Jun 2017 09:51:52 +0000 (09:51 +0000)]

Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
am: f22995eed5

Change-Id: Ibde5e3e048236d32ea3c1ba2c2700bb6a75323e6

commit | commitdiff | tree

Erik Kline [Wed, 7 Jun 2017 09:46:11 +0000 (09:46 +0000)]

Merge "Add additional mocking for Context innards" am: a65aa77c1c
am: 35182218d3

Change-Id: I7f08086badfddcf9d667a749cf035e36366f9a7c

commit | commitdiff | tree

Erik Kline [Wed, 7 Jun 2017 09:40:37 +0000 (09:40 +0000)]

Merge "Add additional mocking for Context innards"
am: a65aa77c1c

Change-Id: I7f780c05c46b00457b194bfb13df5814735f0809

commit | commitdiff | tree

Treehugger Robot [Wed, 7 Jun 2017 09:32:02 +0000 (09:32 +0000)]

Merge "Add additional mocking for Context innards"

commit | commitdiff | tree

Hyunyoung Song [Wed, 7 Jun 2017 09:14:05 +0000 (09:14 +0000)]

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
am: 38568aff22

Change-Id: I913abeb2222f1fb4af814ea9741608671e30fa30

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Jun 2017 09:11:18 +0000 (09:11 +0000)]

Merge "Introduce legacy settings restore whitelists"

commit | commitdiff | tree

Michael Wright [Wed, 7 Jun 2017 09:11:06 +0000 (09:11 +0000)]

Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
am: 9468ded040

Change-Id: If985d418af3dae02bff7c40cdb30051c8eaaf7ab

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hugo Benichi [Wed, 7 Jun 2017 08:58:04 +0000 (08:58 +0000)]

Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4 am: 75faf02f04
am: f5b8d18798

Change-Id: I5f7e59c7bcd7df41e0e243612c93c16fb64038c4

commit | commitdiff | tree

Hugo Benichi [Wed, 7 Jun 2017 08:51:43 +0000 (08:51 +0000)]

Merge "Captive portal login shows specific network name" am: 01fb05cf62 am: 93fe99aca4
am: 75faf02f04

Change-Id: I1561ccd2676315f3110f20fcbfbd55453f92cbed

commit | commitdiff | tree

Erik Kline [Wed, 7 Jun 2017 07:33:19 +0000 (16:33 +0900)]

Add additional mocking for Context innards

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - cherry-picked to master and verified there as well
Bug: 32163131
Bug: 32561414

Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07

commit | commitdiff | tree

Hugo Benichi [Wed, 7 Jun 2017 08:43:08 +0000 (08:43 +0000)]

Merge "Captive portal login shows specific network name" am: 01fb05cf62
am: 93fe99aca4

Change-Id: Ie4a418296de498b7d4b4eca75f2d0b3192ed4c64

commit | commitdiff | tree

Hyunyoung Song [Wed, 7 Jun 2017 08:39:54 +0000 (08:39 +0000)]

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
am: 537a788091

Change-Id: I002dd3afdbbdfe2db2fc42a4139936c198dccdac

commit | commitdiff | tree

Michael Wright [Wed, 7 Jun 2017 08:37:47 +0000 (08:37 +0000)]

Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
am: d581113dc1

Change-Id: I6a9d56e5c6678a1e1d75e9cf74c27362e288a7b3

commit | commitdiff | tree

Hugo Benichi [Wed, 7 Jun 2017 08:35:51 +0000 (08:35 +0000)]

Merge "Captive portal login shows specific network name"
am: 01fb05cf62

Change-Id: I205b37d204250d7fc188b2d7d23593d22d03b89d

commit | commitdiff | tree

Hugo Benichi [Wed, 7 Jun 2017 08:11:20 +0000 (08:11 +0000)]

Merge "Captive portal login shows specific network name"

commit | commitdiff | tree

Hyunyoung Song [Wed, 7 Jun 2017 08:08:24 +0000 (08:08 +0000)]

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev am: bb4aeb19be
am: 537a788091

Change-Id: I21cbccf44ebff1b7ed8c9cf21a6ca3583a5ec214

commit | commitdiff | tree

Hyunyoung Song [Wed, 7 Jun 2017 07:58:58 +0000 (07:58 +0000)]

Merge "Change Android default icon b/35314247 Test: manual" into oc-dev
am: bb4aeb19be

Change-Id: Ie9996ca6a1197dbaf877229c932eba758e15eb5d

commit | commitdiff | tree

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

commit | commitdiff | tree

Michael Wright [Wed, 7 Jun 2017 07:40:56 +0000 (07:40 +0000)]

Merge "Actually wait until the display is ready." into oc-dev am: 496267f93b
am: d581113dc1

Change-Id: If144b976ba2e5e375760b1f26f8472533a5b20cc

commit | commitdiff | tree

Michael Wright [Wed, 7 Jun 2017 07:32:49 +0000 (07:32 +0000)]

Merge "Actually wait until the display is ready." into oc-dev
am: 496267f93b

Change-Id: I41bf93f65c215cc841485c7570c7a7e78a0fdf93

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Jun 2017 07:22:52 +0000 (07:22 +0000)]

Merge "Actually wait until the display is ready." into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Roozbeh Pournader [Wed, 7 Jun 2017 06:21:40 +0000 (06:21 +0000)]

Merge "Move tests with private APIs to coretests"

commit | commitdiff | tree

Qingxi Li [Wed, 7 Jun 2017 04:50:21 +0000 (04:50 +0000)]

Merge "Only show the "Disable eSIM" when eSIM profile is enabled"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 7 Jun 2017 04:12:44 +0000 (04:12 +0000)]

Merge "Fix crash in test" into oc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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