Hugo Benichi
aef8a96dcd
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8 am: 1ada5660ce
...
am: d79f39689e
Change-Id: I147be11313f6d327116feb1b6807b1bd6aaba4f8
2017-08-16 18:43:48 +00:00
Hugo Benichi
d79f39689e
Merge "More OWNERS file for core networking team" am: 2827f21740 am: 1da7985327 am: 63fdcd08f8
...
am: 1ada5660ce
Change-Id: I5e1376137cf20127839ac043b02f256c89e7c2cc
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
Change-Id: Ie901f6770c2aa9b95f6ccdd9a78bee8d44a0d041
2017-08-16 12:23:15 +00:00
Hugo Benichi
63fdcd08f8
Merge "More OWNERS file for core networking team" am: 2827f21740
...
am: 1da7985327
Change-Id: Ieb04d616adf0969d2f4f468bf93fdc4b0aac75c5
2017-08-16 12:10:19 +00:00
Hugo Benichi
1da7985327
Merge "More OWNERS file for core networking team"
...
am: 2827f21740
Change-Id: Icae3bc4dbb2cd094c728d98aea02d4009aaa0e0b
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
Lei Yu
ebd39077b5
Merge "Write currentDuration into Parcel" into oc-mr1-dev am: bd6ff3d3e5
...
am: 240a70f1e5
Change-Id: If1adf2162182fa178d6ea01989a57e96a9411ebe
2017-08-14 22:54:36 +00:00
Lei Yu
240a70f1e5
Merge "Write currentDuration into Parcel" into oc-mr1-dev
...
am: bd6ff3d3e5
Change-Id: Ibaf3f44a9449a4f92abf3359fba8329f1cbca245
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
Change-Id: Ifedc47b10e7542a0f28bbee1ac00490513cc0e5f
2017-08-14 21:25:01 +00:00
Fyodor Kupolov
34cac26ea4
Merge "Log timings for shutdown stages" into oc-mr1-dev
...
am: fe97799d5d
Change-Id: Iee66b180ecec69872ac2e96bb943e9d02afc33df
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
Change-Id: I80f8971b0f0f55ce91a0e1a3d574ae4a577f9257
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
Change-Id: Idb3ce60318983a926c615cd0fdca3b700da3902c
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
Change-Id: I852a6b01c196240571aed51342fc5e2310c080d6
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
Change-Id: I0086f082e8d7b74f64dc9e762048e4f0e9579812
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
Change-Id: Icf9405de74c4d137b9c8cd0981846a08862ef231
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
Change-Id: I204695ecd43fe86eb6837098556aa1e7c0db354f
2017-08-10 01:33:09 +00:00
Makoto Onuki
bb4f580494
Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev
...
am: 75590ffa84
Change-Id: Id0037c455e0e37f7896d06aeedda9b7cdca35f63
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
Change-Id: I4572f4f221c6b50cf41ddb094cf7bb9d2d48bfbd
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
Change-Id: I15bf74665d4415f42cb47b7d1943060c16c65622
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
Change-Id: I20d05a76666eeb9e8a720f41f71da120feb6fb46
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
Change-Id: Id92ea087d269ad7af8655999f14dc44037cefa50
2017-08-09 13:43:00 +00:00
Andrew Sapperstein
3c813a7e72
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev am: 3108a06656
...
am: 264fd594ca
Change-Id: I8fd65434b9b5118f6060e7e12029fe3eaae370f2
2017-08-09 13:26:20 +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
2cd102b318
Merge "resolve merge conflicts of de0c539dd4 to oc-mr1-dev" into oc-mr1-dev am: 45144930b2
...
am: 9c6fb7d931
Change-Id: If03f343ac2f10f63db7cae1b848d9790b6b6d8cb
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
Change-Id: Idb6ca3b703653a3f7d6e07b54789cb67a3ab910a
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
Change-Id: Iaaf84fab3bfa742c448b7e36b4dfe577b6643d4f
2017-08-09 10:16:53 +00:00
Adrian Roos
826ec83acb
Merge "FRP: Fix crash after lockout" into oc-mr1-dev
...
am: c2ca590e8e
Change-Id: I9191e85e58094d0326bf3b36c290e8b92e23dbd2
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
Christofer Åkersten
fb09ecfdd7
Inherit theme dark/light scheme for MediaRouter dialogs/button
...
Bug: 64291950
Test: manual
Change-Id: I20694ce512a794a3c6574108b80dcfb4979b3b39
Merged-In: I20694ce512a794a3c6574108b80dcfb4979b3b39
2017-08-09 16:28:50 +09: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
6b24b4c58f
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev am: bd9884a331
...
am: 9107e37ca7
Change-Id: Iabf557628b76c788cce85a33ef4d7d84764e796a
2017-08-09 06:02:38 +00:00
Sudheer Shanka
9107e37ca7
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
...
am: bd9884a331
Change-Id: I0ce73c459ff188dd3ace6480fa02d2e6aaab85f2
2017-08-09 05:51:02 +00:00
Sudheer Shanka
bd9884a331
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
2017-08-09 05:38:18 +00:00
Andrew Sapperstein
3a7771064a
Merge "Make accessibilityInversionEnabled public" into oc-dr1-dev
...
am: 3108a06656
Change-Id: I13fa736dbb5d468381ea32e75c7a69f18edd546b
2017-08-09 00:19:56 +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