OSDN Git Service
Matthew Ng [Thu, 28 Jun 2018 20:05:30 +0000 (13:05 -0700)]
Skip hardware bitmaps if canvas does not support hardware acceleration
Test: use go/web-hv on nav bar
Change-Id: Id7d5f01aa0dbe9d05d0526726f64fc5233b9f563
Fixes:
110949540
TreeHugger Robot [Wed, 27 Jun 2018 17:43:17 +0000 (17:43 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 17:42:10 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 17:36:24 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 17:26:27 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Dan Sandler [Wed, 27 Jun 2018 17:18:11 +0000 (10:18 -0700)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES. am:
a5c846c3fa
am:
90d531a96c
Change-Id: I2c4de0b96eccf189bdcc9447e076f29669fa6e8d
Dan Sandler [Wed, 27 Jun 2018 17:06:40 +0000 (10:06 -0700)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES.
am:
a5c846c3fa
Change-Id: Ib8020b3d649391b591a191f7ee692071bfa538d1
Tobias Thierer [Wed, 27 Jun 2018 15:40:26 +0000 (08:40 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28." am:
b5f35aeaf3 am:
5442964205
am:
e4449497ed
Change-Id: I3bbb854c61f476caaef20eeae2bbcc9473c49469
Tobias Thierer [Wed, 27 Jun 2018 15:26:11 +0000 (08:26 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28." am:
b5f35aeaf3
am:
5442964205
Change-Id: I4dfc6aa0a062998b186b7abfef2cae41463239b2
Tobias Thierer [Wed, 27 Jun 2018 15:14:58 +0000 (08:14 -0700)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
am:
b5f35aeaf3
Change-Id: I55ba23bfae8f578eb75a4cbfeb2ed4ad1492867d
Tobias Thierer [Wed, 27 Jun 2018 13:53:12 +0000 (13:53 +0000)]
Merge "TextUtils: track behavior change of Pattern.split() when targeting > 28."
TreeHugger Robot [Wed, 27 Jun 2018 12:34:18 +0000 (12:34 +0000)]
Merge "Get new surface if it was released from setWindowStopped"
Neil Fuller [Wed, 27 Jun 2018 12:15:53 +0000 (05:15 -0700)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master am:
ca48eb7fa9
am:
6aba7c3646
Change-Id: I38f6a5a3dcc1d68580b3a3ac75355797fa75ccd6
Neil Fuller [Wed, 27 Jun 2018 12:10:18 +0000 (05:10 -0700)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
am:
ca48eb7fa9
Change-Id: I350bcde63f1874d4a237e81d7f93bed00cbba6a3
Peter Visontay [Thu, 14 Jun 2018 13:47:12 +0000 (14:47 +0100)]
Fix broken links in the Javadoc of Activity.requestPermissions().
Test: none
Change-Id: I43b36394d4b50882edbcc057610b609cabf34f9a
Neil Fuller [Wed, 27 Jun 2018 10:40:06 +0000 (11:40 +0100)]
resolve merge conflicts of
bc38909bf3790331532c329a867d5a22fbf94016 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib06f2869e5aa1788c8d5fc281a8565420e93d8f7
Bill Yi [Wed, 27 Jun 2018 09:59:22 +0000 (02:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iceb272ffa664416b4eafe5eb32098d02e93a095d
Auto-generated-cl: translation import
Bill Yi [Wed, 27 Jun 2018 09:52:35 +0000 (02:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I490177d6ebbe2826d0e703005a48be349e399f29
Auto-generated-cl: translation import
Neil Fuller [Wed, 27 Jun 2018 08:45:36 +0000 (08:45 +0000)]
Merge "Prepare for migration to the time detector service"
Bill Yi [Wed, 27 Jun 2018 08:29:13 +0000 (01:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52888e0789e57804c8b6da627d0ec744a8ba0190
Auto-generated-cl: translation import
Bill Yi [Wed, 27 Jun 2018 08:02:42 +0000 (01:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I03327bfa7c1851ba0d16de511b8ef2bcf6e92440
Auto-generated-cl: translation import
Pasty Chang [Wed, 27 Jun 2018 05:12:43 +0000 (05:12 +0000)]
Merge "Remove TtsSpan from Ssid"
TreeHugger Robot [Wed, 27 Jun 2018 04:11:22 +0000 (04:11 +0000)]
Merge "Add textFontWeight attribute to documentation"
Ming-Shin Lu [Wed, 27 Jun 2018 03:15:29 +0000 (03:15 +0000)]
Merge "Add a unit test for verify IActivityTaskManager.resizeDockedStack."
pastychang [Tue, 26 Jun 2018 05:37:34 +0000 (13:37 +0800)]
Remove TtsSpan from Ssid
Telephone type span caused talkback stop to read next texture in Setupwizard wifi page. Remove it and doesn't impact previous issue ag/
1468171.
New Google TTS can recognize work and doesn't only spell words.
Test: atest
Bug: b/
110104543
Change-Id: I4f37a6280294446e5f33ea3620366803b6d30a4e
Christopher Morin [Wed, 27 Jun 2018 02:39:05 +0000 (02:39 +0000)]
Merge "OOM score management"
Jong Wook Kim [Wed, 27 Jun 2018 02:08:08 +0000 (02:08 +0000)]
Merge "Display "Unavailable" for default MAC"
Jackal Guo [Wed, 27 Jun 2018 02:08:01 +0000 (02:08 +0000)]
Merge "Update the format for hours and minutes in the snooze menu."
Dan Sandler [Thu, 21 Jun 2018 17:57:28 +0000 (13:57 -0400)]
Activate dark theme when the UiMode is UI_MODE_NIGHT_YES.
This change also activates night mode when the device enters
battery saver (saving substantial power on OLED screens).
Bug:
80307398
Test: adb shell service call uimode 4 i32 1 # nightfall
adb shell service call uimode 4 i32 2 # morningtide
Change-Id: I9c08a749d4cd99ab7231363b045949eb2e830dfa
Riddle Hsu [Tue, 26 Jun 2018 10:03:05 +0000 (18:03 +0800)]
Get new surface if it was released from setWindowStopped
If there is no visibility change, when the stopped state
changed from true to false, there is no valid surface to use.
Bug:
80170221
Test: Sample app in bug link
Test: atest ViewRootImplTest
Change-Id: I2324ed32980aae5a3ec2efbd612e6c143c9a0022
Julia Reynolds [Wed, 27 Jun 2018 01:32:45 +0000 (18:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev am:
694b4ae846
am:
2f9218d0c9 -s ours
Change-Id: I76e583ff5ff890d0f5d3334bf5ad43cb8b084d17
Julia Reynolds [Wed, 27 Jun 2018 01:26:14 +0000 (18:26 -0700)]
Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
am:
694b4ae846
Change-Id: I54b861a2a4d72cfdc1734fc5528b10bce5f1d0ef
TreeHugger Robot [Wed, 27 Jun 2018 01:24:09 +0000 (01:24 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 27 Jun 2018 01:09:48 +0000 (01:09 +0000)]
Merge "DO NOT MERGE Log notification interruptions to TRON" into pi-dev
David Sehr [Wed, 27 Jun 2018 00:56:18 +0000 (17:56 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote" am:
f40f05229c -s ours am:
984fc6eae1 -s ours
am:
499a6a34d0 -s ours
Change-Id: I73f877e1185d5d77224cc3a4dbfb54f0c0442b1a
Jong Wook Kim [Fri, 15 Jun 2018 19:58:50 +0000 (12:58 -0700)]
Display "Unavailable" for default MAC
Display "Unavailable" when the current MAC address is
"02:00:00:00:00:00" which indicates that we couldn't get the actual
device MAC address.
Bug:
110043449
Test: Unittest (make RunSettingsLibRoboTests -j40)
Change-Id: I2adab477a43262dd0067bc30b0a9ca4d35dc4298
Josh Gao [Wed, 27 Jun 2018 00:26:22 +0000 (17:26 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory." am:
c00dd28164 am:
258513f581
am:
12f9222884
Change-Id: I4129ea5ceb4bfd7aecba426d19fb9c8bc769584c
David Sehr [Wed, 27 Jun 2018 00:25:44 +0000 (17:25 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote" am:
f40f05229c -s ours
am:
984fc6eae1 -s ours
Change-Id: I0ac0bcd1c3f9242d4a2efab56627a61baf79676c
Josh Gao [Wed, 27 Jun 2018 00:16:03 +0000 (17:16 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory." am:
c00dd28164
am:
258513f581
Change-Id: I7e9f930c94d4fbb4ac23473c017bc8762e8d55dc
David Sehr [Wed, 27 Jun 2018 00:13:55 +0000 (17:13 -0700)]
[automerger skipped] Merge "Split fork and specialize in zygote"
am:
f40f05229c -s ours
Change-Id: I3d5162e3967503d85aae73fe6bd37e0f50516b9d
Josh Gao [Wed, 27 Jun 2018 00:09:06 +0000 (17:09 -0700)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
am:
c00dd28164
Change-Id: I788e8747361a5c0e3324aa7ac88951428b5f0829
Evan Laird [Tue, 26 Jun 2018 23:56:47 +0000 (16:56 -0700)]
Merge "Make BT icon more prominent" into pi-dev am:
6c90bf605e
am:
45dfee0c69
Change-Id: I0dd3ea58c61e400b0d477fb25d191b38fcd6d94c
TreeHugger Robot [Tue, 26 Jun 2018 23:46:33 +0000 (23:46 +0000)]
Merge "Add "dumpsys activity lastanr-traces""
Evan Laird [Tue, 26 Jun 2018 23:42:56 +0000 (16:42 -0700)]
Merge "Make BT icon more prominent" into pi-dev
am:
6c90bf605e
Change-Id: Ic9c9a19e49c32187c3d65f361fc7cae16a7d0a56
Garfield Tan [Tue, 26 Jun 2018 23:33:22 +0000 (23:33 +0000)]
Merge "Preserve other windows during resize as well."
TreeHugger Robot [Tue, 26 Jun 2018 23:24:30 +0000 (23:24 +0000)]
Merge "Make BT icon more prominent" into pi-dev
Tyler Gunn [Tue, 26 Jun 2018 22:57:02 +0000 (15:57 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear." am:
690f008e3f -s ours am:
6f8fef77de -s ours
am:
9d8cd4bc47 -s ours
Change-Id: I088cc7145a36ac71da2af0d791eef3e0b1f91653
Tyler Gunn [Tue, 26 Jun 2018 22:44:03 +0000 (15:44 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear." am:
690f008e3f -s ours
am:
6f8fef77de -s ours
Change-Id: Ibd0b306b9776821b84680894c14250e3d9a2913a
Chris Morin [Thu, 7 Jun 2018 22:23:28 +0000 (15:23 -0700)]
OOM score management
Add 2 additional attirubte |isFocused| and |lastActivityTime| in
ActivityManager.RunningAppProcessInfo and pass them to Chrome via IPC
so Chrome can better prioritize ARC processes.
Bug:
29576205
Test: Ensure new process information is passed to Chrome.
Change-Id: Ic88d5fca336f03bd6426e65f964236130bb83fb6
Hall Liu [Tue, 26 Jun 2018 22:39:56 +0000 (15:39 -0700)]
Merge "Make RttTextStream's read interruptible" into pi-dev am:
21ef4b3acb
am:
6574cac322
Change-Id: I5a3946a2555ed2ac3cbe5a4f1a2ef6f664554667
Makoto Onuki [Tue, 26 Jun 2018 22:24:54 +0000 (15:24 -0700)]
Add "dumpsys activity lastanr-traces"
This command prints out the last ANR stacktrace file.
This allows DumpViewer to show last ANR traces.
Bug:
110088132
Test: Manual test with DumpViewer.apk
Change-Id: I5425087c28962795a142f0847b3657b8b6a6d1d8
Tyler Gunn [Tue, 26 Jun 2018 22:26:09 +0000 (15:26 -0700)]
[automerger skipped] Merge "Update onDeregistered docs to make capability change expectations clear."
am:
690f008e3f -s ours
Change-Id: Ibb2c56554f0df15cf287c90aa1f183674e948f3d
Lucas Dupin [Tue, 26 Jun 2018 22:20:38 +0000 (15:20 -0700)]
Merge "Do not animate scrims when launching camera" into pi-dev am:
aa21ec053c
am:
273bce2fde
Change-Id: I2e18284b89f8ba3ac7aca0095392550f345a7839
Hall Liu [Tue, 26 Jun 2018 22:17:12 +0000 (15:17 -0700)]
Merge "Make RttTextStream's read interruptible" into pi-dev
am:
21ef4b3acb
Change-Id: Ifc793a3b59e7e9cc5c09cffa8d147feeb5a6e900
Lucas Dupin [Tue, 26 Jun 2018 22:04:34 +0000 (15:04 -0700)]
Merge "Do not animate scrims when launching camera" into pi-dev
am:
aa21ec053c
Change-Id: Ic3089144cb26864bd0e49846348441c7857cce49
David Sehr [Tue, 26 Jun 2018 22:02:16 +0000 (22:02 +0000)]
Merge "Split fork and specialize in zygote"
Hall Liu [Tue, 26 Jun 2018 22:00:17 +0000 (22:00 +0000)]
Merge "Make RttTextStream's read interruptible" into pi-dev
Lucas Dupin [Tue, 26 Jun 2018 21:48:16 +0000 (21:48 +0000)]
Merge "Do not animate scrims when launching camera" into pi-dev
Bill Yi [Tue, 26 Jun 2018 21:39:24 +0000 (14:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie12b3769f21262a65ac68f414ae32bb1960fa53a
Auto-generated-cl: translation import
Treehugger Robot [Tue, 26 Jun 2018 21:38:14 +0000 (21:38 +0000)]
Merge "Fix memory leak in RenderThread::dumpGraphicsMemory."
Seigo Nonaka [Tue, 26 Jun 2018 21:30:42 +0000 (14:30 -0700)]
Add textFontWeight attribute to documentation
Bug: N/A
Test: m docs and manually verified
Change-Id: Ic2aca1503789c9ce426b3de3b887983ade292afe
Steven Moreland [Tue, 26 Jun 2018 21:29:25 +0000 (14:29 -0700)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master am:
3c6186c474
am:
39f3c39e74
Change-Id: I7821306a1a8f09511459a716305fbe1da1d83d91
TreeHugger Robot [Tue, 26 Jun 2018 21:15:05 +0000 (21:15 +0000)]
Merge "Add kernel version to incident report"
Tyler Gunn [Tue, 26 Jun 2018 21:14:27 +0000 (21:14 +0000)]
Merge "Update onDeregistered docs to make capability change expectations clear."
Steven Moreland [Tue, 26 Jun 2018 21:10:33 +0000 (14:10 -0700)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
am:
3c6186c474
Change-Id: Id03d6d4af7ea4713bf971d54798a55be086a0ca3
TreeHugger Robot [Tue, 26 Jun 2018 21:06:35 +0000 (21:06 +0000)]
Merge "StrictMode to catch implicit Direct Boot matching."
Garfield Tan [Mon, 25 Jun 2018 23:29:21 +0000 (16:29 -0700)]
Preserve other windows during resize as well.
Before this change if user resizes a window that has a dialog activity
in the front, and a paused activity in its back, the paused activity
will be completely torn down and relaunched, causing a whole period of
black window showing to users.
Bug:
110716902
Test: The activity stopped flickering and go/wm-smoke.
Change-Id: I0dfe6a9c3d925a365a1a3beaa5841e1606220ac2
TreeHugger Robot [Tue, 26 Jun 2018 20:49:15 +0000 (20:49 +0000)]
Merge "services.core.unboosted: hidl manager->static_libs" into stage-aosp-master
Andrew Sapperstein [Tue, 26 Jun 2018 20:35:36 +0000 (13:35 -0700)]
Merge "Hide system apps until installed (1/2)" into pi-dev am:
70a9f39e6a
am:
d8a7b012a0
Change-Id: Iec66c2a906074a174d89994bca7b86f903b68886
Andrew Sapperstein [Tue, 26 Jun 2018 20:19:57 +0000 (13:19 -0700)]
Merge "Hide system apps until installed (1/2)" into pi-dev
am:
70a9f39e6a
Change-Id: Ide5ea4b18ca95ee061bf84cb349369b2468504d1
Julia Reynolds [Mon, 18 Jun 2018 13:29:19 +0000 (09:29 -0400)]
DO NOT MERGE Log notification interruptions to TRON
Test: manual
Bug:
110209821
Change-Id: Ic3521f36127aa0e928d0be5ce9819c78c2bc9bc5
Andrew Sapperstein [Tue, 26 Jun 2018 20:03:38 +0000 (20:03 +0000)]
Merge "Hide system apps until installed (1/2)" into pi-dev
Lucas Dupin [Tue, 12 Jun 2018 02:16:03 +0000 (19:16 -0700)]
Do not animate scrims when launching camera
There's already a black overlay with a camera icon, it's not necessary
to animate the scrims.
Change-Id: I52472372420eb8ba052a17cdde147d24dafadce0
Fixes:
109767309
Test: double tap power button from lock screen and aod
David Sehr [Wed, 23 May 2018 22:23:01 +0000 (15:23 -0700)]
Split fork and specialize in zygote
Separate the portions of the zygote jni library that perform forking
from specialization into system_server or app process. This is a small
step towards separating forking into a pre-launch activity, possibly
with a pool of pre-application processes.
Bug:
68253328
Test: boot and run
Change-Id: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Merged-In: I6ce694d9a69bf7d10cf61cd39989091ee9cabd37
Andrew Sapperstein [Tue, 26 Jun 2018 19:48:05 +0000 (19:48 +0000)]
Merge "Hide system apps until installed (1/2)"
Josh Gao [Tue, 26 Jun 2018 18:41:34 +0000 (11:41 -0700)]
Fix memory leak in RenderThread::dumpGraphicsMemory.
This would have been a double-close of fd, except we just leak the
FILE* instead.
Test: treehugger
Change-Id: I519366fbcf0eb6f03f79c22abfa2b1b1b493a70a
Jeff Sharkey [Fri, 22 Jun 2018 01:14:58 +0000 (19:14 -0600)]
StrictMode to catch implicit Direct Boot matching.
When an app starts becoming Direct Boot aware, it can be difficult
to track down all the places they're implicitly relying on
PackageManager filtering behavior.
For example, if the current Launcher isn't Direct Boot aware, we
hide it until the user is unlocked, which could confuse other Direct
Boot aware apps into thinking it had been uninstalled, which could
cause data loss.
This change helps apps track down places where they're implicitly
relying on the automatic filtering; they should instead carefully
choose a combination of MATCH_DIRECT_BOOT flags to decide on the
explicit matching behavior they want.
To implement this, we partially migrate the updateFlags() methods
out into ApplicationPackageManager, since the checking needs to
happen on the client side to correctly report StrictMode
violations. We don't currently mutate the flags, but we retain
the naming to keep that door open in the future.
Test: manual
Bug:
110413274
Change-Id: Iff6feba19da81ea1b4eeb3af821c3bdfbd9bf17c
TreeHugger Robot [Tue, 26 Jun 2018 17:40:06 +0000 (17:40 +0000)]
Merge "Clean up TODOs in statsd"
Laura Davis [Tue, 26 Jun 2018 17:09:12 +0000 (10:09 -0700)]
Merge "Merge "Docs: fixed variables" into pi-dev am:
116158689c" into pi-dev-plus-aosp
am:
bd935bf41a
Change-Id: I7617577dd4fc8dc0944deb76e95142f96dade2a7
David Sehr [Tue, 26 Jun 2018 16:58:16 +0000 (09:58 -0700)]
Merge "Split fork and specialize in zygote" into stage-aosp-master am:
3937fbb439
am:
a1e03652dd
Change-Id: I782d4b1cb68c59ddaec03243eb59f82a6b468021
Android Build Merger (Role) [Tue, 26 Jun 2018 16:52:04 +0000 (16:52 +0000)]
Merge "Merge "Docs: fixed variables" into pi-dev am:
116158689c" into pi-dev-plus-aosp
Laura Davis [Tue, 26 Jun 2018 16:51:30 +0000 (09:51 -0700)]
Merge "Docs: fixed variables" into pi-dev
am:
116158689c
Change-Id: Ia4219c6d6502b9348ed30453b46801d107dd2a2c
TreeHugger Robot [Tue, 26 Jun 2018 16:49:03 +0000 (16:49 +0000)]
Merge "Allow longer messages for grant permission questions"
David Sehr [Tue, 26 Jun 2018 16:48:08 +0000 (09:48 -0700)]
Merge "Split fork and specialize in zygote" into stage-aosp-master
am:
3937fbb439
Change-Id: I129586249b68364b7813a146fc5b48936b948174
TreeHugger Robot [Tue, 26 Jun 2018 16:44:27 +0000 (16:44 +0000)]
Merge "Prepare for migration to the time detector service"
Laura Davis [Tue, 26 Jun 2018 16:42:43 +0000 (16:42 +0000)]
Merge "Docs: fixed variables" into pi-dev
TreeHugger Robot [Tue, 26 Jun 2018 16:40:18 +0000 (16:40 +0000)]
Merge "NotificationManager: clean calling identity in dump()."
David Sehr [Tue, 26 Jun 2018 16:34:43 +0000 (16:34 +0000)]
Merge "Split fork and specialize in zygote" into stage-aosp-master
Steven Moreland [Mon, 25 Jun 2018 19:42:51 +0000 (12:42 -0700)]
services.core.unboosted: hidl manager->static_libs
Bug:
77307025
Test: boot device w/o hidl libs on boot classpath, no loading
error
Change-Id: Iae2b0015a29de71c22e6bc31004613bbf4ca971b
Tobias Thierer [Thu, 21 Jun 2018 09:31:39 +0000 (10:31 +0100)]
TextUtils: track behavior change of Pattern.split() when targeting > 28.
Another CL in this topic changes the behavior of String.split() and
Pattern.split() to omit a "" generated by a leading zero-width match.
TextUtils.split() is implemented on top of these methods and therefore
adopts the behavior change by default.
The behavior change only affects apps targeting API versions > 28.
Test: cts-tradefed run singleCommand cts-dev -m CtsTextTestCases \
-t android.text.cts.TextUtilsTest
Test: cts-tradefed run singleCommand cts-dev -m CtsLibcoreTestCases
Bug:
109659282
Change-Id: I8abe251353f8eacf1429ac9a8e272d50a0944c29
Neil Fuller [Tue, 26 Jun 2018 12:33:35 +0000 (05:33 -0700)]
Merge "Add more behavior to TimeDetectorService" am:
b1fc5a4c7e am:
325ecf7df4
am:
55b29baea1
Change-Id: I4fe5fe32ffbd807680d688f4415e5dc9e47069d5
Neil Fuller [Tue, 26 Jun 2018 12:23:26 +0000 (05:23 -0700)]
Merge "Add more behavior to TimeDetectorService" am:
b1fc5a4c7e
am:
325ecf7df4
Change-Id: I28d5b3dbd666dc9d097f6fb7c15dc5ba8cf931e9
Neil Fuller [Tue, 26 Jun 2018 12:14:31 +0000 (05:14 -0700)]
Merge "Add more behavior to TimeDetectorService"
am:
b1fc5a4c7e
Change-Id: Ibbda2d253bf807cc480a4218aa1d898d6737ec7b
Jorim Jaggi [Tue, 26 Jun 2018 11:52:45 +0000 (04:52 -0700)]
Merge "Defer stop for all activities becoming invisible" into pi-dev am:
fd77e69f28
am:
72039c7a7c
Change-Id: Ia624934e99a85028b20fc261da13cf9c7d1e71a7
Jorim Jaggi [Tue, 26 Jun 2018 11:44:36 +0000 (04:44 -0700)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
am:
fd77e69f28
Change-Id: Ife380bd268aa2c760dff2dec4f7a8358721cbe95
Jorim Jaggi [Tue, 26 Jun 2018 11:34:03 +0000 (11:34 +0000)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
Neil Fuller [Tue, 26 Jun 2018 11:11:04 +0000 (04:11 -0700)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master am:
e01a7adf5a
am:
f18981698d
Change-Id: I677c493954ad73ba47d042082c9bdc3ea1782ab7
Neil Fuller [Tue, 26 Jun 2018 11:05:36 +0000 (04:05 -0700)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
am:
e01a7adf5a
Change-Id: I993dc856b8fe0f42d7ad5f766727be32d3d611fe
Neil Fuller [Tue, 26 Jun 2018 10:55:46 +0000 (11:55 +0100)]
resolve merge conflicts of
55c0a6682574b881b0ccdf2b08fdc4b6c84d1b81 to stage-aosp-master
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4
Neil Fuller [Thu, 21 Jun 2018 14:16:36 +0000 (15:16 +0100)]
Prepare for migration to the time detector service
Paves the way for moving more behavior to the time detector
service from the NetworkTimeUpdateService.
The NewNetworkTimeUpdateService is effectively identical to
the OldNetworkTimeUpdateService in this initial commit.
Bug:
78217059
Test: build / boot
Merged-In: Ica9fa9b61c849e034d76c0faae5693b60a4a197f
Change-Id: Ica9fa9b61c849e034d76c0faae5693b60a4a197f