OSDN Git Service
Sarah Edris [Mon, 19 Mar 2018 17:05:51 +0000 (17:05 +0000)]
Merge "Whitelist FullBackupDataOutput" into pi-dev
am:
ff964696a1
Change-Id: I3145ae862985713a2db4f8d966f3791c98a7cd88
Salvador Martinez [Mon, 19 Mar 2018 16:52:50 +0000 (16:52 +0000)]
Merge "Softens one of the battery strings per UI request" into pi-dev
am:
a822d42415
Change-Id: I4c06a0be211a09650ccf78787f295b2c3602fa8e
Sarah Edris [Mon, 19 Mar 2018 16:42:39 +0000 (16:42 +0000)]
Merge "Whitelist FullBackupDataOutput" into pi-dev
Bookatz [Mon, 19 Mar 2018 16:39:14 +0000 (16:39 +0000)]
Merge "StatsManager log lines should be in logcat" into pi-dev
am:
781533dc32
Change-Id: I9b79b21a8588d4dd927a6d16bd2fb437aa69c720
TreeHugger Robot [Mon, 19 Mar 2018 16:27:41 +0000 (16:27 +0000)]
Merge "Softens one of the battery strings per UI request" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 16:18:53 +0000 (16:18 +0000)]
Merge "StatsManager log lines should be in logcat" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 15:51:32 +0000 (15:51 +0000)]
Merge "Insert correct app transition events for recents anim" into pi-dev
am:
f8cb545afb
Change-Id: I573a25113afd6666c95ceedefb33e7c994624e0d
Jorim Jaggi [Mon, 19 Mar 2018 15:36:05 +0000 (15:36 +0000)]
Merge "Insert correct app transition events for recents anim" into pi-dev
Makoto Onuki [Mon, 19 Mar 2018 15:24:17 +0000 (15:24 +0000)]
Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev
am:
6b71daa0c2
Change-Id: Ie14b1bdf696ed3b67867f08d5f10800d2330eddf
Makoto Onuki [Mon, 19 Mar 2018 15:12:36 +0000 (15:12 +0000)]
Merge "Fix SyncResutl.delayUntil javadoc" into pi-dev
Jorim Jaggi [Thu, 15 Mar 2018 14:51:32 +0000 (15:51 +0100)]
Insert correct app transition events for recents anim
The transition delay will be the latency until all the leashes
were created etc. Thus, the actual latency is going to be in
WINDOWS_DRAWN_DELAY.
Also fix an issue where we inadvertently started a transition,
and then the transition logger was hanging.
Bug:
72967764
Test: Swipe up from home button, observe eventlog
Change-Id: I2b1fb7d9d694a629a33653c1fa3d5ed47f53de6b
David Zeuthen [Mon, 19 Mar 2018 14:39:03 +0000 (14:39 +0000)]
Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
am:
b57365562d
Change-Id: I5cc4ac36d980a4a0b6c202ddcba4ffb5433cd149
TreeHugger Robot [Mon, 19 Mar 2018 14:27:16 +0000 (14:27 +0000)]
Merge "ConfirmationDialog: Fail if accessibility services are running." into pi-dev
Sarah Edris [Mon, 19 Mar 2018 12:48:28 +0000 (12:48 +0000)]
Whitelist FullBackupDataOutput
Bug:
74424953
Test: N/A
Change-Id: I3b0386fa004352ef32cb03ba2c53a53bd0f6e1f1
Jason Monk [Mon, 19 Mar 2018 14:21:06 +0000 (14:21 +0000)]
Merge "Fix test failure" into pi-dev
am:
dff503b2e4
Change-Id: I1b42d1ce64ca03e9acf2fa3ce698f29bc1adc1a6
TreeHugger Robot [Mon, 19 Mar 2018 14:02:13 +0000 (14:02 +0000)]
Merge "Fix test failure" into pi-dev
David Brazdil [Mon, 19 Mar 2018 13:48:18 +0000 (13:48 +0000)]
Merge "Add more hidden APIs on the light greylist" into pi-dev
am:
1ffa03321a
Change-Id: Ie5d1cf0fb159a59cfe942da53b8ee382ed07b633
Jorim Jaggi [Mon, 19 Mar 2018 13:38:09 +0000 (13:38 +0000)]
Merge "Fix lockscreen notification launch animation" into pi-dev
am:
a1d6bd94fe
Change-Id: I12cbc8fbd9b087d882eebc8a1b2052e6988128c9
David Brazdil [Mon, 19 Mar 2018 13:31:55 +0000 (13:31 +0000)]
Merge "Add more hidden APIs on the light greylist" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 13:23:30 +0000 (13:23 +0000)]
Merge "Fix lockscreen notification launch animation" into pi-dev
Jorim Jaggi [Mon, 19 Mar 2018 13:21:40 +0000 (13:21 +0000)]
Merge "Trace currently resumed app" into pi-dev
am:
782e63d507
Change-Id: Ieee8fabfa9564d52d60cc58f68af986d2e56e43e
Madiyar Aitbayev [Mon, 19 Mar 2018 13:14:53 +0000 (13:14 +0000)]
Merge "Close file descriptors of ProfilerInfo" into pi-dev
am:
de91eef76e
Change-Id: I3d7cbb7423cae868a52fc88e2055eea32831a390
TreeHugger Robot [Mon, 19 Mar 2018 13:06:30 +0000 (13:06 +0000)]
Merge "Trace currently resumed app" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 12:53:21 +0000 (12:53 +0000)]
Merge "Close file descriptors of ProfilerInfo" into pi-dev
Wale Ogunwale [Mon, 19 Mar 2018 12:44:47 +0000 (12:44 +0000)]
Merge "Don't allow focus on activity in minimized split-screen." into pi-dev
am:
5a8deab6c8
Change-Id: I65db000108edf8f20119a8de11fbcaac28cc7efd
Wale Ogunwale [Mon, 19 Mar 2018 12:30:08 +0000 (12:30 +0000)]
Merge "Don't allow focus on activity in minimized split-screen." into pi-dev
Eran Messeri [Mon, 19 Mar 2018 11:38:35 +0000 (11:38 +0000)]
Merge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev
am:
31ac587b43
Change-Id: I8b07132a161275e55204598183c2cecfb7d9234d
TreeHugger Robot [Mon, 19 Mar 2018 11:20:27 +0000 (11:20 +0000)]
Merge "DPM: Fix isActivePasswordSufficient for non-FBE devices" into pi-dev
Jaewan Kim [Mon, 19 Mar 2018 10:59:39 +0000 (10:59 +0000)]
Merge "MediaSession2: Implement fastForward() / rewind()" into pi-dev
am:
d65bb20283
Change-Id: Id01780a8074428de178b49e8c7dbf3000bfdee71
David Brazdil [Fri, 16 Mar 2018 17:24:51 +0000 (17:24 +0000)]
Add more hidden APIs on the light greylist
Uses reported by the public.
Bug:
64382372
Bug:
74524607
Bug:
74271830
Bug:
74498446
Bug:
74272004
Bug:
74322289
Bug:
74278847
Bug:
74175716
Bug:
74131602
Bug:
74357020
Bug:
74265544
Bug:
74130810
Bug:
74537180
Bug:
74496079
Bug:
74600951
Test: make
Change-Id: I884e76101bdd3d6b08a690810a5b4f5e09306980
TreeHugger Robot [Mon, 19 Mar 2018 10:45:03 +0000 (10:45 +0000)]
Merge "MediaSession2: Implement fastForward() / rewind()" into pi-dev
Jaewan Kim [Thu, 15 Mar 2018 11:31:06 +0000 (20:31 +0900)]
MediaSession2: Implement fastForward() / rewind()
Bug:
74724709
Test: Run CTS with MediaComponents/runcts.sh
Change-Id: Ibd313dc6eed82a5d7cc9fc156f7851aba13f9e29
Bookatz [Mon, 19 Mar 2018 06:19:11 +0000 (06:19 +0000)]
Merge "Delete TODO about renumbering statd atoms" into pi-dev
am:
790befca1d
Change-Id: I0d57aa401f5389be5f8c5a0cea617c12cb5f316d
Bookatz [Mon, 19 Mar 2018 06:12:38 +0000 (06:12 +0000)]
Merge changes I3ffb6e97,I689df136,Ia67a8eb6 into pi-dev
am:
ad121b9fdc
Change-Id: I2891370252221fce86e911d7193f22433ed3c6be
TreeHugger Robot [Mon, 19 Mar 2018 05:54:22 +0000 (05:54 +0000)]
Merge "Delete TODO about renumbering statd atoms" into pi-dev
TreeHugger Robot [Mon, 19 Mar 2018 05:49:27 +0000 (05:49 +0000)]
Merge changes I3ffb6e97,I689df136,Ia67a8eb6 into pi-dev
* changes:
Statsd: remove DurationAnomalyTracker.resetStorage
Statsd AnomalyDetection stopAlarm also checks old
Statsd AnomalyDetection improvements
Lucas Dupin [Mon, 19 Mar 2018 05:22:05 +0000 (05:22 +0000)]
Merge "Disable scrim focus on AOD" into pi-dev
am:
0487601e57
Change-Id: I1800a1de9842e52188fe6b40ce5da6f9a96b19ea
TreeHugger Robot [Mon, 19 Mar 2018 05:03:50 +0000 (05:03 +0000)]
Merge "Disable scrim focus on AOD" into pi-dev
Christofer Åkersten [Mon, 19 Mar 2018 04:15:10 +0000 (04:15 +0000)]
Merge "Remove Context requirement from updatable" into pi-dev
am:
ac16fb5d41
Change-Id: I28b4e0afef99e607a8e56528d9249b6db325b1b1
TreeHugger Robot [Mon, 19 Mar 2018 04:02:29 +0000 (04:02 +0000)]
Merge "Remove Context requirement from updatable" into pi-dev
Lucas Dupin [Mon, 19 Mar 2018 03:33:45 +0000 (03:33 +0000)]
Merge changes Ia438f4a2,I356c2d57 into pi-dev
am:
f5d216cc7c
Change-Id: I9d5b266c1ebe8f72fea98516add59a3abe434fbb
Lucas Dupin [Mon, 19 Mar 2018 03:11:51 +0000 (03:11 +0000)]
Merge changes Ia438f4a2,I356c2d57 into pi-dev
* changes:
Bouncer notification and QS scrim
Fix bouncer not showing on top of QS or notif
Andreas Gampe [Mon, 19 Mar 2018 01:32:21 +0000 (01:32 +0000)]
Merge "SystemUI: Temporarily disable test" into pi-dev
am:
28e22c4ae1
Change-Id: I5a8658a5c141133017c776174b893435e8bd6ea3
TreeHugger Robot [Mon, 19 Mar 2018 01:18:22 +0000 (01:18 +0000)]
Merge "SystemUI: Temporarily disable test" into pi-dev
Cory Smith [Sun, 18 Mar 2018 23:19:40 +0000 (23:19 +0000)]
Merge "Writes the resource table proto out when writing a LoadedApk." into pi-dev
am:
449be81065
Change-Id: If6e57967cc36a1c69c709a7aee60730aca967d2e
Cory Smith [Sun, 18 Mar 2018 22:59:27 +0000 (22:59 +0000)]
Merge "Writes the resource table proto out when writing a LoadedApk." into pi-dev
Andreas Gampe [Sun, 18 Mar 2018 22:35:39 +0000 (15:35 -0700)]
SystemUI: Temporarily disable test
Bug:
75329085
Test: none
Exempt-From-Owner-Approval: Let TH pass while investigating
Change-Id: I4c007e5162502f0064b65a89408882e4c348e0db
corysmith@google.com [Tue, 13 Mar 2018 16:04:10 +0000 (12:04 -0400)]
Writes the resource table proto out when writing a LoadedApk.
Small fixes for consistancy to use constants instead of strings.
Change-Id: I33439c376e1634b7957730ce16e241b0f5bb92f8
Fixes:
74594854
Test: Manual, tested against blaze test //javatests/com/google/devtools/build/android:UnitTests
Bookatz [Sat, 17 Mar 2018 00:13:33 +0000 (17:13 -0700)]
StatsManager log lines should be in logcat
Change the Slog.d to Slog.w and enable them, so that we can see them.
They seem to represent important failure events when people call the
public API into StatsManager.
Bug:
74997752
Test: none
Change-Id: I1c577b32358158f73453a8a3066013e0f3733d87
Lucas Dupin [Tue, 13 Mar 2018 21:00:24 +0000 (14:00 -0700)]
Bouncer notification and QS scrim
Show front scrim when the notification panel is expanded,
otherwise pin would be overlayed on top of notifications.
Change-Id: Ia438f4a2794eb9510ec05ad86cc8c19e2e716358
Fixes:
74550013
Test: double tap on notification when locked
Test: tap on QS edit button when locked
Test: unlock by swipping up
Test: fling quickly on keyguard
Michael Kwan [Sat, 17 Mar 2018 22:22:33 +0000 (22:22 +0000)]
Merge "Modify time only mode flag into set of values instead of just one." into pi-dev
am:
c5d0ed9f3c
Change-Id: I4721197b1329a14aa51f1b49a05bdade1fb71ef8
Michael Kwan [Sat, 17 Mar 2018 22:05:38 +0000 (22:05 +0000)]
Merge "Modify time only mode flag into set of values instead of just one." into pi-dev
Bill Yi [Sat, 17 Mar 2018 15:36:11 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9331af7220 -s ours
Change-Id: Ib91e7e1c4c5a066c2191c29ad1f6df7ca7a0f14f
TreeHugger Robot [Sat, 17 Mar 2018 15:22:58 +0000 (15:22 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 14:40:46 +0000 (14:40 +0000)]
Merge "Add placeholder on DND settings screen." into pi-dev
am:
d7f32a1a7f
Change-Id: Ie41b7e7d2a13941512ef1590c013d2e3e4523d83
Julia Reynolds [Sat, 17 Mar 2018 14:28:41 +0000 (14:28 +0000)]
Merge "Add placeholder on DND settings screen." into pi-dev
Christofer Åkersten [Thu, 15 Mar 2018 11:24:39 +0000 (20:24 +0900)]
Remove Context requirement from updatable
Bug:
74843539
Test: runtest-cts-MediaComponents && atest VideoView2Test
Change-Id: Iba5422f8d092205316ec3fa2c10da6d3f983fde6
Bill Yi [Sat, 17 Mar 2018 06:33:48 +0000 (23:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4f0cac1ca19646cb5e45c5d84814883a3c11c1d6
Nathan Harold [Sat, 17 Mar 2018 03:59:36 +0000 (03:59 +0000)]
Merge "Docstring Updates for applyTransportModeTransform" into pi-dev
am:
685288127d -s ours
Change-Id: I98698ebd0a3aa97250274830dadb4c70e41a7e3e
TreeHugger Robot [Sat, 17 Mar 2018 03:44:46 +0000 (03:44 +0000)]
Merge "Docstring Updates for applyTransportModeTransform" into pi-dev
nharold [Sat, 17 Mar 2018 02:16:38 +0000 (02:16 +0000)]
Merge "Docstring Updates for applyTransportModeTransform" am:
00ef20e853
am:
e3a6b678c3
Change-Id: I58ab2b451ef1d0c20efe80d30a679e8870a39a8e
Julia Reynolds [Sat, 17 Mar 2018 02:01:36 +0000 (02:01 +0000)]
Merge "Don't truncate empty text on low density" into pi-dev
am:
731514eb88
Change-Id: I90f1a56e4e976aafa04d6ed8f664ba2468d2f00e
nharold [Sat, 17 Mar 2018 02:00:57 +0000 (02:00 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"
am:
00ef20e853
Change-Id: I2b59ebf0b751f7f404d175ad394a4dfdbf7169ff
Julia Reynolds [Sat, 17 Mar 2018 01:50:45 +0000 (01:50 +0000)]
Merge "Add new semantic Person fields" into pi-dev
am:
6389e7bc44
Change-Id: I316ff063efbe3c36a34e3e9e00a463ae4364c4bd
Julia Reynolds [Sat, 17 Mar 2018 01:36:04 +0000 (01:36 +0000)]
Merge "Don't truncate empty text on low density" into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 01:35:20 +0000 (01:35 +0000)]
Merge "Add new semantic Person fields" into pi-dev
Julia Reynolds [Thu, 15 Mar 2018 13:27:31 +0000 (09:27 -0400)]
Add placeholder on DND settings screen.
Test: make
Bug:
74321426
Change-Id: Ie457b3c994a0d851d835a56a01c28a0acbf102e3
Gopinath Elanchezhian [Sat, 17 Mar 2018 01:07:58 +0000 (01:07 +0000)]
Merge "Add cycle-clean option in AppLaunch" into pi-dev
am:
e588d6145d
Change-Id: Iae1ebd4f544992dbdfccb27b06bd5ff66c8b4be5
Gopinath Elanchezhian [Sat, 17 Mar 2018 00:55:05 +0000 (00:55 +0000)]
Merge "Add cycle-clean option in AppLaunch" into pi-dev
Nathan Harold [Tue, 6 Mar 2018 21:22:22 +0000 (13:22 -0800)]
Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.
Bug:
73751066
Test: make docs
Merged-In: I9f2ec864466148a18899f1e952c74a525902ccbc
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
(cherry picked from commit
f4cdf25a906d0f52ffd76508d660b843b13b3ff8)
Chad Brubaker [Sat, 17 Mar 2018 00:39:12 +0000 (00:39 +0000)]
Merge "Hide notifications when in Lockdown mode" into pi-dev
am:
36b0b60e40
Change-Id: I693e95915f60638ae769433e778c2b11bb11e82e
nharold [Sat, 17 Mar 2018 00:33:10 +0000 (00:33 +0000)]
Merge "Docstring Updates for applyTransportModeTransform"
Nathan Harold [Tue, 6 Mar 2018 21:22:22 +0000 (13:22 -0800)]
Docstring Updates for applyTransportModeTransform
-Add anotations to usages of PolicyDirection for
apply...() methods.
-Update the comments on DIRECTION_IN and DIRECTION_OUT
to better reflect their current usage.
-Add a better explanation to the rekey procedure doc.
-Remove disused createTunnelInterface() stub.
Bug:
73751066
Test: make docs
Change-Id: I9f2ec864466148a18899f1e952c74a525902ccbc
Wale Ogunwale [Sat, 17 Mar 2018 00:26:02 +0000 (00:26 +0000)]
Merge "Add null check to RecentTasks.java" into pi-dev
am:
ad5d8175da
Change-Id: I6da61f3b5b33a38f03ebe15ee6c7b3d5f3c983b0
Jeff Davidson [Sat, 17 Mar 2018 00:19:14 +0000 (00:19 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners." into pi-dev
am:
03c07f859d -s ours
Change-Id: Iaf3f401f46a8c1be27662bba0581f2bad154118d
Chad Brubaker [Sat, 17 Mar 2018 00:16:34 +0000 (00:16 +0000)]
Merge "Hide notifications when in Lockdown mode" into pi-dev
Jeff Davidson [Sat, 17 Mar 2018 00:13:02 +0000 (00:13 +0000)]
Allow carrier-privileged apps to register telephony listeners.
am:
29da89ffbf -s ours
Change-Id: Ida390a6230eedec75b179538f777aa84bfc9f485
Bill Yi [Fri, 16 Mar 2018 23:56:42 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
bc14009d66 -s ours
Change-Id: Ia68e6c8d36fa6831912b7d8a8685c8e5bf50d79b
Wale Ogunwale [Fri, 16 Mar 2018 23:53:29 +0000 (23:53 +0000)]
Merge "Add null check to RecentTasks.java" into pi-dev
Jeff Davidson [Fri, 16 Mar 2018 23:48:51 +0000 (23:48 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners." into pi-dev
Jeff Davidson [Fri, 16 Mar 2018 23:48:29 +0000 (23:48 +0000)]
Merge "Allow carrier-privileged apps to register telephony listeners." into pi-dev-plus-aosp
Android Build Merger (Role) [Fri, 16 Mar 2018 23:46:52 +0000 (23:46 +0000)]
Merge "Merge "Renamed getNetworkId and getSystemId" am:
5b7103ab97 am:
be8199d177 -s ours" into pi-dev-plus-aosp
Jack Yu [Fri, 16 Mar 2018 23:45:12 +0000 (23:45 +0000)]
Merge "Renamed getNetworkId and getSystemId" am:
5b7103ab97
am:
be8199d177 -s ours
Change-Id: Ib9c5a52dce4bf546de0fac0c79595773fd3f09d9
Robert Berry [Fri, 16 Mar 2018 23:42:48 +0000 (23:42 +0000)]
Merge "Create snapshot even if no PendingIntent is registered" into pi-dev
am:
6b73b2317f
Change-Id: I910b3b42d7a7e1419fac28ee246e31e2a748e8ee
Bill Yi [Fri, 16 Mar 2018 23:33:43 +0000 (23:33 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9531b70cae -s ours
Change-Id: I89c25d4ebd8375c02bc9ebb2a16a0c372f236246
TreeHugger Robot [Fri, 16 Mar 2018 23:30:49 +0000 (23:30 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Robert Berry [Fri, 16 Mar 2018 23:13:53 +0000 (23:13 +0000)]
Merge "Create snapshot even if no PendingIntent is registered" into pi-dev
Amith Yamasani [Fri, 16 Mar 2018 23:08:42 +0000 (23:08 +0000)]
Merge "App Time Limits API in UsageStats" into pi-dev
am:
a8bb9d255f
Change-Id: I77b6656d38701b76444c64be1d75c7b86e70e3bb
Jack Yu [Fri, 16 Mar 2018 23:07:24 +0000 (23:07 +0000)]
Merge "Renamed getNetworkId and getSystemId"
am:
5b7103ab97
Change-Id: Ica71497d03bf2752cac6a4af7bc9890a0bb3596f
TreeHugger Robot [Fri, 16 Mar 2018 22:59:32 +0000 (22:59 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Aseem Kumar [Fri, 16 Mar 2018 22:51:56 +0000 (22:51 +0000)]
Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev
am:
3b0450d4a9
Change-Id: I650b80562b8e19d5264ec897f30145b5b393e77b
Bookatz [Fri, 16 Mar 2018 22:47:57 +0000 (15:47 -0700)]
Delete TODO about renumbering statd atoms
Test: none
Bug:
72553942
Change-Id: If59ee407dffaed713a3a2f7543314aef3e70ef2c
TreeHugger Robot [Fri, 16 Mar 2018 22:40:46 +0000 (22:40 +0000)]
Merge "App Time Limits API in UsageStats" into pi-dev
Aseem Kumar [Fri, 16 Mar 2018 22:27:37 +0000 (22:27 +0000)]
Merge "Unhide getKey() and importKey() and the whole class of RecoveryController. Added @RequiresPermission(android.permission.RECOVER_KEYSTORE) on all public APIs of RecoveryController." into pi-dev
Bookatz [Fri, 16 Mar 2018 22:25:49 +0000 (15:25 -0700)]
Statsd: remove DurationAnomalyTracker.resetStorage
The explicit resetStorage function in the subclass isn't needed.
It does exactly what its superclass does.
The previous check for !mAlarms.empty() was actually not needed, since
there can be legit cases where !mAlarms.empty() (namely, when the
mMostRecentBucket is moved forward initially - we may call reset, but we
still want the old alarms to remain).
Test: still pass
Change-Id: I3ffb6e97c02b75170c246f57d55ccf59cd368b9c
Fixes:
74607818
Salvador Martinez [Fri, 16 Mar 2018 22:15:30 +0000 (15:15 -0700)]
Softens one of the battery strings per UI request
Bug:
74448640
Test: robotests updated
Change-Id: I25a18dcad343fd0eeeeac504570eea7a1a325a1a
Makoto Onuki [Fri, 16 Mar 2018 22:15:30 +0000 (22:15 +0000)]
Merge "Also show "last BS off time" in dumpsys power" into pi-dev
am:
6344ffd4c9
Change-Id: I66ab8df4dfee72a131f46d5396c0b720de36e566
Julia Reynolds [Fri, 16 Mar 2018 22:04:32 +0000 (22:04 +0000)]
metrics constant for volume gesture.
am:
b998c8eee2
Change-Id: I3bf0690ea3648ca065de1b28aef109938c1b9e3f
Jack Yu [Fri, 16 Mar 2018 21:50:19 +0000 (21:50 +0000)]
Merge "Renamed getNetworkId and getSystemId"
Makoto Onuki [Fri, 16 Mar 2018 21:48:20 +0000 (21:48 +0000)]
Merge "Also show "last BS off time" in dumpsys power" into pi-dev