Commit Graph

8322 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Jorim Jaggi
7f58322d51 Revert "Fix jank when switching themes"
am: 6498f96283

Change-Id: Ie5813f1c04a6db9d5ee291df764873900add5064
2017-07-24 14:14:34 +00:00
Jorim Jaggi
6498f96283 Revert "Fix jank when switching themes"
This reverts commit e5d0b9dddb.

Fixes crashloop with lock pattern

Change-Id: I3721444c91e2be625c59ec3e6ba14f1080badc07
Fixes: 63980375
2017-07-24 15:53:42 +02:00
Lucas Dupin
902ba7bab5 Merge "Fix jank when switching themes" into oc-dr1-dev
am: a74f575ff9

Change-Id: Ibc8fa59cfa6139b03aa7fb08361eb43331484be5
2017-07-22 04:52:31 +00:00
TreeHugger Robot
a74f575ff9 Merge "Fix jank when switching themes" into oc-dr1-dev 2017-07-22 04:46:19 +00:00
Bookatz
63959bae98 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am: 2337b3ba84

Change-Id: Ie29e6ddb7ab37977130adbf566fac18c4dc5c26b
2017-07-22 00:41:57 +00:00
Bookatz
993a0be676 Batterystats: fix inappropriate bg timebase reset
Previously, the background timebases (of a Uid) were reset when the Uid
resets in the wrong place. This caused StopwatchTimer.reset() to have the timesbase's old value to keep
track of its mUpdateTime. The solution is to call TimeBase.init at the
start of Uid.reset(), instead of calling TimeBase.reset() at the end of
Uid.reset().

Bug: 62352334
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Change-Id: I23c886544e18f154fc226cc81c22c3ea70fb4c7e
2017-07-21 15:26:13 -07:00
Bookatz
94c5a313d7 Batterystats handles nested unoptimized ble scans
When a ble scan starts, it tells batterystats whether that scan is
unoptimized. When the scan stops, batterystats is not informed of
whether the stopped scan was unoptimized. Because the ble scan call
could not be nested (couldn't call start twice without stopping first),
this was fine, but now nesting is possible, so batterystats needs to
know whether the stopped ble scan is unoptimized.

Bug: 63456783
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
Test: no new errors when run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testUnoptimizedBleScans

Change-Id: Ia73f294cf1807ddaf20f1c0bcc28add001cac78c
2017-07-21 21:46:01 +00:00
Lucas Dupin
e5d0b9dddb 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: I4b5db6234cafebbe8eaa952781c038370a11488b
Fixes: 63751714
Test: Visual. Set wallpapers, unlock.
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/ColorExtractorTest.java
Test: systrace
2017-07-20 22:44:36 -07:00
Jeff Sharkey
17bebd2fd7 Expose SubscriptionPlan API.
Clean up SubscriptionPlan, add docs, and expose as public API.

Deprecate older constants in CarrierConfigManager, and point users
towards new API.  (The goal of CarrierConfigManager is to express
key/value pairs that are identical for all users on a particular
carrier, not to configure details that vary between users.)

Since a CarrierService may itself not have access to the plan
details, allow them to "delegate" the capability to configure plans
to another package name.

Factor out new RecurrenceRule class which is used by both
NetworkPolicy and SubscriptionPlan internally.  Polish it to support
arbitrary periods, and continue to test it through NPMST.

Bug: 63391323
Test: bit FrameworksCoreTests:android.util.RecurrenceRuleTest
Test: bit FrameworksServicesTests:com.android.server.NetworkPolicyManagerServiceTest
Exempt-From-Owner-Approval: Bug 63673347
Change-Id: I93fae4a43e58e9e4c32f8bf345a257dcd607f088
2017-07-20 14:55:57 -06:00
Adrian Roos
520caf4a75 Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am: d3878b5e12

Change-Id: I11ddc51a8c71d22b5420def8a4c0f3f57954a081
2017-07-20 11:29:59 +00:00
Adrian Roos
d3878b5e12 Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev 2017-07-20 11:22:39 +00:00
Sudheer Shanka
e1fc968241 Merge "Assign cpu times to correct battery state bucket." 2017-07-20 04:28:19 +00:00
Philip Quinn
075c4a3d63 Merge "Ping the StatusBar about power key events. am: c3a503d8fd" into oc-dr1-dev-plus-aosp
am: c5f9c329c1

Change-Id: I2906e0d6faae5a800cb70e13e5fb8fe590fe0bfa
2017-07-20 04:11:22 +00:00
Philip Quinn
980808df5a Ping the StatusBar about power key events.
am: c3a503d8fd

Change-Id: I53c473abae0a58216bfa810d2e5df2da294d411d
2017-07-20 04:01:51 +00:00
Philip Quinn
c3a503d8fd Ping the StatusBar about power key events.
Bug: 63183852
Test: runtest systemui

Change-Id: I5d8209396e3e761b404c1071a7004f34c6e6c927
2017-07-20 03:51:51 +00:00
Calin Juravle
2b59499263 Merge "Encode the entire class loader context for dex2oat" 2017-07-20 00:43:02 +00:00
Android Build Merger (Role)
58b66588b6 Merge "Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev am: 7b3bd1d547 am: 4dec845d52" 2017-07-20 00:34:14 +00:00
Sungsoo Lim
e8de514b10 Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev am: 7b3bd1d547
am: 4dec845d52

Change-Id: I07d405b81ec43d720ec843a87e6a3bb07e03aea7
2017-07-20 00:32:10 +00:00
TreeHugger Robot
dc751a3867 Merge "Add provider support for metadata extraction" 2017-07-20 00:29:59 +00:00
Sungsoo Lim
4dec845d52 Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev
am: 7b3bd1d547

Change-Id: I0bf675f16c233b8b0a83f7bf20c9a42e3b76cbbb
2017-07-20 00:25:11 +00:00
TreeHugger Robot
7b3bd1d547 Merge "MediaRouter: Introduce and use getFallbackRoute method" into oc-dr1-dev 2017-07-20 00:18:20 +00:00
Julian Mancini
b65051579f Add provider support for metadata extraction
In this CL, I'm adding ability to retrieve image metadata. I've added
the class MetadataRetriever that can currently retrieve Exif data from
an image. This class is used withing FileSystemProvider in order to
return a given image's exif data.

Test: Hidden API
Bug: 62621970
Change-Id: Ibb329492df4db1a65f65722c6a52582c43de8fe5
2017-07-19 15:46:23 -07:00
Calin Juravle
19da1cf72e Encode the entire class loader context for dex2oat
Until now the split dependencies were passed as a flatten list to dex2oat.
In the presence of DelegateLastClassLoaders this is no longer enough to
ensure the correctness of the compilation.

This CL encodes the split dependencies together with their declared class
loader in a format accepted by dex2oat.

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

Change-Id: Iaabd5d8bd5e6d027a8de5a408777fd517063d9f1
2017-07-19 15:20:16 -07:00
Lucas Dupin
b0bcf793a5 Merge "Default gradient should be the dark version" into oc-dr1-dev am: 4dfb200d1b
am: 85fa07b831

Change-Id: I66389304ab13274dabafe2993d8cd2a5a172d1c0
2017-07-19 18:56:20 +00:00
Lucas Dupin
85fa07b831 Merge "Default gradient should be the dark version" into oc-dr1-dev
am: 4dfb200d1b

Change-Id: I72a0674c9a180f65536553e30f80317276073365
2017-07-19 18:48:15 +00:00
Sudheer Shanka
1f0764f1f1 Merge "Update logic for attribution of per-cpu cluster times to each uid." 2017-07-19 18:47:27 +00:00
TreeHugger Robot
4dfb200d1b Merge "Default gradient should be the dark version" into oc-dr1-dev 2017-07-19 18:40:38 +00:00
Sudheer Shanka
9d4ed7c3cf Assign cpu times to correct battery state bucket.
Bug: 63526591
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
      com.android.server.cts.BatteryStatsValidationTest
      bit FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Change-Id: I1bbc3968b6e8f298c8b6d7c25bf931555de94aae
2017-07-19 10:58:02 -07:00
Sudheer Shanka
c189595b2e Merge "Log if there is malformed data in the proc file." 2017-07-19 17:37:07 +00:00