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

Sungsoo Lim [Thu, 3 Aug 2017 01:13:44 +0000 (01:13 +0000)]

Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am: 6a2ee3b180
am: c0fe5b2d88

Change-Id: Ide73412189493c193f53b3118a2dc57391ffe70e

commit | commitdiff | tree

Sungsoo Lim [Thu, 3 Aug 2017 01:03:48 +0000 (01:03 +0000)]

Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev
am: 6a2ee3b180

Change-Id: Ia42104e2fb75d867279fe8d553c807d5dcfac06d

commit | commitdiff | tree

Sungsoo Lim [Thu, 3 Aug 2017 00:52:27 +0000 (00:52 +0000)]

Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev

commit | commitdiff | tree

Sungsoo Lim [Mon, 24 Jul 2017 13:29:27 +0000 (22:29 +0900)]

Check CookieHandler in setDataSource with cookies

If the caller of MediaPlayer.setDataSource has installed its own
CookieHandler when cookies are provided, MediaPlayer.setDataSource
requires that the CookieHandler has to be of CookieManager type.

Bug: 63638018
Test: manual
Change-Id: I1539d1fa83440ddfb00cc958cd46b9917fe3a296

commit | commitdiff | tree

Bill Yi [Thu, 3 Aug 2017 00:40:35 +0000 (00:40 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours
am: 7eed96cc1c -s ours

Change-Id: I1fe5f42babe19bd8d4b90d3bfff2877cf06a7fbe

commit | commitdiff | tree

Bill Yi [Thu, 3 Aug 2017 00:37:41 +0000 (00:37 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours
am: 37f90d5767 -s ours

Change-Id: I575b7b2d41f1660de1628faf192e9031fd409a8a

commit | commitdiff | tree

Dianne Hackborn [Thu, 3 Aug 2017 00:36:08 +0000 (00:36 +0000)]

Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev
am: 530cfc1db3

Change-Id: I2b1515dcc6acbffa43e1cfda1d1c8f68a077b1ad

commit | commitdiff | tree

Bill Yi [Thu, 3 Aug 2017 00:31:04 +0000 (00:31 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e1f66b297d -s ours

Change-Id: I533bd4785a565770f4b678b08aa64c27a9261833

commit | commitdiff | tree

Bill Yi [Thu, 3 Aug 2017 00:30:51 +0000 (00:30 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: e1f66b297d -s ours

Change-Id: I427a4ab63aca8bac7ff2c4a251052becf018b7d8

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Aug 2017 00:29:25 +0000 (00:29 +0000)]

Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Thu, 3 Aug 2017 00:25:45 +0000 (00:25 +0000)]

Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev
am: 7606d4798b

Change-Id: Id2b9df26bc9752e10b7ff1a3b981d2721eb747a9

commit | commitdiff | tree

John Reck [Thu, 3 Aug 2017 00:22:13 +0000 (00:22 +0000)]

Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67 am: 11d331a2af
am: e25db57060

Change-Id: Ibf6b77fae613c255dbd85ff3b565d79bcd5f04bb

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:16:54 +0000 (00:16 +0000)]

Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: ebc05a6a42" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Thu, 3 Aug 2017 00:14:15 +0000 (00:14 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255
am: ebc05a6a42

Change-Id: I180ffea5b3ac59019b64f2d7859794faecf1fb10

commit | commitdiff | tree

Steven Moreland [Thu, 3 Aug 2017 00:12:49 +0000 (00:12 +0000)]

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours am: 79e124c9c7 -s ours am: 0666e1cd5c -s ours
am: 4033c5e1b7 -s ours

Change-Id: I0123c124dcd6f0b74af3c6c57783e318c0892323

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Aug 2017 00:12:34 +0000 (00:12 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

commit | commitdiff | tree

John Reck [Thu, 3 Aug 2017 00:06:48 +0000 (00:06 +0000)]

Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67
am: 11d331a2af

Change-Id: I6f293b65cfc734beeafc510baa7121945de208e4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:04:48 +0000 (00:04 +0000)]

Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev am: b1e8d97867" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ningyuan Wang [Thu, 3 Aug 2017 00:02:52 +0000 (00:02 +0000)]

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev
am: b1e8d97867

Change-Id: Ifd8b2fcb43d8cc59fda3a59ef358442d7dd80b3c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:02:17 +0000 (00:02 +0000)]

Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev am: 93111a9762" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Christine Franks [Thu, 3 Aug 2017 00:00:40 +0000 (00:00 +0000)]

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev
am: 93111a9762

Change-Id: I9f39b8bbead5993bd147577a0452a19d56f71d35

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 3 Aug 2017 00:00:16 +0000 (00:00 +0000)]

Merge "Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev am: ad825bdfd7" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:58:25 +0000 (23:58 +0000)]

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev
am: ad825bdfd7

Change-Id: I38873a197f94af5013cf8fdd8ad014969bae14f8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:57:26 +0000 (23:57 +0000)]

Merge "Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev am: e57175c090" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:56:20 +0000 (23:56 +0000)]

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours am: 79e124c9c7 -s ours
am: 0666e1cd5c -s ours

Change-Id: Ibddc7b339d8cba53c73b2471bab11eabca82fa33

commit | commitdiff | tree

John Reck [Wed, 2 Aug 2017 23:55:41 +0000 (23:55 +0000)]

Merge "Fix compile issue" am: 27b56eb03f
am: 60c65f1a67

Change-Id: I8ee620ac2fec24c56a40f2b9be1aa0665a0146bf

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Aug 2017 23:54:47 +0000 (23:54 +0000)]

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev
am: e57175c090

Change-Id: I7f2776087d873bbd3c25c130a2ee14dfbe6bf7b5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:54:18 +0000 (23:54 +0000)]

Merge "Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev am: 1cec6be3f5" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 23:50:51 +0000 (23:50 +0000)]

Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev
am: 1cec6be3f5

Change-Id: Idc939a1811dc84174cdba7912e4f8a4a0915f688

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:48:28 +0000 (23:48 +0000)]

Merge "Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev am: 334e733ea2" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

John Reck [Wed, 2 Aug 2017 23:47:23 +0000 (23:47 +0000)]

Merge "Fix compile issue"
am: 27b56eb03f

Change-Id: I052fdfdc4f3a75f9ddaa6e9e445d706e22574113

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:46:30 +0000 (23:46 +0000)]

Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255 am: 5af217b346" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 23:45:42 +0000 (23:45 +0000)]

Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev
am: 334e733ea2

Change-Id: I30a14e0e9677158082cf83a04328697c50c5587d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:44:54 +0000 (23:44 +0000)]

Merge "Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af" into oc-mr1-dev am: 988a6dd5e3" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:44:41 +0000 (23:44 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev am: 7c4069d255
am: 5af217b346

Change-Id: Ia961f9732df252a825a5b86385aeb723c69c0dee

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:44:30 +0000 (23:44 +0000)]

Merge "com.android.server: use proper nativehelper headers" am: 41a7f5a64f -s ours
am: 79e124c9c7 -s ours

Change-Id: I550d6ce82513fc8e160597ba2ff89b6c5efa286a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:43:33 +0000 (23:43 +0000)]

Merge "Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3 am: c4f129121e am: 1535b8ca3b" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:43:27 +0000 (23:43 +0000)]

Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af" into oc-mr1-dev
am: 988a6dd5e3

Change-Id: I12d0a463d4f397b213aa83e434e983689ecdd075

commit | commitdiff | tree

Josh Gao [Wed, 2 Aug 2017 23:41:39 +0000 (23:41 +0000)]

Merge "zygote: always log process exit reason." am: b14694b043 am: 1453059ae3 am: c4f129121e
am: 1535b8ca3b

Change-Id: I3b22c17c86b80888167654ee18cb8bac3dbadb88

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 23:40:32 +0000 (23:40 +0000)]

Merge "Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am: 0ee78fd385" into oc-mr1-dev
am: 4f4535500e

Change-Id: I999883d77a28bc72b0fb5db7d8fc17a32213ede6

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 23:39:39 +0000 (23:39 +0000)]

Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 23:38:31 +0000 (23:38 +0000)]

Merge "Merge "Start all visible running activities when attaching app" into oc-dr1-dev am: 2af6f25f43" into oc-mr1-dev
am: 966fbc0435

Change-Id: I6946948432e0d11271af1b13af99f2eea49698cd

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:37:04 +0000 (23:37 +0000)]

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8 am: 2ac51662c2" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ningyuan Wang [Wed, 2 Aug 2017 23:33:16 +0000 (23:33 +0000)]

Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8
am: 2ac51662c2

Change-Id: Iba59ba59df4bd1a5e773da6a76e54ee092ac551f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:31:46 +0000 (23:31 +0000)]

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3 am: 27191ac475" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Christine Franks [Wed, 2 Aug 2017 23:29:12 +0000 (23:29 +0000)]

Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3
am: 27191ac475

Change-Id: I195d9e0f5536ac12ae4622e011fb3a0f0b01d3c3

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:28:45 +0000 (23:28 +0000)]

Merge "Merge "services.core: remove use of -static hidl java" into stage-aosp-master am: e79a0931f7 am: 9bd5b76318 -s ours am: 9dbda410bc -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:26:20 +0000 (23:26 +0000)]

Merge "services.core: remove use of -static hidl java" into stage-aosp-master am: e79a0931f7 am: 9bd5b76318 -s ours
am: 9dbda410bc -s ours

Change-Id: I287db1685c0ff95c8b9516b86014b7d05affb9a5

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 23:25:32 +0000 (23:25 +0000)]

Merge "Fix compile issue"

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:25:13 +0000 (23:25 +0000)]

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63 am: 21cd29e235" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:22:17 +0000 (23:22 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev
am: 7c4069d255

Change-Id: Ifc4138b41e801baf2acb06f83fd77115a74e71f2

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:21:21 +0000 (23:21 +0000)]

Merge "Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am: e81cdeea1c" into oc-mr1-dev am: 17d16ef49b" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:19:34 +0000 (23:19 +0000)]

Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63
am: 21cd29e235

Change-Id: I30034a1df51296ae3aa5bc74af65dca415d13873

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:19:33 +0000 (23:19 +0000)]

Merge "com.android.server: use proper nativehelper headers"
am: 41a7f5a64f -s ours

Change-Id: I470a1998cecb2254f38ea62b08e2408b9b3d4567

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:17:29 +0000 (23:17 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev
am: 7c4069d255

Change-Id: I3fee2180df9f1b18aae17eeae97b5f0006226c64

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:17:29 +0000 (23:17 +0000)]

Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am: e81cdeea1c" into oc-mr1-dev
am: 17d16ef49b

Change-Id: Id0560024ee57a7d3487eca480fcf5053c544948c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:16:46 +0000 (23:16 +0000)]

Merge "Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev am: 25cdef21dc" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:14:40 +0000 (23:14 +0000)]

Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 23:14:12 +0000 (23:14 +0000)]

Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev
am: 25cdef21dc

Change-Id: Ie12c51a826909b5224632bc26a871d984435b18a

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:13:43 +0000 (23:13 +0000)]

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d am: 27d9ca08da" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:13:27 +0000 (23:13 +0000)]

Merge "Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev am: fe268483d0" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 23:10:34 +0000 (23:10 +0000)]

Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev
am: fe268483d0

Change-Id: I490c840fa56354e0a2122e1ff389e433e50087aa

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Aug 2017 23:10:28 +0000 (23:10 +0000)]

Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d
am: 27d9ca08da

Change-Id: If7609c87ad507f9ec6cd3fd19d779e68c55e6280

commit | commitdiff | tree

Ningyuan Wang [Wed, 2 Aug 2017 23:10:14 +0000 (23:10 +0000)]

Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev
am: 54e6518fc8

Change-Id: Ic02b8506afbd900d1fec0946148cd8f1a76ee5ce

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:10:09 +0000 (23:10 +0000)]

Merge "Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71 am: 64dd913f68" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:09:40 +0000 (23:09 +0000)]

Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am: 8d753bc3a3" into oc-mr1-dev

commit | commitdiff | tree

Christine Franks [Wed, 2 Aug 2017 23:07:31 +0000 (23:07 +0000)]

Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev
am: 8d753bc3a3

Change-Id: I138f6c945606caaaf129de5625c4d9bb7add42d8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:07:00 +0000 (23:07 +0000)]

Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am: 46f2cdeb63" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:06:59 +0000 (23:06 +0000)]

Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481 am: 7def2eea97" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 23:06:40 +0000 (23:06 +0000)]

Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71
am: 64dd913f68

Change-Id: Idd3ad3c47651b229e9b1642cee03af2288458712

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 23:05:12 +0000 (23:05 +0000)]

Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev
am: 46f2cdeb63

Change-Id: Ibdbeefd3c375504e935f938fe6e5008644ef7b66

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 23:04:58 +0000 (23:04 +0000)]

Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481
am: 7def2eea97

Change-Id: I538777a295628827fc3052c58641cbb659afad20

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:04:34 +0000 (23:04 +0000)]

Merge "Merge "Remove Conferenceable update squelching" into oc-dr1-dev am: 4b6ef9c92d" into oc-mr1-dev

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Aug 2017 23:02:46 +0000 (23:02 +0000)]

Merge "Remove Conferenceable update squelching" into oc-dr1-dev
am: 4b6ef9c92d

Change-Id: I30fbedd2fa26482d520fef48f0dd81aa923b06b7

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:02:16 +0000 (23:02 +0000)]

Merge "Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 23:02:06 +0000 (23:02 +0000)]

Merge "Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am: 9f11a24d9c" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Treehugger Robot [Wed, 2 Aug 2017 23:02:04 +0000 (23:02 +0000)]

Merge "com.android.server: use proper nativehelper headers"

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:00:50 +0000 (23:00 +0000)]

Merge "Reland "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp
am: 9f11a24d9c

Change-Id: If67fbbe4faa24eb01312a15e50763c0b297f271b

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 22:59:51 +0000 (22:59 +0000)]

Merge "Fix keyboard focus in VR" into oc-dr1-dev
am: 986995d481

Change-Id: I693c1256583dc1081c6402668401c6aab2337d16

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 22:59:25 +0000 (22:59 +0000)]

Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277" into oc-mr1-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 22:58:22 +0000 (22:58 +0000)]

Merge "Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev am: c7937c13f6 -s ours am: be0b8cdfa9" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 22:58:15 +0000 (22:58 +0000)]

Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89
am: 615f9e1277

Change-Id: I9ea51423e88f90648f480c55d4567db6cee6ef98

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 22:57:53 +0000 (22:57 +0000)]

Merge "Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af" into oc-mr1-dev

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Aug 2017 22:57:05 +0000 (22:57 +0000)]

Merge "Send TYPE_NOTIFICATION_STATE_CHANGED events for IMPORTANCE_LOW notifications." into oc-dr1-dev am: c7937c13f6 -s ours
am: be0b8cdfa9

Change-Id: I4328eb2ef77ad9322e017a9a96d4455d199c1629

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 22:56:40 +0000 (22:56 +0000)]

Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev
am: adec8518af

Change-Id: Id3700db64134667e48d6d4f5f5566e6a3c9f4f00

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 22:56:16 +0000 (22:56 +0000)]

Merge "Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am: 0ee78fd385" into oc-mr1-dev

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 22:55:01 +0000 (22:55 +0000)]

Merge "Fixed a clipping issue in AOD" into oc-dr1-dev
am: 0ee78fd385

Change-Id: I5c793c7dc11e1acac82feed8f4bada2a9f493ede

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 22:54:52 +0000 (22:54 +0000)]

Merge "Move VR preference for portrait orientation." into oc-dr1-dev

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 22:54:40 +0000 (22:54 +0000)]

Merge "Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: d5cc64f349" into oc-dr1-dev-plus-aosp
am: 8e00d3f2bf

Change-Id: I4901d05222f9641b1d5ebcff4af37e7175de35db

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 22:54:38 +0000 (22:54 +0000)]

Merge "Merge "Start all visible running activities when attaching app" into oc-dr1-dev am: 2af6f25f43" into oc-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 22:53:25 +0000 (22:53 +0000)]

Merge "Start all visible running activities when attaching app" into oc-dr1-dev
am: 2af6f25f43

Change-Id: I54f1aedb4cbcc4d11d8e79c7b9f5c496902baaca

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 22:52:59 +0000 (22:52 +0000)]

Merge "Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev am: e81cdeea1c" into oc-mr1-dev

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 22:52:51 +0000 (22:52 +0000)]

Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277
am: 5a7aefdb3d

Change-Id: I1ab537b6cc391b67e67b99bbb2f6da9dce545b45

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 22:51:23 +0000 (22:51 +0000)]

Merge "SysUI: Move all sensor operations to the background thread" into oc-dr1-dev
am: e81cdeea1c

Change-Id: Idd7b5d3741f629b560e9de5b985d895a45e8a532

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 22:51:13 +0000 (22:51 +0000)]

Merge "Ensure that all displays are updated upon any changes to rotation." into oc-dr1-dev am: adec8518af
am: e061cc2e62

Change-Id: I3f300846fa7f2b6e063b67f8d39e76837d6fdeac

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 2 Aug 2017 22:51:00 +0000 (22:51 +0000)]

Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd" into oc-mr1-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 22:49:42 +0000 (22:49 +0000)]

Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
am: 65abebbadd

Change-Id: I6ef312422ea84b352f8d07a9937c64394b14776a

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 22:49:41 +0000 (22:49 +0000)]

Merge "Fixed a clipping issue in AOD" into oc-dr1-dev am: 0ee78fd385
am: cda30ced91

Change-Id: I45f177ac94bedefd20ad69995b845994f158dcd2

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 22:48:44 +0000 (22:48 +0000)]

Merge "Give DeviceStorageMonitorService it's own thread." into oc-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 22:48:00 +0000 (22:48 +0000)]

Merge "Start all visible running activities when attaching app" into oc-dr1-dev am: 2af6f25f43
am: d80432788e

Change-Id: I35bc021419486d0e9d263e4b1608097a89a6046e