Commit Graph

8360 Commits

Author SHA1 Message Date
Sudheer Shanka
3cb64c2c51 Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev 2017-08-11 01:05:43 +00:00
Sudheer Shanka
a87245d305 DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs.
Bug: 62240247
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest

Change-Id: I1328fe7bf29229e9563cde6eea80addf2b91ea5d
2017-08-10 15:36:47 -07:00
Narayan Kamath
57ae4db225 Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev 2017-08-10 15:34:22 +00:00
Narayan Kamath
590b90f533 ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e.
Bug: 64493351
Test: cts-tradefed run cts-dev -t android.appsecurity.cts.ClassloaderSplitsTest -m CtsAppSecurityHostTestCases
Change-Id: Ib4868c1e0320002f5122193621e9ab56fe34819f
2017-08-10 12:15:17 +01:00
TreeHugger Robot
c75f43c1ab Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev 2017-08-10 04:35:09 +00:00
Dianne Hackborn
2a103f126f Go: add features for low ram / normal ram devices.
Automatically populated from ActivityManager.isLowRamDevice().

Test: manual

Change-Id: I027b8ae0205c9793a91ffdd2635479610a62aff9
2017-08-09 17:14:00 -07:00
Makoto Onuki
ff94e0351a DropBoxManagerService: Don't store redundant information
Filenames can be calculated from other fields, so there's no need to
store them.

This will reduce the average EntryFile size from 160b to 28b, so in theory
it could save 132 KB for 1000 entries.

- Also switched from HashMap to ArrayMap, which should help a bit too.

- Also fixed unit tests and added more.

Bug: 20890386
Test: bit FrameworksServicesTests:com.android.server.DropBoxTest
Test: Boot, check the dropbox directory, run dumpsys dropbox, reboot and repeat.

Change-Id: If567750f478318acd621864d1d4ef2ed41f214bd
2017-08-09 12:07:40 -07:00
Christofer Åkersten
8466b0179e Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-mr1-dev 2017-08-09 16:45:51 +00:00
Andrew Sapperstein
264fd594ca Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
am: 3108a06656

Change-Id: Ic37ee35914b714144228b77b192edf835bf9627e
2017-08-09 13:06:21 +00:00
Jason Monk
45144930b2 Merge "resolve merge conflicts of de0c539dd4 to oc-mr1-dev" into oc-mr1-dev 2017-08-09 12:15:19 +00:00
Adrian Roos
c2ca590e8e Merge "FRP: Fix crash after lockout" into oc-mr1-dev 2017-08-09 09:54:22 +00:00
Christofer Åkersten
d51640ba50 Inherit theme dark/light scheme for MediaRouter dialogs/button
Bug: 64291950
Test: manual
Change-Id: I20694ce512a794a3c6574108b80dcfb4979b3b39
2017-08-09 15:48:16 +09:00
Sudheer Shanka
bd9884a331 Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev 2017-08-09 05:38:18 +00:00
Sudheer Shanka
40c43f1b09 Change logging format in KernelUidCpuFreqTimeReader.
TimeUtils.formatForLogging takes currentTimeMillis as
argument, not elapsedRealTime.

Bug: 63041570
Test: visual inspection of logs
Change-Id: I4b880f64a8ead9a6a4a37fa4b9691edfc38a12db
2017-08-08 15:54:44 -07:00
Andrew Sapperstein
5a71a0f520 Make accessibilityInversionEnabled public
Need to use it in Settings.

Bug: 64256644
Test: existing
Change-Id: I9f9d2655e35ee2ad0dc9f9980cc9993f7b084025
2017-08-08 13:57:49 -07:00
Jason Monk
0b99402f87 resolve merge conflicts of de0c539dd4 to oc-mr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I3f5eb2a0481fb09b98c0c522c82c233350c06375
2017-08-08 16:27:14 -04:00
Jason Monk
b4302182bc Move shutdown UI to sysui (when possible)
Test: click restart or power off in global actions
Change-Id: I0dc30a9772bbfb3cd3c3568f157e854fef87bf87
Fixes: 63576195
Fixes: 64125291
2017-08-08 09:13:51 -04:00
TreeHugger Robot
956491b867 Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev 2017-08-08 11:53:46 +00:00
Adrian Roos
b7d81d9a20 FRP: Fix crash after lockout
Change-Id: Ie8cd85c6afd61a03dfe730432702c11c29c11cce
Fixes: 37746493
Test: Trigger FRP, enter wrong credential 10 times, verify no crash.
2017-08-08 13:08:01 +02:00
TreeHugger Robot
26e02181a0 Merge "Bump parcel version to reset batterystats" into oc-mr1-dev 2017-08-08 06:03:18 +00:00
Sudheer Shanka
e913d8235c Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev 2017-08-07 23:32:50 +00:00
Adam Bookatz
0a1ae1bc56 Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev 2017-08-07 23:22:31 +00:00
Adrian Roos
8370e472cd FRP: Enable credential-based factory reset protection by default
Bug: 64436700
Change-Id: I3aed6313e3b6b7e6d6e65c9e822ff123b8cd52cd
Test: Set up PIN, add Google Account, adb shell reboot-bootloader; fastboot -w; verify credential-based unlocking is possible using the PIN from before factory reset
2017-08-07 16:16:00 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
Bookatz
38d5d59a75 Bump parcel version to reset batterystats
Due to new changes in batterystats definitions (especially for wakeup
alarms), we should force batterystats to reset its data for all devices
with these changes. This can be done by increasing the parcel version
number. This is being done in a separate submission to avoid merge
conflicts.

Test: none
Bug: 64149996
Change-Id: I59cf2064e38694d485b18a2bf20ceaa65f6458c4
2017-08-04 15:24:51 -07:00
Bookatz
98d4d5cf3f Package wakeup alarms are now on screen-off timebase
Previously, wakeup alarms (for an app) were using the battery-on
timebase. Now they will instead use the battery-on-screen-off timebase.
In this way, apps won't be penalized for wakeups that occurred when
the device was being actively used anyway.

Also bumps up report version to 25.
Also bumps up parcel version.

Change-Id: I1b692a9137ff28d535e7a06b539f713b54a85ea9
Fixes: 64149996
Test: manually verified count doesn't increase when screen-on
2017-08-04 15:23:51 -07:00
Amith Yamasani
6aaaa2bbb0 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am: 5a800cf069

Change-Id: I99d131e00dc43982f41e8837f44a66c71312615a
2017-08-03 23:18:29 +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
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
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
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
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
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
Sudheer Shanka
71f34b390d Track per-cluster times of each uid in microsec.
Bug: 62805443
Test: Used some apps and verified that battery usage is attributed to
      these apps in Settings>Battery.

Change-Id: I0e604fdc0d1704d7d061b6a711a0017b82a39b8f
2017-07-25 20:59:58 +00: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