Commit Graph

8323 Commits

Author SHA1 Message Date
Ajay Panicker
52c78bd5a2 Merge "Batterystats handles nested unoptimized ble scans" into oc-dr1-dev am: aaf3860941
am: 4c0900102b

Change-Id: I72bd4d4769ac95b2ef2e78426cfa38c29c51ea6e
2017-07-25 02:26:48 +00: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
Andreas Gampe
61491cc647 Merge "Zygote: Increase wrap-pid timeout to thirty seconds" am: 81f66ce5ab am: d795bbcdcc am: 7729d061ff
am: bac3bc121f

Change-Id: I360a8d4a13d2bc02eff117f1161c48e782ef4de7
2017-07-25 00:39:13 +00: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
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
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
e5e7ea281f Revert "Fix jank when switching themes" am: 6498f96283
am: 51a1525199

Change-Id: I06187734d198eff410f1b04d2c7c2e491e57e709
2017-07-24 14:23:10 +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
51a1525199 Revert "Fix jank when switching themes"
am: 6498f96283

Change-Id: I7e833b282939153d63fc2ffbeb8d5cb77923b62d
2017-07-24 14:14:27 +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
Lucas Dupin
90ad7d538f Merge "Fix jank when switching themes" into oc-dr1-dev
am: a74f575ff9

Change-Id: Ia9a05c0fe59c2677029fcfc95b1cd648c091d23f
2017-07-22 04:52:29 +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
9de5dc9ba8 Merge "Batterystats: fix inappropriate bg timebase reset" into oc-dr1-dev
am: 2337b3ba84

Change-Id: I9d0a3c1ac05f9583fe98b169037e008cc36315b3
2017-07-22 00:41:54 +00:00
Shubham Ajmera
d4185538dc 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: If90690d6234dc8727df2b2fb485f0c8d50970a92
2017-07-21 15:48:40 -07: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
41234fdc6c Merge "Keyguard: Factor out Screen and Wakefulness lifecycles" into oc-dr1-dev
am: d3878b5e12

Change-Id: Ibe7749ee616295426cdeae07deb9dc998c49e8e2
2017-07-20 11:29:58 +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
Andreas Gampe
d3e7126645 Merge "Zygote: Poll with timeout for pid" am: 89d119abe6 am: 6078facf1f
am: 57ba0ddc91

Change-Id: Idac309f0674a33ef9dd3a6769c217568828f8f8d
2017-07-20 05:49:05 +00:00
Andreas Gampe
57ba0ddc91 Merge "Zygote: Poll with timeout for pid" am: 89d119abe6
am: 6078facf1f

Change-Id: I360bf86dbd5ff0c0d3b0fd6bb207692fe1142bd1
2017-07-20 05:42:34 +00:00
Andreas Gampe
6078facf1f Merge "Zygote: Poll with timeout for pid"
am: 89d119abe6

Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed
2017-07-20 05:36:42 +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
Andreas Gampe
3fbde346ad Zygote: Poll with timeout for pid
Do not use a blocking readInt. Poll for available bytes with a timeout.

(cherry picked from commit cbc4214061)

Bug: 63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5
2017-07-19 19:45:55 -07: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