Lucas Dupin
bc3a3df807
Merge "Do not filter out some colors" into oc-mr1-dev am: a9774680f8
...
am: 69bb2bae90
2017-08-17 01:03:22 +00:00
Todd Kennedy
519b589300
resolve merge conflicts of d22603ebd2 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iab4443f6a8b996ea9f28f4e68c6ec3bb708526e6
2017-08-16 15:00:20 -07:00
Lucas Dupin
69bb2bae90
Merge "Do not filter out some colors" into oc-mr1-dev
...
am: a9774680f8
2017-08-16 19:52:34 +00:00
TreeHugger Robot
a9774680f8
Merge "Do not filter out some colors" into oc-mr1-dev
2017-08-16 19:38:45 +00:00
Hugo Benichi
aef8a96dcd
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8 am: 1ada5660ce
...
am: d79f39689e
2017-08-16 18:43:48 +00:00
Todd Kennedy
cab962b8d0
Merge "Allow explicit permission denial" into oc-mr1-dev
...
am: 7fc53a11f8
2017-08-16 17:41:38 +00:00
TreeHugger Robot
7fc53a11f8
Merge "Allow explicit permission denial" into oc-mr1-dev
2017-08-16 17:11:30 +00:00
Todd Kennedy
74629e3183
Allow explicit permission denial
...
Change-Id: I5d348ed555f249d210253dab60ae11d4831c4f0a
Fixes: 63675512
Test: Manual
2017-08-16 14:43:05 +00:00
Hugo Benichi
d79f39689e
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8
...
am: 1ada5660ce
2017-08-16 12:32:51 +00:00
Hugo Benichi
1ada5660ce
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327
...
am: 63fdcd08f8
2017-08-16 12:23:15 +00:00
Hugo Benichi
63fdcd08f8
Merge "More OWNERS file for core networking team" am: 2827f21740
...
am: 1da7985327
2017-08-16 12:10:19 +00:00
Hugo Benichi
1da7985327
Merge "More OWNERS file for core networking team"
...
am: 2827f21740
2017-08-16 11:57:50 +00:00
Hugo Benichi
b8f1e4e6e4
More OWNERS file for core networking team
...
Test: build
Change-Id: I7cef188e29f487025aee04ab0c1a003bb32a7048
2017-08-16 18:40:07 +09:00
Lucas Dupin
e2efebc8a2
Do not filter out some colors
...
Colors specified manually using the public WallpaperColors
constructor should not be blacklisted.
Test: runtest -x tests/Internal/src/android/app/WallpaperColorsTest.java
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Change-Id: I96faf413e3629c247220d825bb7c3480ed2f1003
Fixes: 64361146
2017-08-15 11:30:19 -07:00
Lei Yu
ebd39077b5
Merge "Write currentDuration into Parcel" into oc-mr1-dev am: bd6ff3d3e5
...
am: 240a70f1e5
2017-08-14 22:54:36 +00:00
Lei Yu
240a70f1e5
Merge "Write currentDuration into Parcel" into oc-mr1-dev
...
am: bd6ff3d3e5
2017-08-14 22:38:04 +00:00
Lei Yu
bd6ff3d3e5
Merge "Write currentDuration into Parcel" into oc-mr1-dev
2017-08-14 22:28:26 +00:00
Fyodor Kupolov
0aef1c98c9
Merge "Log timings for shutdown stages" into oc-mr1-dev am: fe97799d5d
...
am: 34cac26ea4
2017-08-14 21:25:01 +00:00
Fyodor Kupolov
34cac26ea4
Merge "Log timings for shutdown stages" into oc-mr1-dev
...
am: fe97799d5d
2017-08-14 21:10:59 +00:00
Fyodor Kupolov
6e3461b67c
Log timings for shutdown stages
...
Renamed BootTimingsTraceLog to TimingsTraceLog. It is now used for
boot and shutdown logging.
Added measurements for main stages of shutdown in the system server:
ShutdownTiming: SendShutdownBroadcast took to complete: 734ms
ShutdownTiming: ShutdownActivityManager took to complete: 203ms
ShutdownTiming: ShutdownPackageManager took to complete: 17ms
ShutdownTiming: ShutdownBt took to complete: 533ms
ShutdownTiming: ShutdownRadio took to complete: 534ms
ShutdownTiming: ShutdownNfc took to complete: 1536ms
ShutdownTiming: ShutdownRadios took to complete: 1538ms
ShutdownTiming: ShutdownStorageManager took to complete: 906ms
ShutdownTiming: SystemServerShutdown took to complete: 3918ms
Bug: 64569080
Test: shutdown/reboot and check logs
Change-Id: I636c045852cd1ed6be1c58af6608f70e95756389
2017-08-14 11:23:29 -07:00
Sudheer Shanka
b8ad594300
Use cpu freq times to calculate power consumed by an uid.
...
Initially we used to approximate times spent by an uid at a particular
freq using total time spent by the uid but since now the freq times
are directly available from the proc file, we can use these to
calculate power.
Bug: 62240247
Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsTests
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
com.android.server.cts.BatteryStatsValidationTest
Test: Used some apps and verified that battery usage is attributed to
those apps in Battery settings.
Change-Id: Ia8e2eb07fd778b8a8c83a6acec711e7b97aefdc0
2017-08-11 00:04:50 -07:00
Sudheer Shanka
76974ee41e
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
...
am: 3cb64c2c51
2017-08-11 01:18:34 +00:00
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
jackqdyulei
610a0a09f2
Write currentDuration into Parcel
...
This cl writes currentDuration to Parcel, so in battery settings we could
use this data in anomaly detection.
Also note that in getTotalDurationMsLock(aka method1), the logic is:
result = mTotalDurationMs + getCurrentDurationMsLocked(aka method2)
Since now method2 is not zero, we also tweaked the value for
mTotalDurationMs to make method1 return the same value compared with
before.
Since getMaxDurationMsLocked depends on mNesting, which is always zero,
so we don't need to tweak value for mMaxDurationMs
All these methods are covered in BatteryStatsDurationTimerTest
Bug: 64255589
Test: runtest -x BatteryStatsTest
Change-Id: I9168be099d00bb68fedbc5bfbb7bf7f0d9aae85a
2017-08-10 16:44:30 -07: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
c920506d01
Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev am: 57ae4db225
...
am: 9ed2834cba
2017-08-10 15:52:02 +00:00
Narayan Kamath
9ed2834cba
Merge "ClassLoaderFactory: Correct broken refactoring from change 19da1cf72e8." into oc-mr1-dev
...
am: 57ae4db225
2017-08-10 15:41:36 +00: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
Dianne Hackborn
47d8634cb7
Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev am: c75f43c1ab
...
am: a6a33976a3
2017-08-10 04:53:22 +00:00
Dianne Hackborn
a6a33976a3
Merge "Go: add features for low ram / normal ram devices." into oc-mr1-dev
...
am: c75f43c1ab
2017-08-10 04:43:52 +00: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
Makoto Onuki
2eee04d2c2
Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev am: 75590ffa84
...
am: bb4f580494
2017-08-10 01:33:09 +00:00
Makoto Onuki
bb4f580494
Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev
...
am: 75590ffa84
2017-08-10 00:26:35 +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
28cc38c435
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev
...
am: 8cbb5ffd5b
2017-08-09 17:41:48 +00:00
TreeHugger Robot
8cbb5ffd5b
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-dr1-dev
2017-08-09 17:31:48 +00:00
Christofer Åkersten
e4ccad2be6
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-mr1-dev am: 8466b0179e
...
am: 3d210b8776
2017-08-09 17:19:24 +00:00
Christofer Åkersten
3d210b8776
Merge "Inherit theme dark/light scheme for MediaRouter dialogs/button" into oc-mr1-dev
...
am: 8466b0179e
2017-08-09 17:05:28 +00: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
d6a19dce43
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev am: 3108a06656 am: 264fd594ca
...
am: 3c813a7e72
2017-08-09 13:43:00 +00:00
Andrew Sapperstein
3c813a7e72
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev am: 3108a06656
...
am: 264fd594ca
2017-08-09 13:26:20 +00:00
Andrew Sapperstein
264fd594ca
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
...
am: 3108a06656
2017-08-09 13:06:21 +00:00
Jason Monk
2cd102b318
Merge "resolve merge conflicts of de0c539dd4 to oc-mr1-dev" into oc-mr1-dev am: 45144930b2
...
am: 9c6fb7d931
2017-08-09 12:40:40 +00:00
Jason Monk
9c6fb7d931
Merge "resolve merge conflicts of de0c539dd4 to oc-mr1-dev" into oc-mr1-dev
...
am: 45144930b2
2017-08-09 12:29:41 +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
e6dc7af279
Merge "FRP: Fix crash after lockout" into oc-mr1-dev am: c2ca590e8e
...
am: 826ec83acb
2017-08-09 10:16:53 +00:00
Adrian Roos
826ec83acb
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
...
am: c2ca590e8e
2017-08-09 10:05:49 +00:00
Adrian Roos
c2ca590e8e
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
2017-08-09 09:54:22 +00:00
