Commit Graph

8280 Commits

Author SHA1 Message Date
Lucas Dupin
bdda30f826 Merge "Moving color extraction classes" into oc-dr1-dev
am: 456cb9603a

Change-Id: I6e1d6a124f9937b06648859333290f643ccc0150
2017-07-08 00:26:50 +00:00
TreeHugger Robot
456cb9603a Merge "Moving color extraction classes" into oc-dr1-dev 2017-07-08 00:21:44 +00:00
Amith Yamasani
6a4ab438b9 Merge "Add logging for unusually long read times" into oc-dr1-dev
am: 2a8a58ea98

Change-Id: Ic043ad8fd15aac4583be3944190b52f3e914c6d7
2017-07-07 21:50:29 +00:00
TreeHugger Robot
2a8a58ea98 Merge "Add logging for unusually long read times" into oc-dr1-dev 2017-07-07 21:43:46 +00:00
Lucas Dupin
e2292a94bb Moving color extraction classes
Fixes: 62220212
Test: make
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Test: runtest systemui
Change-Id: I7c4cf5c40a88555e81fbad9bec2b32c55c927468
Merged-In: I7c4cf5c40a88555e81fbad9bec2b32c55c927468
2017-07-07 10:48:43 -07:00
Andrew Solovay
c2c0997b40 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev am: 040b774928
am: ee10807328

Change-Id: I6ba7c1255c103075fce541db27226996366968a3
2017-07-06 20:21:44 +00:00
Andrew Solovay
ee10807328 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am: 040b774928

Change-Id: I5fb70c606842dd5af7fdb5506d7a0d14e83aeab9
2017-07-06 18:58:22 +00:00
Andrew Solovay
5f00dfa5b8 Merge "docs: Removing com.android.internal.* packages from Javadoc build" into oc-dev
am: 040b774928

Change-Id: Ief0f1ce03e137ae4a16067cf7430cf7bc333a96d
2017-07-06 18:58:17 +00:00
Amith Yamasani
3d5d9aefc1 Add logging for unusually long read times
Tracking occasional lock contention in ActivityManagerService
that might be due to battery stats locking while reading proc files.

Bug: 63287747
Test: manual
Change-Id: Idfde8c960507930df4dc7e1337a89535d2ca932e
2017-07-06 08:49:41 -07:00
Jason Monk
28e83de5ae Merge "Layout updates to share sheet" into oc-dr1-dev
am: 2a050dae1a

Change-Id: I1243c4def83a7b116373af01dda2cb883a036e09
2017-07-06 15:18:25 +00:00
Jason Monk
027dcfa4a5 Layout updates to share sheet
The biggest change is that padding will only appear above/below
service section, and at the start of the non-service section. For
this a bunch of changes to how padding is needed.

Also some other dimen changes for specs.

Test: visual
Change-Id: I39747701597e620425bdcb4113d1a3585f6de137
Fixes: 37913738
2017-07-06 09:09:21 -04:00
Narayan Kamath
ac27936be5 Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev
am: 84e0f453d1

Change-Id: I34dc28cd87e5111fccff05893ddf5c1155ad8746
2017-07-06 11:36:41 +00:00
TreeHugger Robot
84e0f453d1 Merge "Zygote: Fix race condition on package preloads." into oc-dr1-dev 2017-07-06 11:30:03 +00:00
jackqdyulei
8f386f6e24 Merge "Update the smearing methods in framework." into oc-dr1-dev
am: 386d8133c4

Change-Id: I383384c1cd30e5ab4f88a5e95a9b0068e573fe2d
2017-07-06 01:00:59 +00:00
TreeHugger Robot
386d8133c4 Merge "Update the smearing methods in framework." into oc-dr1-dev 2017-07-06 00:49:56 +00:00
Garfield Tan
8ea8db199d Merge "Clear calling id before updating MediaStore." into oc-dr1-dev
am: 28042d09d1

Change-Id: I29b452dbb955d65806cd472cf20d4595ac4844dc
2017-07-05 22:46:14 +00:00
TreeHugger Robot
28042d09d1 Merge "Clear calling id before updating MediaStore." into oc-dr1-dev 2017-07-05 22:39:37 +00:00
jackqdyulei
ce0fd25e2c Update the smearing methods in framework.
1. Fix the bug about foregroundActivityTime. It should take microseconds
as parameter and return microseconds
2. Use the min time of foregroundActivity time and Top time as "screen
time"
3. Hide bluetooth, wifi, idle but don't smear it

Bug: 63176214
Test: runtest -x BatteryStatsHelperTest
Change-Id: I5798577da17d60fb3e3b18351deb31ae77939154
2017-07-05 13:14:08 -07:00
Narayan Kamath
bae484ad8e Zygote: Fix race condition on package preloads.
Before this change, ZygoteProcess.preloadPackageForAbi returned
as soon as the command was written to the zygote socket and not
after the preload completed. This meant that there was a small
window of time before the server side of the socket polled its FDs
where a second command could be written to the zygote socket. This
would lead to only one of the commands being processed and the
other being dropped. The client side of that socket would then wait
forever for a response and bring down the system once the watchdog
timeout was hit.

Example failure case :
--------------
system_server:send command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(preloadPackage)  // the fork command is dropped.

Example of normal operation :
------------------
system_server:send command(preloadPackage)
zygote:poll & process command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(fork)

This change makes preloadPackageForAbi synchronous, which ensures
that each POLLIN event corresponds to precisely one command.

Bug: 62886909
Bug: 13618569
Test: Manual
Contributed-By: yuqianyu@huawei.com

(cherry-picked from commit 24a3306c32)

Change-Id: I83faf974c9a70a6ab18323f692c1981784e4c56a
2017-07-05 17:53:20 +00:00
Andrew Solovay
7bd357143e docs: Removing com.android.internal.* packages from Javadoc build
Several com.android.internal packages were being included in the
Javadoc build, even though they have no public APIs. Added a
package.html with the @hide tag to each of those packages, to
exclude them from the doc build.

Updated doc is staged to: http://go/dac-stage/reference/ ; verified
that the packages are now *not* in
http://go/dac-stage/reference/packages.html , and that package
summary files are not being generated for those packages.

Test: make ds-docs
Bug: 63166900
Change-Id: I7f96abb3e57d005c290cce6eda58f9368159a34e
2017-06-30 17:11:52 -07:00
Garfield Tan
fac8aea2e8 Clear calling id before updating MediaStore.
Test: Manual tests.
Bug: 63064166
Change-Id: I87ab9656f699072a6e23249e531805ad7c392764
2017-06-30 12:52:50 -07:00
Kang Li
8853465754 Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev
am: d967ee3492

Change-Id: I9573bc8878123fbad308d27adb2977811814ffcd
2017-06-30 19:41:14 +00:00
TreeHugger Robot
d967ee3492 Merge "Dedupes ranked apps in sharing windows, and reuses computed scores in sorting for ResolverActivity." into oc-dr1-dev 2017-06-30 19:28:31 +00:00
Sujith Ramakrishnan
708857daac Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev am: 564d0bf1be
am: a1157b3aa1

Change-Id: I80fac516afe2c7b75fe775d80444a501585bd3b7
2017-06-29 19:06:33 +00:00
Sujith Ramakrishnan
98b181b25f Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am: 564d0bf1be

Change-Id: I23deb9056dbd9967bfe07d3db30256794b30a778
2017-06-29 18:59:11 +00:00
Sujith Ramakrishnan
a1157b3aa1 Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev
am: 564d0bf1be

Change-Id: I1cd59a2966f692a4857343e21bf1586719939490
2017-06-29 18:59:07 +00:00
TreeHugger Robot
564d0bf1be Merge "Prevent unwanted keypress actions during TV Setup." into oc-dev 2017-06-29 18:50:08 +00:00
Mady Mellor
3e7a97f6fa Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
am: 176f2533a1

Change-Id: Ic5d38c862c155ac025884e53d688826b57829529
2017-06-28 23:53:23 +00:00
TreeHugger Robot
176f2533a1 Merge "Adjustments to PIP position while flinging" into oc-dr1-dev 2017-06-28 23:45:37 +00:00
Sujith Ramakrishnan
0390fff82c Prevent unwanted keypress actions during TV Setup.
- Prevent Search or long-press Home actions
      while TV setup is being completed based
      on flag TV_USER_SETUP_COMPLETE.

Test: Manual - Reset device, ran Setup, tried keys.
Test: Manual - Rebooted device after Setup, tried keys.

Bug: 62419382
Change-Id: Ic8fb0f10943ab7c39a7d9857f62e6ab292231b40
2017-06-28 14:38:30 -07:00
Kang Li
6afa4f2901 Dedupes ranked apps in sharing windows, and reuses computed scores
in sorting for ResolverActivity.

bug: 63109049

Test: tested on a Pixel XL and a 6P to verify that it worked as expected.

Change-Id: I04ff45c3e15cbffb015568772b9b804e08f11aa4
2017-06-28 21:11:14 +00:00
Mady Mellor
15b29c7bba Adjustments to PIP position while flinging
Rather than using a scroller, find the actual edge intercept
based on the trajectory of the fling.

This is done by finding the two points it could intersect with
and checking which point is 'closer' (i.e. would be hit first
by the PIP).

Bias towards using the intersection with the top / bottom edge
if the PIP is being flung along the side it's currently on.

Also increases the maximum time for the fling.

Bug: 35358634
Test: manual - fling PIP around screen while in landscape
      and portrait
Change-Id: I26e943a5ddbc726ab86bc11e4271d4db034f3d47
2017-06-28 20:12:32 +00:00
Selim Cinek
ec85913a74 Merge "Fixed an issue in the contrast calculation" into oc-dev am: 9bf5c0c3e1
am: 12a2a7d0f1

Change-Id: Ice72e01f1ce2a38739c4306b9df4ab33bc16b2c9
2017-06-24 01:05:22 +00:00
Selim Cinek
12a2a7d0f1 Merge "Fixed an issue in the contrast calculation" into oc-dev
am: 9bf5c0c3e1

Change-Id: Ic93f722459de8da30b9b2f8971dfd0b650e37f10
2017-06-24 00:55:48 +00:00
Selim Cinek
ff122e750c Merge "Fixed an issue in the contrast calculation" into oc-dev
am: 9bf5c0c3e1

Change-Id: I9f1dc8c2c6d2ad461efc2722a5b1829f753dfcd4
2017-06-24 00:55:46 +00:00
Selim Cinek
9bf5c0c3e1 Merge "Fixed an issue in the contrast calculation" into oc-dev 2017-06-24 00:44:13 +00:00
Selim Cinek
4c80791919 Fixed an issue in the contrast calculation
The parameters were passed the wrong way around.

Test: manual inspection
Fixes: 62937149
Change-Id: I7ae2bb2a4136da37d6b59b2b1406c68ce7fe7b6b
2017-06-23 17:29:50 -07:00
Christopher Ferris
18f7bcb9a8 Merge "Add a common call when wrapping an app." am: 12e0975963 am: bb6cf84a40
am: 1d10ce12ff

Change-Id: Ib814bcfc56ad6742a023bd7245952cefd51d5fd2
2017-06-22 20:42:00 +00:00
Christopher Ferris
1d10ce12ff Merge "Add a common call when wrapping an app." am: 12e0975963
am: bb6cf84a40

Change-Id: I5a52a1cdfa5994f3f8c44e367c3a0bdbfba838fd
2017-06-22 18:40:30 +00:00
Christopher Ferris
76de39e5eb Add a common call when wrapping an app.
When an application is wrapped using setprop wrap.<application>, it
doesn't set the special zygote flag, or make the mallopt call. This
means that a wrapped application will behave differently, and not
be able to track zygote native allocations versus app native allocations.

This CL adds a nativePreApplicationInit call that is used after the
Zygote is forked, and when a wrapped application is called.

Bug: 62068500

Test: Booted sailfish system. Verified that the zygote has not called
Test: the new function. Verified the function is called when a wrapper
Test: is used. Verified the function is called when the Zygote forks
Test: a process.
Change-Id: I392e1b5429be77def63f7815b072d68e9408cc7f
(cherry picked from commit 2980de4a59)
2017-06-21 17:19:45 -07:00
Justin Klaassen
93bd71f10a Merge "Reset last activated time after auto mode changed" into oc-dr1-dev
am: 13cfb46e41

Change-Id: Ic54dae12f687caf5288ccbf3cd3c842ce4742721
2017-06-20 23:56:13 +00:00
Justin Klaassen
4bcc06f39c Reset last activated time after auto mode changed
Fixes: 62749129
Test: runtest -c com.android.server.NightDisplayServiceTest \
      frameworks-services
Change-Id: I7e5a4c56cd20be70e693aa2327972b5da77b6f27
2017-06-20 13:29:43 -07:00
Vladislav Kaznacheev
6063096518 Merge "Do not update currently open tooltip." into oc-dev am: 139dbe5c1c
am: 3fd4215760

Change-Id: I4b9674e73830462bbe9288ebfa1bbac89af860b3
2017-06-19 21:24:11 +00:00
Vladislav Kaznacheev
2102c3211c Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia3fc1f16e71a4a12a0a84704b7ca7a9d2ec33514
2017-06-19 21:12:45 +00:00
Vladislav Kaznacheev
3fd4215760 Merge "Do not update currently open tooltip." into oc-dev
am: 139dbe5c1c

Change-Id: Ia0b5b2c7ee9dc8a0cc975562de350ac0ff4a0449
2017-06-19 21:12:41 +00:00
Lucas Dupin
af26f72fb8 Merge "K-Means color clustering" into oc-dr1-dev
am: 11cc260047

Change-Id: If99425cb57a322900f476227932cdcadd85abf00
2017-06-17 17:26:20 +00:00
Lucas Dupin
1d3c00d5c7 K-Means color clustering
Test: runtest -x tests/Internal/src/com/android/internal/ml/clustering/KMeansTest.java
Bug: 37014702
Change-Id: Idabc163df5ded362acbe462ae6b351394a36db10
2017-06-16 18:04:42 -07:00
Vladislav Kaznacheev
dd469d171d Do not update currently open tooltip.
Currently if View.setTooltipText is called while
the tooltip is being shown for that view, it will
update the displayed text. The tooltip then will
resize to wrap around the new text, but not change
its position. This looks confusing if the new text
is significantly shorter or longer.

Removing this functionality until proper
re-positioning is implemented.

Bug: 38491655
Test: android.view.cts.TooltipTest passes
Change-Id: I79689288185888854b992b89e19fe381d3ac50e4
2017-06-16 11:31:23 -07:00
Chris Thornton
2fe6586160 Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev
am: 6f071c369e

Change-Id: I98f9c06856a70a5a4b3634f41860068c331f0c83
2017-06-14 19:16:36 +00:00
TreeHugger Robot
6f071c369e Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into oc-dr1-dev 2017-06-14 19:10:43 +00:00