OSDN Git Service
Philip P. Moltmann [Fri, 7 Apr 2017 22:42:35 +0000 (22:42 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" into oc-dev am:
5cd4797c7a
am:
03fb6e1d2a
Change-Id: I961829269676990a704abb62ede1cb09f4202581
Philip P. Moltmann [Fri, 7 Apr 2017 22:36:36 +0000 (22:36 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" into oc-dev
am:
5cd4797c7a
Change-Id: Ie76ce6bbdef0b2d9cce0f954bcc1efdfcc9d0149
Jorim Jaggi [Fri, 7 Apr 2017 22:21:56 +0000 (22:21 +0000)]
Merge changes I5d41419a,I763be06c into oc-dev am:
bc4bd823d9
am:
90fb71789a
Change-Id: I689f16b796cbb7a6157c5a5fcc9242ab4c93c0f6
TreeHugger Robot [Fri, 7 Apr 2017 22:21:37 +0000 (22:21 +0000)]
Merge "Add RecommendationPlugin for Cloud Print" into oc-dev
Todd Kennedy [Fri, 7 Apr 2017 22:20:52 +0000 (22:20 +0000)]
Merge "copy 'visbileToInstantApps' setting" into oc-dev am:
e467be5e14
am:
266d20db8e
Change-Id: I9c235580967e1852ac6ee48b5b4f4bbd27543343
Wale Ogunwale [Fri, 7 Apr 2017 22:19:57 +0000 (22:19 +0000)]
Merge "Don't show alert window notifications when in Vr mode." into oc-dev am:
77d23337fb
am:
2ee64ec5f3
Change-Id: I65c10f66d452860b1e8c8caa24e09557af3c5e83
Mihai Nita [Fri, 7 Apr 2017 22:18:50 +0000 (22:18 +0000)]
Merge "AAPT2: fixing the -c flag being ignored" into oc-dev am:
7354ee76aa
am:
ab13d9f9b3
Change-Id: I5ef37fa7082ffb12e7cf7454e8fde0ee566e6458
Jorim Jaggi [Fri, 7 Apr 2017 22:14:59 +0000 (22:14 +0000)]
Merge changes I5d41419a,I763be06c into oc-dev
am:
bc4bd823d9
Change-Id: I1c23329a3a18fb58d42c13e91e030f589e19025b
Todd Kennedy [Fri, 7 Apr 2017 22:10:43 +0000 (22:10 +0000)]
Merge "copy 'visbileToInstantApps' setting" into oc-dev
am:
e467be5e14
Change-Id: Ib3551cf0dce0afc169b89bc504b8f9ef88746423
Wale Ogunwale [Fri, 7 Apr 2017 22:09:30 +0000 (22:09 +0000)]
Merge "Don't show alert window notifications when in Vr mode." into oc-dev
am:
77d23337fb
Change-Id: I6c978ab89f31308e359119e6196df909812b3e77
Mihai Nita [Fri, 7 Apr 2017 22:08:21 +0000 (22:08 +0000)]
Merge "AAPT2: fixing the -c flag being ignored" into oc-dev
am:
7354ee76aa
Change-Id: Iec7350226e00bca1acf7e24bbf447f95c53b5c51
TreeHugger Robot [Fri, 7 Apr 2017 22:05:14 +0000 (22:05 +0000)]
Merge changes I5d41419a,I763be06c into oc-dev
* changes:
Introduce android.anim thread in system_server
Fix thread booster
TreeHugger Robot [Fri, 7 Apr 2017 22:04:04 +0000 (22:04 +0000)]
Merge "copy 'visbileToInstantApps' setting" into oc-dev
Wei Jia [Fri, 7 Apr 2017 22:01:05 +0000 (22:01 +0000)]
Merge "MediaPlayer: hide BufferingParams API" into oc-dev am:
4c2a62edb6
am:
2c51d55fcc
Change-Id: I031b205a5244f4dab5d5f7904c86badd95e31d18
TreeHugger Robot [Fri, 7 Apr 2017 22:00:40 +0000 (22:00 +0000)]
Merge "Don't show alert window notifications when in Vr mode." into oc-dev
Robert Carr [Fri, 7 Apr 2017 21:59:57 +0000 (21:59 +0000)]
Merge "ViewRootImpl: Fix child lifetime." into oc-dev am:
ca2622b860
am:
016d3ceac2
Change-Id: I5b7e6d9092fe9d324488c3c6c6dfd443fba11d15
Wale Ogunwale [Fri, 7 Apr 2017 21:58:55 +0000 (21:58 +0000)]
Merge "Show recents at correct time when starting activity in docked stack" into oc-dev am:
735a5e1438
am:
eba70f6556
Change-Id: If3c6c0a1000a1512707cf825bef12644399dfa7b
TreeHugger Robot [Fri, 7 Apr 2017 21:56:32 +0000 (21:56 +0000)]
Merge "AAPT2: fixing the -c flag being ignored" into oc-dev
Wei Jia [Fri, 7 Apr 2017 21:54:06 +0000 (21:54 +0000)]
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
am:
4c2a62edb6
Change-Id: Ib1b36bf7efe6aea88fa3f370e6e20d897c98b734
Robert Carr [Fri, 7 Apr 2017 21:52:59 +0000 (21:52 +0000)]
Merge "ViewRootImpl: Fix child lifetime." into oc-dev
am:
ca2622b860
Change-Id: Ibd108646edf7217a9f7656b3c83cd87820649c2d
Wale Ogunwale [Fri, 7 Apr 2017 21:51:50 +0000 (21:51 +0000)]
Merge "Show recents at correct time when starting activity in docked stack" into oc-dev
am:
735a5e1438
Change-Id: Ibef3a6f9e14e7bcb7466832bb6fe147afe7d37d0
TreeHugger Robot [Fri, 7 Apr 2017 21:46:34 +0000 (21:46 +0000)]
Merge "MediaPlayer: hide BufferingParams API" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:44:45 +0000 (21:44 +0000)]
Merge "ViewRootImpl: Fix child lifetime." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 21:42:46 +0000 (21:42 +0000)]
Merge "Show recents at correct time when starting activity in docked stack" into oc-dev
Jeff Davidson [Fri, 7 Apr 2017 21:25:36 +0000 (21:25 +0000)]
Merge "Fix NPE when parceling getMetadata result."
Kevin Chyn [Fri, 7 Apr 2017 21:08:56 +0000 (21:08 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev am:
1a199ba7e1
am:
7b1e255bff
Change-Id: I7508c6e731acf54e71a40b840aba3acad3eadf48
Kevin Chyn [Fri, 7 Apr 2017 21:00:58 +0000 (21:00 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
am:
1a199ba7e1
Change-Id: Ie74c7067b38d1e34e5fbc3b3d83cbf692f444a53
TreeHugger Robot [Fri, 7 Apr 2017 20:55:10 +0000 (20:55 +0000)]
Merge "renaming/removing fingerprints should be reflected in UI immediately" into oc-dev
Wale Ogunwale [Fri, 7 Apr 2017 15:53:41 +0000 (08:53 -0700)]
Show recents at correct time when starting activity in docked stack
Previous logic relied on the returnTo type of the task of the activity
we are launching which can get the wrong signal at times because the
original task might have been started from home, but since we are
already in docked mode it shouldn't cause recents activity to be
launched.
We now decide if recents ability should be shown based on if the home
stack is currently visible at the time we started the new activity.
Also, renamed ActivityStack.getStackVisibilityLocked() to
ActivityStack.shouldBeVisible() since it is used to determine if the
stack should be visible and also so it isn't confused with the new
method ActivityStack.isVisible() which returns true if the stack is
currently visible.
Test: manual
Change-Id: I051e72ce93c886d25526af2afef851c95812ab3e
Fixes:
37005549
Andrii Kulian [Fri, 7 Apr 2017 20:35:50 +0000 (20:35 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev am:
4eab3cb11a
am:
b7c802094b
Change-Id: Icb5882f5e6e5b1a8054a8bd9889d46fc403bee98
Andrii Kulian [Fri, 7 Apr 2017 20:30:17 +0000 (20:30 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev
am:
4eab3cb11a
Change-Id: I93855ada112e51892d5978c23de506388593aa9e
Charles He [Fri, 7 Apr 2017 20:25:56 +0000 (20:25 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev am:
23a7c1e870
am:
54b6116457
Change-Id: Ica03cfdb53899ef3a4c36908038581761c0641f0
Andrii Kulian [Fri, 7 Apr 2017 20:22:54 +0000 (20:22 +0000)]
Merge "Add hidden API to check support of Multi-Display" into oc-dev
Charles He [Fri, 7 Apr 2017 20:16:20 +0000 (20:16 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev
am:
23a7c1e870
Change-Id: I10b10af2f7caac3bfd2ec9b28335fdf4a1647b2c
Jorim Jaggi [Tue, 28 Mar 2017 17:50:01 +0000 (18:50 +0100)]
Introduce android.anim thread in system_server
We create a new thread on which everything is running that
directly impacts window animations, i.e. layout, anim tick and
starting window creation. This is such that any work on
android.display can not lead to jank in the window animation,
specifically lock contention on activity manager lock that blocks
callbacks from android.display into AM can not lead to window
animation jank.
Test: Run animation, take systrace, make sure animation is on
android.anim
Test: AppWindowContainerControllerTestTest: AppWindowContainerControllerTestss
Fixes:
36792959
Change-Id: I5d41419a709b7984724e7053a3afdcc1ffe1aaa2
Charles He [Fri, 7 Apr 2017 20:06:16 +0000 (20:06 +0000)]
Merge "FingerprintService: check current user correctly" into oc-dev
Todd Kennedy [Fri, 7 Apr 2017 18:38:39 +0000 (11:38 -0700)]
copy 'visbileToInstantApps' setting
Change-Id: I342a133ae8d7f38008cb03706d160e6f2e2cca97
Fixes:
37002720
Test: Start instant app [adb shell am start -a android.intent.action.VIEW -c android.intent.category.BROWSABLE -d http://www.realestate.com.au/property-apartment-nsw-pyrmont-
124879602] and see that hitting the 'share' icon works
Roozbeh Pournader [Fri, 7 Apr 2017 19:39:54 +0000 (19:39 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev am:
91d289903c
am:
300d74e34e
Change-Id: Ic6dfb3e20ef409d9ef7e63578d8db25013537046
Roozbeh Pournader [Fri, 7 Apr 2017 19:32:45 +0000 (19:32 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev
am:
91d289903c
Change-Id: Ibeaea13b146e30b5f7d67c49295081632a6a7736
Robert Carr [Fri, 7 Apr 2017 02:53:07 +0000 (19:53 -0700)]
ViewRootImpl: Fix child lifetime.
As far as I can tell this has always been broken. We've always had
intermittent reports of buffer-queue-abandoned as well (a recent bug
came with some reports from N). During onStop SurfaceView relies on
onWindowVisibilityChanged, to trigger a visibility change. At this
point SurfaceView will emit the SurfaceDestroyed callback in order to
stop the client from further use of the Surface. The contract we've
been using with ViewRootImpl is at any point following
Activity.performStop returning the WindowManager was free to destroy
the Surfaces. This is why in setWindowsStopped we destroy the hardware
resources for the ViewRoot. However we aren't dispatching anything to
the SurfaceView. The WindowManager will send an app visibility
notification, but that would go through the handler. This means by the
time we return from Stop, there is no guarantee that the
onWindowVisibilityChanged callbacks have been invoked at all. It
seemed most sensible to dispatch the visibility callbacks directly. We
also ensure that getHostVisibility will return false after this point,
so that performTraversals will not reverse our visibility request if
it occurs again prior to the window visibility notification from the
WindowManager. We also guard against emitting a second window
visibility changed callback in the traversals. I don't know at this
point what value the window visibility notification provides but I
don't feel excited about removing it in this CL at this point in
the development cycle.
Test: Put Chrome in PiP. Turn screen off. No Crash!
Bug:
36561071
Change-Id: Id1673561b2299d477b2761b3ac6afa14eabbf7fb
Wale Ogunwale [Fri, 7 Apr 2017 19:23:57 +0000 (19:23 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev am:
2f2e3f8ad5
am:
d8351abc88
Change-Id: I7e5a4d46a4a524f2a7196adc9f39e27aced5bbdd
TreeHugger Robot [Fri, 7 Apr 2017 19:21:51 +0000 (19:21 +0000)]
Merge "Special-case English for DateTime and Time key listeners" into oc-dev
Wale Ogunwale [Fri, 7 Apr 2017 19:14:41 +0000 (19:14 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev
am:
2f2e3f8ad5
Change-Id: I4b2f25475531003f8a4928e0b4a8eef05dfb9378
Wale Ogunwale [Fri, 7 Apr 2017 19:06:50 +0000 (19:06 +0000)]
Merge "Revert "Do not make strong reference to Resources."" into oc-dev
Ying Xu [Fri, 7 Apr 2017 18:59:33 +0000 (18:59 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev am:
98852767b3
am:
50a7cdc684
Change-Id: I5438622a7bdcc5e0006cc49995cc176abba17eed
Ying Xu [Fri, 7 Apr 2017 18:55:11 +0000 (18:55 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
am:
98852767b3
Change-Id: Ia7f57e10f3783a4bf7b711a347c6e64170d64f96
Romain Guy [Fri, 7 Apr 2017 18:48:57 +0000 (18:48 +0000)]
Merge "Color management, the missing pieces" into oc-dev am:
7dfa16c2ef
am:
3eafcb2d8b
Change-Id: I079d8d17982eecc022f2a53e1e6ca193dc7a3ace
Ying Xu [Fri, 7 Apr 2017 18:47:54 +0000 (18:47 +0000)]
Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" into oc-dev
Bryce Lee [Fri, 7 Apr 2017 18:42:23 +0000 (18:42 +0000)]
Revert "Do not make strong reference to Resources."
This reverts commit
2d2315a66d81d29896e6a0ffedbfbbed3981b9ed.
Reason for revert: possible cause for b/
37156733
Change-Id: I02d468449f0632d1281ab5ad2a381e7e36a5b0ea
Phil Weaver [Fri, 7 Apr 2017 18:42:22 +0000 (18:42 +0000)]
Merge "Make a11y node info parceling more robust"
Romain Guy [Fri, 7 Apr 2017 18:41:50 +0000 (18:41 +0000)]
Merge "Color management, the missing pieces" into oc-dev
am:
7dfa16c2ef
Change-Id: I258ae87aeb739f3df1d1aef00fb055861c757111
TreeHugger Robot [Fri, 7 Apr 2017 18:34:34 +0000 (18:34 +0000)]
Merge "Color management, the missing pieces" into oc-dev
Geoffrey Pitsch [Fri, 7 Apr 2017 18:32:09 +0000 (18:32 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev am:
9394a8fc62
am:
0271fbdaf9
Change-Id: Ia9ae659c2994cc4101385bba8cc06db073e8f026
Geoffrey Pitsch [Fri, 7 Apr 2017 18:28:45 +0000 (18:28 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev
am:
9394a8fc62
Change-Id: Iae8d9273ede243c9261ace763dc321a6196e302f
Gustav Sennton [Fri, 7 Apr 2017 18:28:08 +0000 (18:28 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev am:
fc33499c64
am:
feb6cf4aa1
Change-Id: I02691db9d70fb04643c9c683044ad14e5263e2ef
Gustav Sennton [Fri, 7 Apr 2017 18:22:05 +0000 (18:22 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev
am:
fc33499c64
Change-Id: Iefa63e6d00a10647457d197c02975442fade34d7
Geoffrey Pitsch [Fri, 7 Apr 2017 18:16:30 +0000 (18:16 +0000)]
Merge "Don't delete new notification channels not present in backup" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 18:13:22 +0000 (18:13 +0000)]
Merge "Remove WebView-fallback code for handling the non-functional stub." into oc-dev
Andrii Kulian [Fri, 7 Apr 2017 17:54:00 +0000 (10:54 -0700)]
Add hidden API to check support of Multi-Display
Added ActivityManager#supportsMultiDisplay() to check if system
supports running activities on secondary displays.
Bug:
36776777
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testMultiDisplayDisabled
Change-Id: I18f98f2f6a9e865ad8dc63a470210190536d3271
Jason Monk [Fri, 7 Apr 2017 17:54:59 +0000 (17:54 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev am:
3d82322c7c
am:
e241a3c15a
Change-Id: I3fb8f87e6aa6e17e3d0478dc3d9569d1a927fd90
TreeHugger Robot [Fri, 7 Apr 2017 17:52:29 +0000 (17:52 +0000)]
Merge "NetworkPolicyManagerService: use hasRule()"
Android Build Merger (Role) [Fri, 7 Apr 2017 17:50:16 +0000 (17:50 +0000)]
Merge "Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev am:
2d691791e7 am:
df8508de66"
Dmitry Dementyev [Fri, 7 Apr 2017 17:49:31 +0000 (17:49 +0000)]
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission."
Jason Monk [Fri, 7 Apr 2017 17:49:33 +0000 (17:49 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev
am:
3d82322c7c
Change-Id: I6c7e8a47686d5f3cfa1f4e235ef1bbb94dd753a7
Adrian Roos [Fri, 7 Apr 2017 17:49:32 +0000 (17:49 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev am:
2d691791e7
am:
df8508de66
Change-Id: I648fcad9860b469003406c8892cf834a00b4b63d
Adrian Roos [Fri, 7 Apr 2017 17:43:08 +0000 (17:43 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev
am:
2d691791e7
Change-Id: If8de068e9e42dc8ccac513c3ad624ef38c6ac1dc
Jason Monk [Fri, 7 Apr 2017 17:39:44 +0000 (17:39 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev am:
157017c8a8
am:
84dbc7b20e
Change-Id: I4567c0db96817f6c78e2983ef226b8bd7dc3707f
Jason Monk [Fri, 7 Apr 2017 17:38:34 +0000 (17:38 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev am:
ed8051b528
am:
5d6deab0c1
Change-Id: Ice2201ac3eb120f52c821881bc04fdb43e7ae579
TreeHugger Robot [Fri, 7 Apr 2017 17:37:46 +0000 (17:37 +0000)]
Merge "Fix theming on brightness dialog" into oc-dev
Adrian Roos [Fri, 7 Apr 2017 17:35:44 +0000 (17:35 +0000)]
Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev
Jason Monk [Fri, 7 Apr 2017 17:32:19 +0000 (17:32 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev
am:
157017c8a8
Change-Id: Ia6feb2f2e41ce6f4551cd6cd8713e09b0f5c5275
Jason Monk [Fri, 7 Apr 2017 17:31:05 +0000 (17:31 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev
am:
ed8051b528
Change-Id: Ica1d06c345112b7632c9892576edc0c7352ba2bb
TreeHugger Robot [Fri, 7 Apr 2017 17:24:57 +0000 (17:24 +0000)]
Merge "Make sure to synchronize on references to plugin dependencies" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 17:23:31 +0000 (17:23 +0000)]
Merge "Synchronize on sysui dependency references" into oc-dev
Philip P. Moltmann [Thu, 6 Apr 2017 02:51:08 +0000 (19:51 -0700)]
Add RecommendationPlugin for Cloud Print
Reuses already existing infrastructure. The mMDNSFilteredDiscovery lambda
is called for every network service that supports #PRIVET_SERVICE. Then
the plugin checks the txt fields to make sure the printer is valid. The
check is not complete but good enough to make sure this is either a
cloud print capable printer or something that tries really hard.
Test: Connected to network with three printers, 2 GCP capable. Found the
two printers
Fixes:
35766193
Change-Id: I7c9180c8c154fa092fec5b943a94bad77da74c86
Mihai Nita [Fri, 7 Apr 2017 15:25:06 +0000 (08:25 -0700)]
AAPT2: fixing the -c flag being ignored
Bug:
36999175
Test: manual
Change-Id: Id9a4a00a3b37bc088d86df7c75bbe711536b980f
Adrian Roos [Fri, 7 Apr 2017 16:18:42 +0000 (16:18 +0000)]
Merge "AOD: More VisD updates" into oc-dev am:
67ee79e84f
am:
1ac141639e
Change-Id: I2216b17f6a2dc585e088940d405ab2d42552acad
Selim Cinek [Fri, 7 Apr 2017 16:17:44 +0000 (16:17 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev am:
5393a0e2d9
am:
e1fcf8edd6
Change-Id: I59b73215058df60ad93e59a76f01143c6a935d30
Adrian Roos [Fri, 7 Apr 2017 16:14:34 +0000 (16:14 +0000)]
Merge "AOD: More VisD updates" into oc-dev
am:
67ee79e84f
Change-Id: Ie88590d0e098ef447c26cabb230cbf67aadcbb17
Chen Xu [Fri, 7 Apr 2017 16:12:54 +0000 (16:12 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev am:
31fcda576f
am:
6fd0d2b37f
Change-Id: I8239752191b094626e85935dcc6470a297742317
Selim Cinek [Fri, 7 Apr 2017 16:08:26 +0000 (16:08 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev
am:
5393a0e2d9
Change-Id: Ic70d9eb07b53ccda5fafb8c37177e130d4b279de
TreeHugger Robot [Fri, 7 Apr 2017 16:03:29 +0000 (16:03 +0000)]
Merge "AOD: More VisD updates" into oc-dev
Chen Xu [Fri, 7 Apr 2017 16:03:02 +0000 (16:03 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev
am:
31fcda576f
Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531
TreeHugger Robot [Fri, 7 Apr 2017 15:59:12 +0000 (15:59 +0000)]
Merge changes If96c0146,I0d68ad60 into oc-dev
* changes:
Improved accessibility behavior of the notification shelf
Fixed a bug where the indeterminate progressbar janky
Chen Xu [Fri, 7 Apr 2017 15:53:07 +0000 (15:53 +0000)]
Merge "remove deprecated API sendDialerCode" into oc-dev
Bryce Lee [Fri, 7 Apr 2017 15:11:51 +0000 (15:11 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev am:
13acf25cfd
am:
6b8907d8ed
Change-Id: Ife37bdfb4bee6479688defad0446efaecfb7838b
TreeHugger Robot [Fri, 7 Apr 2017 15:07:11 +0000 (15:07 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()"
Bryce Lee [Fri, 7 Apr 2017 15:03:54 +0000 (15:03 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev
am:
13acf25cfd
Change-Id: I58d215ae33994274a364ec71ba59bae25e0e1c12
Michal Karpinski [Fri, 7 Apr 2017 15:00:01 +0000 (15:00 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev am:
ce7f931793
am:
5c71bdf14d
Change-Id: I6596a7438a967416753d96aa6807d87d78fb4a7b
Bryce Lee [Fri, 7 Apr 2017 14:58:13 +0000 (14:58 +0000)]
Merge "Check component before notifying activity is visible." into oc-dev
Romain Guy [Wed, 5 Apr 2017 02:38:50 +0000 (19:38 -0700)]
Color management, the missing pieces
Implement missing color management pieces for bitmaps:
- Bitmap.createBitmap(Bitmap src, ...) now creates a bitmap
in the same color space as the source bitmap
- Bitmap.createScaledBitmap() now creates a bitmap in the
same color space as the source bitmap
- Bitmap.createBitmap(..., ColorSpace colorSpace) to create
bitmaps in a specific color space
- Fix copy from A8 to F16
- Copying bitmaps in F16 or with a color space does not work,
it's currently a limitation in Skia
Bug:
36905374
Test: BitmapColorSpaceTest
Change-Id: I0092fe4432511db50daa3a9393389a9db05e0c2a
Michal Karpinski [Fri, 7 Apr 2017 14:51:29 +0000 (14:51 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
am:
ce7f931793
Change-Id: I40667aac08e8c6c5d2e31640a4667ea577cc8889
TreeHugger Robot [Fri, 7 Apr 2017 14:45:42 +0000 (14:45 +0000)]
Merge "Removed unused variables in PerformBackupTask#finalizeBackup()" into oc-dev
Chad Brubaker [Fri, 7 Apr 2017 14:28:34 +0000 (14:28 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev am:
ca73ff016f
am:
c6ef0585e8
Change-Id: I384d3f9d1e5a68426fd1ce69eb5dc6266891d84b
Daniel Nicoara [Fri, 7 Apr 2017 14:27:27 +0000 (14:27 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev am:
1daf6cca42
am:
724d05cf9c
Change-Id: I8c27dd238e38daeeb27b1cc083730309e167319d
Chad Brubaker [Fri, 7 Apr 2017 14:20:35 +0000 (14:20 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
am:
ca73ff016f
Change-Id: Ife1762e223269271110b5f2357edffaaeb013b1b
Daniel Nicoara [Fri, 7 Apr 2017 14:19:25 +0000 (14:19 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev
am:
1daf6cca42
Change-Id: I1daad51d1b0d559e490da30510ba7aa99979666f
TreeHugger Robot [Fri, 7 Apr 2017 14:12:02 +0000 (14:12 +0000)]
Merge "Expose package_verifier_user_consent to Instant Apps" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 14:11:35 +0000 (14:11 +0000)]
Merge "Fix format for VR virtual display backing buffers" into oc-dev
Philip P. Moltmann [Fri, 7 Apr 2017 13:35:50 +0000 (13:35 +0000)]
Merge "Change requestWait API according to request" into oc-dev am:
ca687ac39a
am:
a89137545b
Change-Id: I918d16f7dd81ec641b023f3a19a0c3aeab984e1d