OSDN Git Service
Kevin Han [Thu, 5 Apr 2018 19:49:25 +0000 (12:49 -0700)]
Merge "Turn off notification in-line images for low ram devices" into pi-dev
am:
c7b4c2dc16
Change-Id: Ib4e9e819ef28a1dccac275e663da7c448b62dc01
Kevin Han [Thu, 5 Apr 2018 19:33:55 +0000 (19:33 +0000)]
Merge "Turn off notification in-line images for low ram devices" into pi-dev
Rob Carr [Thu, 5 Apr 2018 19:31:07 +0000 (12:31 -0700)]
Merge "Forward Activity stop signal to attached windows." into pi-dev
am:
d1366f604a
Change-Id: I6862c29dcda7a0a16eeafb60688e3176a34aba8b
David Zeuthen [Thu, 5 Apr 2018 19:24:24 +0000 (12:24 -0700)]
Merge "ConfirmationPrompt: Update for API review." into pi-dev
am:
ae938f5437
Change-Id: I62cec3ebc437a131761a9d7109df911a1cf1e24c
Yi Jin [Thu, 5 Apr 2018 19:10:55 +0000 (12:10 -0700)]
Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev
am:
72a39eb3be
Change-Id: Ia9e3f94b367dffc6482f5f3ba12aeaba2eed6874
Richard Ledley [Thu, 5 Apr 2018 19:05:50 +0000 (12:05 -0700)]
Merge "Add null check for Nullable argument." into pi-dev
am:
335b0d36da
Change-Id: I610900225de4a9da865599284d083bfcdf726966
Rob Carr [Thu, 5 Apr 2018 19:03:29 +0000 (19:03 +0000)]
Merge "Forward Activity stop signal to attached windows." into pi-dev
Matthew Ng [Thu, 5 Apr 2018 19:02:32 +0000 (12:02 -0700)]
Merge "Remove haptics on navbar and only have button haptics on touch up" into pi-dev
am:
fa5134e960
Change-Id: I40106ae4631882bdf09f1d5bba522eb2cb5c6e41
TreeHugger Robot [Thu, 5 Apr 2018 18:50:35 +0000 (18:50 +0000)]
Merge "ConfirmationPrompt: Update for API review." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 18:48:59 +0000 (18:48 +0000)]
Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev
Richard Ledley [Thu, 5 Apr 2018 18:45:45 +0000 (18:45 +0000)]
Merge "Add null check for Nullable argument." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 18:42:33 +0000 (18:42 +0000)]
Merge "Remove haptics on navbar and only have button haptics on touch up" into pi-dev
Hall Liu [Thu, 5 Apr 2018 18:36:10 +0000 (11:36 -0700)]
Merge "Move RTT system setting to Settings.Secure" into pi-dev
am:
fe85e4589b
Change-Id: Idd9171f313136911e2dc6031f6356463e51bf16f
Yangster-mac [Thu, 5 Apr 2018 18:22:16 +0000 (11:22 -0700)]
Merge "Retry logs write when it fails. Report skipped event in statsd." into pi-dev
am:
164a73e0cf
Change-Id: I6aac360fe74bb5ca3e3b95dc3f2685a99da0fe2a
Daniel Cardenas [Thu, 5 Apr 2018 18:18:24 +0000 (11:18 -0700)]
Merge "Reduce log spam in TimeSparseArray" into pi-dev
am:
bd2e790946
Change-Id: Iffacb38ca50741f78c3d49aa5ace6416eb7280ab
Hall Liu [Thu, 5 Apr 2018 18:15:37 +0000 (18:15 +0000)]
Merge "Move RTT system setting to Settings.Secure" into pi-dev
Tej Singh [Thu, 5 Apr 2018 18:11:36 +0000 (11:11 -0700)]
Merge "BugFix: Config TTL" into pi-dev
am:
b6d4401da1
Change-Id: I2871fdef3e659e9edf6a97052cb34b5831aebc34
TreeHugger Robot [Thu, 5 Apr 2018 18:04:18 +0000 (18:04 +0000)]
Merge "Retry logs write when it fails. Report skipped event in statsd." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 18:01:52 +0000 (18:01 +0000)]
Merge "Reduce log spam in TimeSparseArray" into pi-dev
Nicolas Geoffray [Thu, 5 Apr 2018 18:00:37 +0000 (11:00 -0700)]
Merge "Add new hidden APIs." into pi-dev
am:
0c2b3185b2
Change-Id: Ic0d86e7fe25961d7779e71d0eeb15e8f590b37b4
TreeHugger Robot [Thu, 5 Apr 2018 17:56:53 +0000 (17:56 +0000)]
Merge "BugFix: Config TTL" into pi-dev
Tracy Zhou [Thu, 5 Apr 2018 17:51:23 +0000 (10:51 -0700)]
Merge "Only move PIP window if PIP is not way above shelf/IME." into pi-dev
am:
0c97d0899e
Change-Id: I32ca69f9ad41c756b774a62d9afdcbc8edb19316
Lucas Dupin [Thu, 5 Apr 2018 17:43:19 +0000 (10:43 -0700)]
Merge "Misc bouncer fixes" into pi-dev
am:
7362e18a7b
Change-Id: I55a93fdc097ffe977b194ef7c7620bca0070b194
TreeHugger Robot [Thu, 5 Apr 2018 17:37:21 +0000 (17:37 +0000)]
Merge "Add new hidden APIs." into pi-dev
Patrick Baumann [Thu, 5 Apr 2018 17:31:59 +0000 (10:31 -0700)]
Merge "Fixes non-web AIA internal launch" into pi-dev
am:
cb331c32db
Change-Id: I6a4b7e4cde4fd157ab1101e5c2f254d7652416fb
Jan Althaus [Thu, 5 Apr 2018 17:24:34 +0000 (10:24 -0700)]
Merge "Makes TCS methods non-abstract" into pi-dev
am:
37317e1668
Change-Id: I874abc508d95176f7e58535e217bcbed42655570
TreeHugger Robot [Thu, 5 Apr 2018 17:24:26 +0000 (17:24 +0000)]
Merge "Only move PIP window if PIP is not way above shelf/IME." into pi-dev
Lucas Dupin [Thu, 5 Apr 2018 17:21:26 +0000 (17:21 +0000)]
Merge "Misc bouncer fixes" into pi-dev
Kevin [Thu, 5 Apr 2018 17:17:45 +0000 (10:17 -0700)]
Turn off notification in-line images for low ram devices
Bug:
77598694
Change-Id: Icdd4c2ef790d2d657f7670fa8c1b8b39b7aa62e4
Fix:
77598694
Test: manual, tested notification on gobo and sailfish
TreeHugger Robot [Thu, 5 Apr 2018 17:07:14 +0000 (17:07 +0000)]
Merge "Fixes non-web AIA internal launch" into pi-dev
Dongwon Kang [Thu, 5 Apr 2018 17:06:42 +0000 (10:06 -0700)]
Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev
am:
b9c661f79f
Change-Id: I421a35ec4ac0b695c6807250e1ced6c91d451d67
Jan Althaus [Thu, 5 Apr 2018 16:53:17 +0000 (16:53 +0000)]
Merge "Makes TCS methods non-abstract" into pi-dev
Patrick Baumann [Thu, 5 Apr 2018 16:50:27 +0000 (09:50 -0700)]
Merge "Copy ApplicationInfo#versionCode field" into pi-dev
am:
a4d6570b2f
Change-Id: Ie5cfe94ea18642c1bd5f4b7e3c92524407b85815
Pavel Grafov [Thu, 5 Apr 2018 16:38:50 +0000 (09:38 -0700)]
Merge "Show work notifications in the shade unless on keyguard." into pi-dev
am:
b175d0db8f
Change-Id: I4840f60d8b9f98dee3f02ed88fbfc6e47c64dad1
Rohan Shah [Thu, 5 Apr 2018 16:34:12 +0000 (09:34 -0700)]
Merge "[QS] Update landscape UI" into pi-dev
am:
044a5e17da
Change-Id: I49ab03325cdb483ee5372df4ee8042dc225df850
Dongwon Kang [Thu, 5 Apr 2018 16:33:39 +0000 (16:33 +0000)]
Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev
Richard Ledley [Thu, 5 Apr 2018 12:39:43 +0000 (13:39 +0100)]
Add null check for Nullable argument.
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest FrameworksCoreTests:android.view.textclassifier.TextLinksTest
Bug:
77624093
Change-Id: I527c4e7f6758c699d4d4e7258cf8474f833040c7
Nicolas Geoffray [Thu, 5 Apr 2018 16:29:42 +0000 (17:29 +0100)]
Add new hidden APIs.
bug:
77527994
Test: m
Change-Id: Iebdab9d09c4d4531cfdfed6c3e363d68ed407ef1
Dan Gittik [Thu, 5 Apr 2018 16:27:10 +0000 (09:27 -0700)]
Merge "Added adb commands to set and reset brightness." into pi-dev
am:
0048eb210d
Change-Id: If2b04965975d6bbf8126f525d45ae0482dc33375
TreeHugger Robot [Thu, 5 Apr 2018 16:20:25 +0000 (16:20 +0000)]
Merge "Copy ApplicationInfo#versionCode field" into pi-dev
Milo Sredkov [Thu, 5 Apr 2018 16:20:00 +0000 (09:20 -0700)]
Merge "Require screen to be unlocked for smart replies" into pi-dev
am:
312a176a0b
Change-Id: I11d4eb66d036edb263717d21a3d4dde4047bb54b
Tracy Zhou [Thu, 5 Apr 2018 06:45:26 +0000 (23:45 -0700)]
Only move PIP window if PIP is not way above shelf/IME.
Change-Id: I650a94f40cd1ab0fbc40a2aaccce9d019ff0d6f1
Fixes:
77526420
Test: manual test
TreeHugger Robot [Thu, 5 Apr 2018 15:30:54 +0000 (15:30 +0000)]
Merge "Show work notifications in the shade unless on keyguard." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 15:29:27 +0000 (15:29 +0000)]
Merge "[QS] Update landscape UI" into pi-dev
Jan Althaus [Wed, 4 Apr 2018 11:56:40 +0000 (13:56 +0200)]
Makes TCS methods non-abstract
This only affects System API
Bug:
77563695
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsViewTestCases:android.view.textclassifier.cts.TextClassificationManagerTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextSelectionTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextLinksTestBug:
Change-Id: Ie927ffe3a4678b7a622c139a5431b89e8f22c6e4
Narayan Kamath [Thu, 5 Apr 2018 14:43:51 +0000 (15:43 +0100)]
resolve merge conflicts of
c8f5480981f987cb40989f387deeea360670f018 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I0aa2671c54b0af4a6104e52aea0b5474922042fe
TreeHugger Robot [Thu, 5 Apr 2018 14:43:32 +0000 (14:43 +0000)]
Merge "Added adb commands to set and reset brightness." into pi-dev
Milo Sredkov [Thu, 5 Apr 2018 14:07:52 +0000 (14:07 +0000)]
Merge "Require screen to be unlocked for smart replies" into pi-dev
Leon Scroggins [Thu, 5 Apr 2018 13:45:25 +0000 (06:45 -0700)]
Merge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev
am:
d9cb59629d
Change-Id: If2d4f604923ad74953733bb993420598c58e1e4b
TreeHugger Robot [Thu, 5 Apr 2018 13:41:17 +0000 (13:41 +0000)]
Merge "StrictMode: Add support for warning on non SDK API usage." into pi-dev
Leon Scroggins [Thu, 5 Apr 2018 13:29:38 +0000 (13:29 +0000)]
Merge "Add docs for setTargetSize and setTargetSampleSize" into pi-dev
Milo Sredkov [Wed, 4 Apr 2018 15:13:28 +0000 (16:13 +0100)]
Require screen to be unlocked for smart replies
Currently tapping on a smart reply works even when the screen is
locked. To make it consistent with inline replies, require the screen
to be unlocked before sending the reply.
Bug:
76217177
Test: atest SmartReplyViewTest
Change-Id: I3af8a0411537503650fb9f83cd99f65900e700e0
Dan Gittik [Wed, 28 Mar 2018 11:19:38 +0000 (12:19 +0100)]
Added adb commands to set and reset brightness.
adb shell cmd display set-brightness BRIGHTNESS command sets the
screen brightness programatically.
adb shell cmd display reset-brightness resets the brightness
configuration to the default configuration.
Test: run "adb shell cmd display set-brightness <number>" and watch
the magic happen.
Test: run "adb shell cmd jobscheduler run -f
com.google.android.apps.turbo 104" to push a new configuration,
then run "adb shell cmd display reset-brightness-configuration"
to reset it. If it's not noticable enough, you can manually
edit /data/system/display-manager-state.xml: for example, set
nits="0.0" for all the <brightness-point />s in the
<brightness-curve /> to make it as dark as posible.
Fixes:
77574628
Change-Id: I37e19c1e662370e60c9f616a3710780f16418620
Bernardo Rufino [Thu, 5 Apr 2018 11:38:46 +0000 (04:38 -0700)]
Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev
am:
c83cf90166
Change-Id: I0fbb92d38a7e711e01dc9c0860e16ef4e102ce6e
TreeHugger Robot [Thu, 5 Apr 2018 11:26:25 +0000 (11:26 +0000)]
Merge "Catch IAE from unbind onServiceDisconnected()" into pi-dev
Mathew Inwood [Thu, 5 Apr 2018 10:53:55 +0000 (03:53 -0700)]
Merge "Exempt platform-cert signed apps from hidden API checks." into pi-dev
am:
0e650c1c55
Change-Id: I79b6b7643f71928c65943744aa62b8a77d2749d1
Mathew Inwood [Thu, 5 Apr 2018 10:43:12 +0000 (10:43 +0000)]
Merge "Exempt platform-cert signed apps from hidden API checks." into pi-dev
Jaewan Kim [Thu, 5 Apr 2018 10:16:05 +0000 (03:16 -0700)]
Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev
am:
8a585a6f1f
Change-Id: I87994559dedfd8049f4de72131ed5653bfa631ef
Bernardo Rufino [Thu, 5 Apr 2018 10:03:39 +0000 (11:03 +0100)]
Catch IAE from unbind onServiceDisconnected()
We still don't know the underlying cause of this, but we shouldn't crash
the system_server. Catching for now.
Bug:
74940472
Bug:
77574274
Test: m -j RunFrameworksServicesRoboTests
Change-Id: I36fc2e65f8766f6b8fd68104d8830b72668d84eb
TreeHugger Robot [Thu, 5 Apr 2018 10:03:22 +0000 (10:03 +0000)]
Merge "MediaController: Fix annotation of Callback#onPlaybackStateChanged()" into pi-dev
Rubin Xu [Thu, 5 Apr 2018 09:54:53 +0000 (02:54 -0700)]
Merge "Device ID attestation: Add feature flag." into pi-dev
am:
73961397e5
Change-Id: I4488f26e579639a82ee9759e1202ec29add77245
Rubin Xu [Thu, 5 Apr 2018 09:38:28 +0000 (09:38 +0000)]
Merge "Device ID attestation: Add feature flag." into pi-dev
Makoto Onuki [Thu, 5 Apr 2018 07:39:07 +0000 (00:39 -0700)]
Merge "Don't call into phone process with lock held." into pi-dev
am:
4d289593f2
Change-Id: I66ba86186b67a18ddbfb7022a83c6fc979f080da
TreeHugger Robot [Thu, 5 Apr 2018 07:27:33 +0000 (07:27 +0000)]
Merge "Don't call into phone process with lock held." into pi-dev
Richard Ledley [Thu, 5 Apr 2018 05:58:17 +0000 (22:58 -0700)]
Merge "Use Collection instead of List for entity list" into pi-dev
am:
7b7e87eeb5
Change-Id: Ifac9afa0240c95134021a04bfb358f610a1cf073
Richard Ledley [Thu, 5 Apr 2018 05:46:53 +0000 (05:46 +0000)]
Merge "Use Collection instead of List for entity list" into pi-dev
Jaewan Kim [Thu, 5 Apr 2018 05:42:12 +0000 (22:42 -0700)]
Merge "MediaSessionManager: Apply API council review" into pi-dev
am:
628f59aa45
Change-Id: Ia9b5171cd720f87842bbc95ab318d199ffa35e8f
TreeHugger Robot [Thu, 5 Apr 2018 05:25:15 +0000 (05:25 +0000)]
Merge "MediaSessionManager: Apply API council review" into pi-dev
Jakub Pawlowski [Thu, 5 Apr 2018 05:10:12 +0000 (22:10 -0700)]
Persist volume level on reconnections for Hearing Aid
am:
c274fb2d22
Change-Id: Ie41328cc89e3deb81dbafd453093cfe6be18c5cd
Jakub Pawlowski [Wed, 4 Apr 2018 17:15:12 +0000 (10:15 -0700)]
Persist volume level on reconnections for Hearing Aid
Devices in mFullVolumeDevices have volume level reset to maximum value
in checkFixedVolumeDevices.
Bug:
69623109
Test: change Hearing Aid volume, restart phone, verify volume persisted
Change-Id: Iba134c0b3dc959c19c59f89c3d4ac02eed1e216f
Lucas Dupin [Thu, 5 Apr 2018 04:43:43 +0000 (21:43 -0700)]
Merge "Fade scrims slower when entering AOD" into pi-dev
am:
6a95a2cc52
Change-Id: I3789bf84c4aae8d9b598c2ef0a9b6909f61af420
TreeHugger Robot [Thu, 5 Apr 2018 04:26:50 +0000 (04:26 +0000)]
Merge "Fade scrims slower when entering AOD" into pi-dev
Tomasz Wasilczyk [Thu, 5 Apr 2018 03:30:41 +0000 (20:30 -0700)]
Merge "Fix image fetching." into pi-dev
am:
7f0afb4958
Change-Id: I0f6df8908c939bf41ebaa9f8204ce961eff1b78e
Tomasz Wasilczyk [Thu, 5 Apr 2018 03:14:14 +0000 (03:14 +0000)]
Merge "Fix image fetching." into pi-dev
Robert Carr [Thu, 5 Apr 2018 02:37:51 +0000 (19:37 -0700)]
Merge "Ensure we mark windows as not seamlessly rotating when removing them." into pi-dev
am:
c4a5f78b16
Change-Id: Ic543818a39411b3b270cb76c1aecff0b2f1c32d9
TreeHugger Robot [Thu, 5 Apr 2018 02:29:14 +0000 (02:29 +0000)]
Merge "Ensure we mark windows as not seamlessly rotating when removing them." into pi-dev
Jaewan Kim [Thu, 5 Apr 2018 02:13:38 +0000 (11:13 +0900)]
MediaController: Fix annotation of Callback#onPlaybackStateChanged()
PlaybackState can be null and it's annotated as @Nullable in other
places. So we'd better to fix the annotation.
Bug:
77532207
Test: Run CtsMediaTestCases
Change-Id: I8974c6c99d9d188934f74775977631fb7b37e5d2
Jaekyun Seok [Thu, 5 Apr 2018 01:55:57 +0000 (18:55 -0700)]
Merge "Load static RROs in OverlayManagerService" into pi-dev
am:
743d42d299
Change-Id: I151823d6aa87f98d096f85119feb9b810ab62e2f
TreeHugger Robot [Thu, 5 Apr 2018 01:41:39 +0000 (01:41 +0000)]
Merge "Load static RROs in OverlayManagerService" into pi-dev
Hall Liu [Mon, 2 Apr 2018 22:41:07 +0000 (15:41 -0700)]
Move RTT system setting to Settings.Secure
Bug:
76449217
Test: manual
Change-Id: I85620d5b834aa7e04579212f3fd5cf6c0498b570
Allen Webb [Thu, 5 Apr 2018 01:13:06 +0000 (18:13 -0700)]
Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev
am:
aa5c335a60
Change-Id: Ib60b57350bd8447b9b4d7bb4b56e3f5b7aadf857
Yu-Han Yang [Thu, 5 Apr 2018 01:07:21 +0000 (18:07 -0700)]
Merge "Add NtpTimeHelper" into pi-dev
am:
93a10eb1d2
Change-Id: I06ec09f1976e91e5efcb00ca5062be67e20b35b1
TreeHugger Robot [Thu, 5 Apr 2018 00:58:18 +0000 (00:58 +0000)]
Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev
Android Build Merger (Role) [Thu, 5 Apr 2018 00:58:10 +0000 (00:58 +0000)]
Merge "Merge "Remove duplicate definitions of utility variables" am:
8d5a39ac62 am:
9473e846e5" into pi-dev-plus-aosp
Lucas Dupin [Thu, 5 Apr 2018 00:57:47 +0000 (17:57 -0700)]
Merge "Shelf horizontal alignment was a few dps off" into pi-dev
am:
f6486683fa
Change-Id: I3c3752cf60ae3a5a5bbe3e8d4f947081da8671f7
Dan Willemsen [Thu, 5 Apr 2018 00:56:57 +0000 (17:56 -0700)]
Merge "Remove duplicate definitions of utility variables" am:
8d5a39ac62
am:
9473e846e5
Change-Id: Ie52855316907746a6347fcc6b343f5c75d9c9c64
Yangster-mac [Wed, 4 Apr 2018 17:39:12 +0000 (10:39 -0700)]
Retry logs write when it fails.
Report skipped event in statsd.
Test: manual test
BUG: b/
77222120
Change-Id: I257f5e76d557893c4eb4a8e8a13396d8b5d1afc0
Winson Chung [Thu, 5 Apr 2018 00:52:31 +0000 (17:52 -0700)]
Merge "Fix app switch regression" into pi-dev
am:
1ecd7aa188
Change-Id: Ia326259ea6a41cb32362d3f60db746216faca2d1
Yu-Han Yang [Thu, 5 Apr 2018 00:51:32 +0000 (00:51 +0000)]
Merge "Add NtpTimeHelper" into pi-dev
Dan Willemsen [Thu, 5 Apr 2018 00:46:12 +0000 (17:46 -0700)]
Merge "Remove duplicate definitions of utility variables"
am:
8d5a39ac62
Change-Id: I38a6dff84d3ccad0a1b895a4416b14e59c406953
Adrian Roos [Thu, 5 Apr 2018 00:46:10 +0000 (17:46 -0700)]
Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev
am:
71c632367a
Change-Id: Ib27bd64528218cf826a3a674efad863e3cdc6555
Lucas Dupin [Wed, 4 Apr 2018 22:09:06 +0000 (15:09 -0700)]
Fade scrims slower when entering AOD
Test: visual
Change-Id: I32117a6351c3d652f845b1b46bffaade52f1fbc4
Fixes:
77539750
Bill Yi [Thu, 5 Apr 2018 00:36:26 +0000 (17:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
0df72e4065 -s ours
Change-Id: Ia1a574e12e57f2a2bc4eeb80fc443278f4b12bc3
Ryan Mitchell [Thu, 5 Apr 2018 00:34:32 +0000 (17:34 -0700)]
Merge "Changed AAPT2 to abide by AAPT resource whitespace triming." into pi-dev
am:
6a23deef5d
Change-Id: Iec9bec5ba7f58c5ef5ef283bac16e2a1d6ebee6d
Tej Singh [Thu, 5 Apr 2018 00:27:14 +0000 (17:27 -0700)]
BugFix: Config TTL
In statsStats, we were writing the config TTL reset time to the wrong
proto field number. This fixes that.
Bug: b/
77604625
Test: unit tests, pending CTS test
Change-Id: I9f6e502bf13785bfa60d68805d46b9a5c2286f44
Lucas Dupin [Thu, 5 Apr 2018 00:33:45 +0000 (00:33 +0000)]
Merge "Shelf horizontal alignment was a few dps off" into pi-dev
Winson Chung [Thu, 5 Apr 2018 00:33:07 +0000 (00:33 +0000)]
Merge "Fix app switch regression" into pi-dev
Lucas Dupin [Thu, 5 Apr 2018 00:00:29 +0000 (17:00 -0700)]
Misc bouncer fixes
- IME flickers after dismissing a call
- IME not being triggered after rebooting
- Bouncer being shown during shade expansion animation
Test: go/sysui-bouncer-tests
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/KeyguardBouncerTest.java
Fixes:
74523176
Fixes:
75001274
Change-Id: Iae2aa1534c34a4191311b85e81e80cea89711bf4
Matthew Ng [Thu, 5 Apr 2018 00:30:01 +0000 (17:30 -0700)]
Merge "Puts back res id to correct view for the pinning tutorial" into pi-dev
am:
1d513fc5d0
Change-Id: I1479abf7c8a139060c0780e138726ad02e6d5d8f
TreeHugger Robot [Thu, 5 Apr 2018 00:25:34 +0000 (00:25 +0000)]
Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev