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

Jeff Sharkey [Thu, 3 Aug 2017 00:38:01 +0000 (00:38 +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
am: f749719e53

Change-Id: Id188cf438f1425c266e6806f231fb65987a4f13c

commit | commitdiff | tree

Brad Ebinger [Thu, 3 Aug 2017 00:36:19 +0000 (00:36 +0000)]

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

Change-Id: I693583e03a714bb4d8dbd2b6aefdb862ac0c0cdd

commit | commitdiff | tree

Jeff Sharkey [Thu, 3 Aug 2017 00:34:26 +0000 (00:34 +0000)]

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

Change-Id: I93bf2a67e6d84cb91ff36d447c3fcd4156787e95

commit | commitdiff | tree

TreeHugger Robot [Thu, 3 Aug 2017 00:19:44 +0000 (00:19 +0000)]

Merge "Add backend ISO and Focal Length support to Metadata Reader"

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 23:52:48 +0000 (23:52 +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
am: 49a29f000f

Change-Id: Ib2b8b1bddf40bb83ee534948147458c2e7823a38

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 23:44:16 +0000 (23:44 +0000)]

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

Change-Id: I9ceea32fa06bab6416a341998425e9d176c054e6

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 23:40:48 +0000 (23:40 +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
am: b32d55c6bc

Change-Id: I2824b5a2df1852e7dc8e1e591e4447ccf49e7d73

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Aug 2017 23:33:21 +0000 (23:33 +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
am: 3df052495b

Change-Id: I804df477f0f340cf66428cd3935dba3aa03a28a4

commit | commitdiff | tree

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

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

Change-Id: I6dbc6475e36beb65b865e18e31f79177c8608cda

commit | commitdiff | tree

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

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

Change-Id: I24a94de47634379da81072f6409da7444d4ce34a

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 23:24:00 +0000 (23:24 +0000)]

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

Change-Id: I2bee5bfcd57b09a1d06e3a670efa3233d4f659dc

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

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

Selim Cinek [Wed, 2 Aug 2017 23:11:21 +0000 (23:11 +0000)]

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

Change-Id: I77b0023182c07301db35f7a3f8e67a75b6ae685b

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

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

Jorim Jaggi [Wed, 2 Aug 2017 23:09:12 +0000 (23:09 +0000)]

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

Change-Id: I113dc1bfc6d716526086fabfc21e6019701bb9b5

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

Adrian Roos [Wed, 2 Aug 2017 23:06:47 +0000 (23:06 +0000)]

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

Change-Id: I3856f8c0a087e776e6849c650ae2485d39d59ff6

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

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

Jeff Sharkey [Wed, 2 Aug 2017 23:04:49 +0000 (23:04 +0000)]

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

Change-Id: I24a948b29145434376b03c3e12d23f7c7a83b0f4

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

Evan Rosky [Wed, 2 Aug 2017 23:00:57 +0000 (23:00 +0000)]

Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71 am: 756685b506
am: caab68931b

Change-Id: I22e1e9364d586579942f968d2f6e52687a8db276

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

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

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

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

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

Daniel Sandler [Wed, 2 Aug 2017 22:52:15 +0000 (22:52 +0000)]

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

Change-Id: I68ac5785cb4def700461c2c976f9351f79346306

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

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 22:46:12 +0000 (22:46 +0000)]

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

Change-Id: Ia62990477d0f7b49658f841a1f5962b8b2ead580

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 22:43:52 +0000 (22:43 +0000)]

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

Change-Id: I4bb82ed141cf10d74c5e6d0c08346cd6aeb73931

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 22:42:21 +0000 (22:42 +0000)]

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

Change-Id: I0b0fe6f7cc07362e98f7a5a2b54aa66bbd5ffc7f

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 22:40:48 +0000 (22:40 +0000)]

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

Change-Id: I097489465c8bc066ddba04ea858c32f4af463a66

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Aug 2017 22:38:45 +0000 (22:38 +0000)]

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

Change-Id: I717e4fcdf76b12c7c3fce2058736d924a991c657

commit | commitdiff | tree

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

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

Change-Id: I466f7aa7f0cb0385343cabab94289c59c5f290eb

commit | commitdiff | tree

Julian Mancini [Wed, 2 Aug 2017 16:13:29 +0000 (09:13 -0700)]

Add backend ISO and Focal Length support to Metadata Reader

In this CL, I add 2 new tags to the defaults in Metadata Reader so that
Files App can get the data and display it to the user.

Bug: 64267283
Test: MetadataReaderTest.java
Change-Id: Ibb8607f001a390e38e87416ad2fb61ee81a5c7ee

commit | commitdiff | tree

Derek Sollenberger [Wed, 2 Aug 2017 21:59:28 +0000 (21:59 +0000)]

Merge "Revert "Use colorFilters when rendering to an sRGB bitmap.""

commit | commitdiff | tree

Derek Sollenberger [Wed, 2 Aug 2017 21:57:42 +0000 (21:57 +0000)]

Revert "Use colorFilters when rendering to an sRGB bitmap."

This reverts commit b851b197497783f894b72edcaed8f93d035ddea0.

Change-Id: I5bb8fe9bf9f5d411674e289c467b3f569f7bb068

commit | commitdiff | tree

Brad Ebinger [Wed, 2 Aug 2017 21:40:34 +0000 (21:40 +0000)]

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

Change-Id: I93a849f16c7c4d3bc4495f1baff905d16f0e78ff

commit | commitdiff | tree

Fan Zhang [Wed, 2 Aug 2017 21:40:02 +0000 (21:40 +0000)]

Merge "Misc change to support loading dynamic summary/icon in app"

commit | commitdiff | tree

Fan Zhang [Wed, 26 Jul 2017 18:00:51 +0000 (11:00 -0700)]

Misc change to support loading dynamic summary/icon in app

- Add ThreadUtils.postOnBackground helper method
- Don't fallback to app.icon if tile's metadata contains icon uri
- Deprecate TITLE_RES_ID in favor of TITLE metadata

Bug: 63758074
Test: robotests
Change-Id: Ie60fb4677cdb12c3ff313ffdfdb4a4f4960fac0f

commit | commitdiff | tree

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

Merge "Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev am: 6e8e322ea1 am: 6359944a19"

commit | commitdiff | tree

Jeremy Joslin [Wed, 2 Aug 2017 21:33:35 +0000 (21:33 +0000)]

Merge "NetworkRecommendationProviders require the location permission."

commit | commitdiff | tree

Roozbeh Pournader [Wed, 2 Aug 2017 21:32:44 +0000 (21:32 +0000)]

Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev am: 6e8e322ea1
am: 6359944a19

Change-Id: Ib5064f4be5fd73c76ad99547746bb1cb6534c2bd

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 21:26:19 +0000 (21:26 +0000)]

Merge "Remove Conferenceable update squelching" into oc-dr1-dev

commit | commitdiff | tree

Roozbeh Pournader [Wed, 2 Aug 2017 21:17:06 +0000 (21:17 +0000)]

Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
am: 6e8e322ea1

Change-Id: I85033f9b16cf269f1c1ce6d01789d9ed40d1cb96

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 21:08:54 +0000 (21:08 +0000)]

Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 20:42:08 +0000 (20:42 +0000)]

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

Change-Id: Ide81e21c24c6efd66c03c997dcaefbd0a3efd7b8

commit | commitdiff | tree

Tarandeep Singh [Wed, 2 Aug 2017 20:33:02 +0000 (20:33 +0000)]

Merge "Fix keyboard focus in VR" into oc-dr1-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 20:24:35 +0000 (14:24 -0600)]

Give DeviceStorageMonitorService it's own thread.

When devices are low on space, it calls down into installd to clear
cached files, which can block for a long time. Instead of risking
the wrath of the Watchdog on IoThread, give ourselves a separate
thread.

Test: builds, boots
Bug: 64080821
Change-Id: Iaca00966bb836d58e8d2400d6c9d544023ef1af8

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 20:18:03 +0000 (20:18 +0000)]

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 20:05:55 +0000 (20:05 +0000)]

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

Change-Id: I9928429d425d60c08568535495cffe3caa4de992

commit | commitdiff | tree

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

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

Change-Id: I1c14baa9dc756fc91b6db1ba7f947a6fa4a4c4e8

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 19:56:55 +0000 (19:56 +0000)]

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

Change-Id: I20b68b33caf48afeead56116602c6a9b2a33ab26

commit | commitdiff | tree

Chien-Yu Chen [Wed, 2 Aug 2017 19:56:55 +0000 (19:56 +0000)]

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

Change-Id: I26487e8565aa190cff6e470bfdbc312b5ec83ceb

commit | commitdiff | tree

Romain Guy [Wed, 2 Aug 2017 19:54:28 +0000 (19:54 +0000)]

Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am: 8e8debbe21 am: 0d8c1b81b9
am: 7a3ffac099

Change-Id: I31499d6261f38a0820db5996ee595895ec168d05

commit | commitdiff | tree

Santos Cordon [Wed, 2 Aug 2017 19:46:23 +0000 (19:46 +0000)]

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

Change-Id: I70c521db6bb979e6276a57a2b818f050bb8fafae

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 19:43:31 +0000 (19:43 +0000)]

Merge "camera2: Fix template requirements" into oc-dev

commit | commitdiff | tree

Romain Guy [Wed, 2 Aug 2017 19:43:30 +0000 (19:43 +0000)]

Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am: 8e8debbe21
am: 0d8c1b81b9

Change-Id: I84ec688bd958ef563bbc6a48c1139e20dd0003f7

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 19:43:23 +0000 (19:43 +0000)]

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

Change-Id: Ic3f5297c574aaa3598939399c623c2920623b3ba

commit | commitdiff | tree

Romain Guy [Wed, 2 Aug 2017 19:43:14 +0000 (19:43 +0000)]

Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am: 8e8debbe21 am: 572379dde1
am: e7bf5d8f3c

Change-Id: Ib1669e6d6b7f32d429de122ea5a9fdd00b7607c0

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 19:38:08 +0000 (19:38 +0000)]

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

commit | commitdiff | tree

Jorim Jaggi [Wed, 2 Aug 2017 19:38:01 +0000 (19:38 +0000)]

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

Change-Id: I9f3d772141b872d5561b217e1cb3c0daa0cc1a71

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 19:35:48 +0000 (19:35 +0000)]

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

Change-Id: I03d14d8688a96ede9b92369b822bd928eaf10a03

commit | commitdiff | tree

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

Merge "Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev am: 26a4940296 am: 40b96c785f"

commit | commitdiff | tree

Jeff Sharkey [Wed, 2 Aug 2017 19:33:49 +0000 (19:33 +0000)]

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

Change-Id: I5a78f799bde2926eb3f5f6f424148aaf11729c54

commit | commitdiff | tree

Romain Guy [Wed, 2 Aug 2017 19:33:19 +0000 (19:33 +0000)]

Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev
am: 8e8debbe21

Change-Id: I5e6ab8d1b1531980c9d699f4cacbafdcad56501d

commit | commitdiff | tree

Calin Juravle [Wed, 2 Aug 2017 19:33:09 +0000 (19:33 +0000)]

Merge "Save PackageDexUsage on PMS shutdown"

commit | commitdiff | tree

Hangyu Kuang [Wed, 2 Aug 2017 19:32:26 +0000 (19:32 +0000)]

Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev am: 26a4940296
am: 40b96c785f

Change-Id: Ie5a72ad1f303e814129ed54915747c5aa925a437

commit | commitdiff | tree

Romain Guy [Wed, 2 Aug 2017 19:32:05 +0000 (19:32 +0000)]

Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev am: 8e8debbe21
am: 572379dde1

Change-Id: Iee98007bd02510558d3283d1950fcafa47b218c6

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 19:28:07 +0000 (19:28 +0000)]

Merge "Fixed a clipping issue in AOD" into oc-dr1-dev

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 19:25:42 +0000 (19:25 +0000)]

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

Change-Id: If8a2938a9f10a9c8b60b65323cd34713eeb95f40

commit | commitdiff | tree

Hangyu Kuang [Wed, 2 Aug 2017 19:22:36 +0000 (19:22 +0000)]

Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev
am: 26a4940296

Change-Id: Ibfa5394a612dcec663b1d8b4a301f94b1f2fb49e

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 19:20:19 +0000 (19:20 +0000)]

Merge "Start all visible running activities when attaching app" into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 19:16:46 +0000 (19:16 +0000)]

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

commit | commitdiff | tree

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

Merge "media: Add scaled video thumbnail extractor api." into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 19:12:08 +0000 (19:12 +0000)]

Merge "Adds POUND and STAR keys to Generic_Iot.kl"

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 19:09:04 +0000 (19:09 +0000)]

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

commit | commitdiff | tree

Evan Rosky [Wed, 2 Aug 2017 19:08:18 +0000 (19:08 +0000)]

Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev

commit | commitdiff | tree

Beverly [Wed, 2 Aug 2017 19:04:16 +0000 (19:04 +0000)]

Merge "Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874ae0 am: aaa431197f" into oc-mr1-dev-plus-aosp
am: 7fc5d0028a

Change-Id: I6bb1639c6113f22f9cd211efc442cf43ca1b3339

commit | commitdiff | tree

Beverly [Wed, 2 Aug 2017 19:01:29 +0000 (19:01 +0000)]

Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874ae0 am: 7084e59bae
am: 1fcc58f4ea

Change-Id: I2673fda0411ca93b4ef0813addf102831d3be44e

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:55:16 +0000 (18:55 +0000)]

Merge "Revert "services.core: remove use of -static hidl java"" into oc-dr1-dev-plus-aosp am: 7ac34b86e5
am: e3a067850e

Change-Id: Iab06f4c9a6f29b43f129557ef4bc7f8410350fef

commit | commitdiff | tree

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

Merge "Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874ae0 am: aaa431197f" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:52:33 +0000 (18:52 +0000)]

Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master am: 5de8c0ee40 am: 842447df3c am: 75af963649
am: ca08cbadf1

Change-Id: Id963a5ca140d384d68e789f26697e5496c83aa85

commit | commitdiff | tree

Beverly [Wed, 2 Aug 2017 18:51:27 +0000 (18:51 +0000)]

Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874ae0
am: aaa431197f

Change-Id: I5e5bf9939b7fbfdb26ad07ab4ef22ada92e23a8a

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:25:28 +0000 (18:25 +0000)]

Reland "services.core: remove use of -static hidl java"

This reverts commit be3162ea8521d7524e2ae31407dc3340f3ae4875.

Bug: 36376126
Test: marlin boots

Change-Id: Ic5317a10f9fe6792908f9db2fa6d5275fe7ea9c1

commit | commitdiff | tree

Beverly [Wed, 2 Aug 2017 18:49:46 +0000 (18:49 +0000)]

Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874ae0
am: 7084e59bae

Change-Id: If30fd4e2ed88472b56e56dadbddb9cb46d0a7680

commit | commitdiff | tree

Junda Liu [Wed, 2 Aug 2017 18:49:39 +0000 (18:49 +0000)]

Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev am: 858a27c0b6
am: d249a0061b

Change-Id: Ib748bb88bb894a3f25671a2f557a58af3a3db9a3

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Aug 2017 18:46:55 +0000 (18:46 +0000)]

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

Change-Id: If88c711e3a1fe502db9e73d33b330679d4ba6043