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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 18:44:41 +0000 (18:44 +0000)]

Merge "Add metadata support to MTP docs provider."

commit | commitdiff | tree

Romain Guy [Wed, 2 Aug 2017 18:44:40 +0000 (18:44 +0000)]

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

Change-Id: I0f66cafd5eee8081f7af72bfb8cebdb93a619662

commit | commitdiff | tree

Daniel Sandler [Wed, 2 Aug 2017 18:40:34 +0000 (18:40 +0000)]

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

commit | commitdiff | tree

Beverly [Wed, 2 Aug 2017 18:39:02 +0000 (18:39 +0000)]

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

Change-Id: Ib0fcc0592a57be6bce184b729f1c25ee02595062

commit | commitdiff | tree

Beverly [Wed, 2 Aug 2017 18:38:00 +0000 (18:38 +0000)]

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

Change-Id: I8062e205af16792aa5ae0593795a940fc75813bc

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 18:35:10 +0000 (18:35 +0000)]

Merge "Use EGL_EXT_gl_colorspace_scrgb instead of *_linear" into oc-dr1-dev

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:32:39 +0000 (18:32 +0000)]

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

Change-Id: I104760c6893cd220b97a93b925b95e902cad4b37

commit | commitdiff | tree

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

Merge "Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf am: e5a48c5bcb" into oc-mr1-dev-plus-aosp am: 2db8b9fa36"

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 18:30:57 +0000 (18:30 +0000)]

Merge "Remove PDF Thumbnail functionality"

commit | commitdiff | tree

Lucas Dupin [Wed, 2 Aug 2017 18:30:10 +0000 (18:30 +0000)]

Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf am: e5a48c5bcb" into oc-mr1-dev-plus-aosp
am: 2db8b9fa36

Change-Id: I617e9e86da7ca2d06c41e5a0a975d2fb8c097698

commit | commitdiff | tree

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

Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf am: aa65f36ffb am: a7d7e6fbd1"

commit | commitdiff | tree

Lucas Dupin [Wed, 2 Aug 2017 18:27:15 +0000 (18:27 +0000)]

Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf am: aa65f36ffb
am: a7d7e6fbd1

Change-Id: Ife06974b9fa5ff54232bae8e170a2bbf36736ac3

commit | commitdiff | tree

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

Merge "Merge "Always report a uid's initial cached state." into oc-mr1-dev am: c134dec17f am: fe7ff804be"

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:24:43 +0000 (18:24 +0000)]

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

commit | commitdiff | tree

Derek Sollenberger [Wed, 2 Aug 2017 18:23:47 +0000 (18:23 +0000)]

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

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:23:01 +0000 (18:23 +0000)]

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

Change-Id: I4a04c1e9863de214f77340e6564c05e90c1d659f

commit | commitdiff | tree

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

Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 18:21:32 +0000 (18:21 +0000)]

Merge "Always report a uid's initial cached state." into oc-mr1-dev am: c134dec17f
am: fe7ff804be

Change-Id: I321ab463b66166bebb68389dfb0e03055667ccd2

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:20:13 +0000 (18:20 +0000)]

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

Changes this depends on are missing from intermediate branches.

This reverts commit 31eb20f06acdbf20570c841198434005e3145e8b.

Change-Id: Ie3c30cf456f922d95ecb8859f0556095a491e2d6

commit | commitdiff | tree

Junda Liu [Wed, 2 Aug 2017 18:17:54 +0000 (18:17 +0000)]

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

Change-Id: Id080a91ff04953a6c878ed18551cf71e20742e32

commit | commitdiff | tree

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

Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf am: e5a48c5bcb" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 18:14:26 +0000 (18:14 +0000)]

Merge "Improve docs about exceptions through Binder." into oc-mr1-dev am: 6e3af279ab
am: 5a0d703564

Change-Id: I45a971a83f6431e3d9b00c83a2abfd734d3f547f

commit | commitdiff | tree

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

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

Change-Id: I88abe8764bc50e1e1498cb02794c1728ad5bea69

commit | commitdiff | tree

Lucas Dupin [Wed, 2 Aug 2017 18:12:17 +0000 (18:12 +0000)]

Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf
am: e5a48c5bcb

Change-Id: I67e0ca0dd05d4989f3883ad98ed4a9cc58266ee1

commit | commitdiff | tree

Lucas Dupin [Wed, 2 Aug 2017 18:12:06 +0000 (18:12 +0000)]

Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53bbf
am: aa65f36ffb

Change-Id: I197d45d0a274a68a17a3c8d83880d0a75a3b5456

commit | commitdiff | tree

Chad Brubaker [Wed, 2 Aug 2017 18:12:02 +0000 (18:12 +0000)]

Merge "Add owners for the network security config" am: 8773730cd9 am: e9d50c793a am: 531f1af615 am: 5813bc2b22
am: 13c192f9a1

Change-Id: I6d27a5b1e90333e0db5e94f68f273e758031f9c6

commit | commitdiff | tree

Adrian Roos [Wed, 2 Aug 2017 18:10:21 +0000 (18:10 +0000)]

Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev am: 6134b7529b am: f4a92fa5ce
am: 92ae73c22b

Change-Id: I21725b58ec3b986aa75965618aef0daa2ce3272b

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 18:09:41 +0000 (18:09 +0000)]

Merge "Deprecate KEY_EDITABLE_TETHER_APN_BOOL." into oc-mr1-dev

commit | commitdiff | tree

Steven Moreland [Wed, 2 Aug 2017 18:03:38 +0000 (18:03 +0000)]

Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master
am: 5de8c0ee40

Change-Id: I48d84d0d28d476dae84201b68e943e3ad4dae500

commit | commitdiff | tree

Lucas Dupin [Wed, 2 Aug 2017 18:03:21 +0000 (18:03 +0000)]

Merge "Fix race condition when destroying view" into oc-dr1-dev
am: b0e5b53bbf

Change-Id: I6e07dca79e8d33522d4f0e9b58dcc48bdff555d2

commit | commitdiff | tree

Lucas Dupin [Wed, 2 Aug 2017 18:03:21 +0000 (18:03 +0000)]

Merge "Fix race condition when destroying view" into oc-dr1-dev
am: b0e5b53bbf

Change-Id: I57e3c07e9390203a6eb201a314f3887fa7a678cd

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 18:02:12 +0000 (18:02 +0000)]

Merge "Always report a uid's initial cached state." into oc-mr1-dev
am: c134dec17f

Change-Id: I5a981e0483a723be7d8fdc22d9b052a97dbb422d

commit | commitdiff | tree

Dianne Hackborn [Wed, 2 Aug 2017 17:59:17 +0000 (17:59 +0000)]

Merge "Improve docs about exceptions through Binder." into oc-mr1-dev
am: 6e3af279ab

Change-Id: Ia69e8ed7db5210284fbfea95be2a2b0a7c6e3052

commit | commitdiff | tree

Selim Cinek [Wed, 2 Aug 2017 17:57:16 +0000 (17:57 +0000)]

Merge "Fixed an issue where icons were jumping" into oc-dr1-dev am: 7a719ab0ed am: db6902f7ff
am: 19e15baedf

Change-Id: If852247cde0592bc3b4223b59b650c4dd5c9b9ba

commit | commitdiff | tree

TreeHugger Robot [Wed, 2 Aug 2017 17:55:25 +0000 (17:55 +0000)]

Merge "fingerprint: remove use of -static hidl java" into stage-aosp-master