Commit Graph

8498 Commits

Author SHA1 Message Date
Amith Yamasani
7d00772ceb Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069
am: 26f8f5c868

Change-Id: I44fe5b45c8cdc3d4ddd7edc210641f3883265c58
2017-08-03 23:29:23 +00:00
Amith Yamasani
26f8f5c868 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am: 5a800cf069

Change-Id: I4b2e2dc81baea8078b0bca1db357e234bda27bf7
2017-08-03 23:18:32 +00:00
TreeHugger Robot
4204f1658c Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev 2017-08-03 23:07:53 +00:00
Amith Yamasani
5a800cf069 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev 2017-08-03 23:07:32 +00:00
Lucas Dupin
89f58e156e Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am: e09e5ef21b

Change-Id: Idb06a8e04ac1cb9bf73fe168217d5369bb412b4f
2017-08-03 22:56:54 +00:00
Christopher Tate
9f22443b4e Use normal API for legacy wallpaper restore
No longer do we play crazy rename-into-place tricks!  Just take
the restored image and treat it as an ordinary new system wallpaper,
and let the system machinery do all its proper work.  While we're at
it, we get rid of the now-spurious shenanigans about backing up the
wallpaper under the 'android' package, an overdue and welcome bit
of thinning.

In addition, we now fully migrate a legacy wallpaper image to have
both a source and a display crop in place.  We were previously
not generating the equivalent source image, which made N+ backups
unable to store the image properly.

Fix 64269208
Fix 62809439
Test: manual (set wallpaper under M, backup, flash to ToT,
      force restore)

Change-Id: If9b26b777f0fda95cf37c3c790a3fa4e82ff0340
2017-08-03 11:10:41 -07:00
Lucas Dupin
50ba991655 Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
2017-08-02 18:34:00 -07:00
Lucas Dupin
26fb43c034 Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Merged-In: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
2017-08-02 23:18:26 +00:00
Calin Juravle
565cab11ff Merge changes from topic 'class-loaders-mr1' into oc-mr1-dev
* changes:
  Use the class loader context when optimizing secondary dex files
  Add DexClassLoader to the list of supported class loaders
2017-08-01 18:38:05 +00:00
Geoffrey Pitsch
d536ba3f41 Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am: 861b35e1df

Change-Id: Ib0c2a708e2556fc604631891666b70a841a1129a
2017-08-01 14:09:10 +00:00
Geoffrey Pitsch
7662de2771 Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am: 861b35e1df

Change-Id: I4ee3ad06138a66b47bca6e56fbbd0bd970d91e08
2017-08-01 14:08:36 +00:00
Geoffrey Pitsch
3ba2623ffe Disable AOD when accessibility color inversion is on.
White background drains too much to be always on.

Bug: 62918778
Test: Manual
Change-Id: I78b2f6a5951b108aff4f353dabe2493117032dce
2017-07-31 13:55:59 -04:00
Lucas Dupin
835f5e41de Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: I4c4eb814d8ea2152644665daf6fbd6eb28d81b06
2017-07-29 23:17:49 +00:00
Lucas Dupin
58d7a76e8d Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev
am: f98facc3b8

Change-Id: Iab836083f7e3ea86263de1a1d2a2d69d7e25fe73
2017-07-29 23:17:49 +00:00
Lucas Dupin
9324aa926a Scrim opacity must satisfy GAR
Change-Id: Ic0a2423d73f0a3439a0dc4de8eb6e4719dbf36e1
Fixes: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/graphics/ColorUtilsTest.java
2017-07-28 10:07:04 -07:00
TreeHugger Robot
5b81cfe83c Merge "[P2P][AsyncChannel] Revert client registering for service death" into oc-mr1-dev 2017-07-27 18:07:19 +00:00
Lucas Dupin
3a5550a3be Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am: 4451b6ae19

Change-Id: Ia176aeafa9c9e2d0b979a472bb444657b4417ab9
2017-07-27 16:49:50 +00:00
Lucas Dupin
98c63ca9ac Merge "Add theme variables to SysUI dump" into oc-dr1-dev
am: 4451b6ae19

Change-Id: I1549a77346b4c7c417ba2fa7a2b77a9b0ea2ea2a
2017-07-27 16:49:49 +00:00
Lucas Dupin
8a4522dceb Add theme variables to SysUI dump
Dumping current themes and scrim states to make debugging easier.

Bug: 63890571
Test: adb bugreport # look for new variables
Change-Id: Ia9bfd1b91d8d2c19930cb896d337ecdfa776e6cb
2017-07-26 21:48:06 -07:00
Etan Cohen
50edf1efa5 [P2P][AsyncChannel] Revert client registering for service death
This effectively reverts 19c4883c85.

The change added a binder death listener on a peer of the AsyncChannel.

Issue: as specified in the bug - this causes a memory leak in apps
using WifiP2pManager (and possibly other clients using AsyncChannel).
The issue is that a reference to the caller is now kept by the death
listener. This means that the caller object cannot be gc'd. This
impacts WifiP2pManager since it didn't have an explicit close() method.

The original reason for the change was to enable clean-up - this can
be done in an alternative mechanism by passing-in a binder from client
to service. Will be enable in a subsequent CL.

Bug: 37443149
Test: all p2p tests, memory usage with test app
Change-Id: Iff044a8cc9c2fc0bc57db4a218b80d0b12424ddd
2017-07-26 16:22:46 -07:00
TreeHugger Robot
c58e47cfdc Merge "Don't attribute incorrect unified challenge attempt to profile." into oc-mr1-dev 2017-07-26 18:59:13 +00:00
Amith Yamasani
fd3caf6a7d Ignore isolated uid's process state in BatteryStats tracking
Isolated UIDs keep coming and going, with their process states
being downgraded. But this shouldn't impact the process state
time tracking in battery stats, since the parent UIDs process state
reflects the overall state already.

This fixes incorrect TOP time reporting in Settings for apps like
Chrome.

Change-Id: I0e94b064cd19f1f2d951e1e88aaba06b5c1c26fe
Fixes: 62162308
Test: Use chrome for a while and observe output of dumpsys batterystats
2017-07-26 11:48:35 -07:00
Selim Cinek
d0644e4493 Merge "Changing the way the media image scales" into oc-dr1-dev
am: e06e3f97fc

Change-Id: I60cd55a9d8ef2de15aa1f268f42923955c9d050c
2017-07-25 23:10:20 +00:00
Selim Cinek
49cdbaa25f Merge "Changing the way the media image scales" into oc-dr1-dev
am: e06e3f97fc

Change-Id: I667f1ec67a02c5ae264115a5b8bbe06dedda1d34
2017-07-25 23:04:53 +00:00
Selim Cinek
e06e3f97fc Merge "Changing the way the media image scales" into oc-dr1-dev 2017-07-25 22:45:55 +00:00
TreeHugger Robot
fb4da9ea55 Merge "resolve merge conflicts of a1f64b0a91 to oc-mr1-dev" into oc-mr1-dev 2017-07-25 22:21:29 +00:00
Calin Juravle
f8c14e920e Add DexClassLoader to the list of supported class loaders
DexClassLoader have the same behavior as PathClassLoader and is still in
use by apps. Add it to the list of supported class loaders so that it can be
recognized during secondary dex file loads.

Bug: 38138251
Bug: 36044779

Test: runtest -x
services/tests/servicestests/src/com/android/server/pm/dex/DexoptUtilsTest.java

(cherry picked from commit d08b3156e8)

Change-Id: If02081d29f4d8ac917dacd877eb75985ea3895a9
2017-07-25 14:19:14 -07:00
Lucas Dupin
ef15776aaf resolve merge conflicts of a1f64b0a91 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic2395d055e1f27b186c3b87be5440dc410ee16a3
2017-07-25 12:00:01 -07:00
TreeHugger Robot
36d8b489d2 Merge "Zygote: Increase wrap-pid timeout to thirty seconds" into oc-mr1-dev 2017-07-25 18:09:42 +00:00
Lucas Dupin
667c29d0be Merge "Fix jank when switching themes" into oc-dr1-dev
am: a1f64b0a91

Change-Id: I60c1b404b4b3a673cd3bf44f36deed546965f9cc
2017-07-25 17:47:47 +00:00
TreeHugger Robot
a1f64b0a91 Merge "Fix jank when switching themes" into oc-dr1-dev 2017-07-25 17:40:02 +00:00
Calin Juravle
96995bb7a2 Merge "Fix system server compilation in ZygoteInit" into oc-mr1-dev 2017-07-25 16:54:06 +00:00
Andreas Gampe
032a929542 Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.

Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.

(cherry picked from commit 27497c6dfc)

Bug: 63904739
Bug: 63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
2017-07-24 19:59:13 -07:00
Ajay Panicker
4c0900102b Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
am: aaf3860941

Change-Id: I627a6da4db6eb09b68e23882ccef2de4c80bf747
2017-07-25 02:19:31 +00:00
Ajay Panicker
a14a02e5fc Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev
am: aaf3860941

Change-Id: I3ea0257deb116f89aa62afd49fd4daefb8a782d5
2017-07-25 02:19:18 +00:00
Ajay Panicker
aaf3860941 Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev 2017-07-25 02:11:26 +00:00
Calin Juravle
2f09ff38f6 Fix system server compilation in ZygoteInit
The code which dexopt SystemServer in ZygoteInit used to pass the
sharedLibrary string in the old format.

This CL updates the classPath string to the new class loader context
encoding.

Bug: 63941300
Test: compile WITH_DEXPREOPT=false and WITH_DEXPREOPT_BOOT_IMG_ONLY=false
and check that when the device boots the correct context is passed to
dex2oat.

(cherry picked from commit b0dede3ec2)

Change-Id: Ie27cd21b0b9c8b7e226bce74dfa297569ac12317
2017-07-24 18:40:17 -07:00
Andreas Gampe
bac3bc121f Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am: 81f66ce5ab am: d795bbcdcc
am: 7729d061ff

Change-Id: I09b9eff7215bb22e831939eede7ddaa755fc4970
2017-07-25 00:32:46 +00:00
Selim Cinek
a8818f6b31 Changing the way the media image scales
Before, the media image could get really small
under certain conditions. We now just push it off
a bit.

Test: manual, test media notification with different densities
Change-Id: If0fec49510a0dee627ce4a8ddb7075534c0e15c3
Fixes: 63142413
2017-07-24 17:30:32 -07:00
Andreas Gampe
7729d061ff Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am: 81f66ce5ab
am: d795bbcdcc

Change-Id: I350d479d030e3b8398975f60b8463343f7bb5e86
2017-07-25 00:27:45 +00:00
Andreas Gampe
d795bbcdcc Merge "Zygote: Increase wrap-pid timeout to thirty seconds"
am: 81f66ce5ab

Change-Id: I1cc8856ebb68ee83a8d3e62d86b48d497d0eb237
2017-07-25 00:18:19 +00:00
Treehugger Robot
81f66ce5ab Merge "Zygote: Increase wrap-pid timeout to thirty seconds" 2017-07-25 00:06:02 +00:00
Shubham Ajmera
0abf6a8485 Update DexFile#getDexOptNeeded usages to reflect API change am: 52c8620c19
am: 51b9a824d5

Change-Id: I40cb970c53220f42558cb8b968efc97b8c7408d6
2017-07-24 22:48:41 +00:00
Shubham Ajmera
51b9a824d5 Update DexFile#getDexOptNeeded usages to reflect API change
am: 52c8620c19

Change-Id: I31b2aec15ace15e159eaeaafdd55d10767aaca0f
2017-07-24 22:43:33 +00:00
Shubham Ajmera
52c8620c19 Update DexFile#getDexOptNeeded usages to reflect API change
Test: make and boot
Merged-in: I68f9f617d6722a7ba8b00aa2181cb38a165cfc51
Bug: 36598475
(partially cherry-picked from commit 246dccf932)

Change-Id: Idfc9276eb2b61244bbd634f49a3912dab6fcabfa
2017-07-24 15:21:04 -07:00
Lucas Dupin
e17ce5286f Fix jank when switching themes
Turning overlays on and off takes time,
it also doesn't allow us to have fine control
over which view is using which theme.
Lock screen colors are now driven by themes.

Change-Id: Ie8860d00dbb0705ed76edf60a9d3030618dd21ca
Fixes: 63751714
Test: Visual. Set wallpapers, unlock.
Test: runtest -x packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
Test: systrace
2017-07-24 13:26:22 -07:00
Pavel Grafov
b319125446 Don't attribute incorrect unified challenge attempt to profile.
If the profile uses unified challenge and we attempt to check its
password instead of parent user's password (as would be the case in
the UI), we shouldn't try report this attempt sinse the user doesn't
have a real password of its own and SecurityException will be thrown
from DPMS.reportFailedPasswordAttempt.

Test: adb shell cmd lock_settings verify --user 10 --old 12368
Bug: 63295016
Change-Id: Ieb60a064a79095be9fde12cbd6ffca8076d769c3
(cherry picked from commit 01376594b7)
2017-07-24 19:00:42 +00:00
Andreas Gampe
27497c6dfc Zygote: Increase wrap-pid timeout to thirty seconds
Some lowend devices under heavy instrumentation may not be able to
send the pid in the current five seconds. Drop the safety and
ignore watchdog debug builds, and move the timeout to thirty seconds.

Make the ZygoteConnection constants sharable in their own @hide class.
Add an assert into the watchdog that the wait time is less than the
watchdog time on non-debug builds.

Bug: 63904739
Bug: 63638768
Test: m
Test: manual test
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: I80abdda54cd94e935de5a52b9f3c9192d0e31060
2017-07-24 10:14:03 -07:00
Jorim Jaggi
7f58322d51 Revert "Fix jank when switching themes"
am: 6498f96283

Change-Id: Ie5813f1c04a6db9d5ee291df764873900add5064
2017-07-24 14:14:34 +00:00
Jorim Jaggi
51a1525199 Revert "Fix jank when switching themes"
am: 6498f96283

Change-Id: I7e833b282939153d63fc2ffbeb8d5cb77923b62d
2017-07-24 14:14:27 +00:00