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
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
2017-08-09 06:02:38 +00:00
Sudheer Shanka
9107e37ca7
Merge "Change logging format in KernelUidCpuFreqTimeReader." into oc-mr1-dev
...
am: bd9884a331
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
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
Adrian Roos
4c3ec15c18
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev am: 956491b867
...
am: eb83d9c0cc
2017-08-08 12:07:55 +00:00
Adrian Roos
eb83d9c0cc
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
...
am: 956491b867
2017-08-08 12:02:27 +00: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
Bookatz
bb41329717
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev am: 26e02181a0
...
am: 8344812329
2017-08-08 06:17:04 +00:00
Bookatz
8344812329
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
...
am: 26e02181a0
2017-08-08 06:11:30 +00: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
b60349a5e1
Merge "Track per-cluster times of each uid in microsec." into oc-mr1-dev
...
am: e913d8235c
2017-08-07 23:43:22 +00:00
Adam Bookatz
ce58090c00
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev am: 0a1ae1bc56
...
am: e4fa69b956
2017-08-07 23:42:05 +00:00
Adam Bookatz
e4fa69b956
Merge "Package wakeup alarms are now on screen-off timebase" into oc-mr1-dev
...
am: 0a1ae1bc56
2017-08-07 23:33:44 +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
Colin Cross
205ba7160b
Merge "Use class retention for VisibleForTesting annotations" am: 5724841581 am: 94d5456d0e am: a5538805d9
...
am: 2130e26bca
2017-08-07 20:15:17 +00:00
Colin Cross
2130e26bca
Merge "Use class retention for VisibleForTesting annotations" am: 5724841581 am: 94d5456d0e
...
am: a5538805d9
2017-08-07 19:56:23 +00:00
Colin Cross
a5538805d9
Merge "Use class retention for VisibleForTesting annotations" am: 5724841581
...
am: 94d5456d0e
2017-08-07 19:44:57 +00:00
Colin Cross
94d5456d0e
Merge "Use class retention for VisibleForTesting annotations"
...
am: 5724841581
2017-08-07 19:32:21 +00:00
Colin Cross
5be3cbad27
Use class retention for VisibleForTesting annotations
...
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests. The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation. When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.
Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.
Bug: 64365384
Test: m -j MtpDocumentsProvider &&
javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot
Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
Merged-In: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
(cherry picked from commit 8e846143dd
2017-08-07 11:07:15 -07:00
Colin Cross
d212dde36a
Merge "Use class retention for VisibleForTesting annotations"
2017-08-07 17:55:23 +00:00
Adrian Roos
8370e472cd
FRP: Enable credential-based factory reset protection by default
...
Bug: 64436700
2017-08-07 16:16:00 +00:00
Jeff Sharkey
1fb3a312e7
Merge "Fix broken javadocs." into oc-mr1-dev am: b79eb54d36
...
am: 1ad38fe278
2017-08-06 17:00:09 +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
Colin Cross
8e846143dd
Use class retention for VisibleForTesting annotations
...
The VisibleForTesting annotations are used by proguard to prevent
stripping code that is needed at runtime for tests. The annotations
were marked with source retention, which worked fine with Jack's
proguard implementation. When we switched back to javac + proguard,
the VisibleForTesting annotations are gone by the time proguard
sees the classes, so the annotated classes and methods can still
be stripped.
Move the VisibleForTesting annotation to class retention, which
matches guava's equivalent annotation.
Bug: 64365384
Test: m -j MtpDocumentsProvider &&
javap -cp out/target/common/obj/APPS/MtpDocumentsProvider_intermediates/classes-proguard.jar com.android.mtp.MtpRoot
Change-Id: I63a467c2f0a21383eb9e4c9563fd6de2d994a373
2017-08-04 16:43:42 -07: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
d76830053d
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069 am: 26f8f5c868
...
am: 7d00772ceb
2017-08-03 23:40:10 +00:00
Christopher Tate
1fb409cbf5
Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev am: 4204f1658c
...
am: 454f1466b7
2017-08-03 23:30:09 +00:00
Amith Yamasani
7d00772ceb
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069
...
am: 26f8f5c868
2017-08-03 23:29:23 +00:00
Amith Yamasani
26f8f5c868
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
...
am: 5a800cf069
2017-08-03 23:18:32 +00:00
Amith Yamasani
6aaaa2bbb0
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
...
am: 5a800cf069
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
