Bill Yi
68f9fd0a35
Import translations. DO NOT MERGE
...
Change-Id: Ic581a3f43aa2e06bf82e07276f4f38190977387c
Auto-generated-cl: translation import
2018-06-27 04:44:32 -07:00
TreeHugger Robot
3e2e1ae482
Merge "Clean up TODOs in statsd"
2018-06-26 17:40:06 +00:00
Laura Davis
93fae901a2
Merge "Merge "Docs: fixed variables" into pi-dev am: 116158689c" into pi-dev-plus-aosp
...
am: bd935bf41a
2018-06-26 10:09:12 -07:00
David Sehr
d100ab6930
Merge "Split fork and specialize in zygote" into stage-aosp-master am: 3937fbb439
...
am: a1e03652dd
2018-06-26 09:58:16 -07:00
Android Build Merger (Role)
bd935bf41a
Merge "Merge "Docs: fixed variables" into pi-dev am: 116158689c" into pi-dev-plus-aosp
2018-06-26 16:52:04 +00:00
Laura Davis
6c676e3711
Merge "Docs: fixed variables" into pi-dev
...
am: 116158689c
2018-06-26 09:51:30 -07:00
TreeHugger Robot
cb5064e541
Merge "Allow longer messages for grant permission questions"
2018-06-26 16:49:03 +00:00
David Sehr
a1e03652dd
Merge "Split fork and specialize in zygote" into stage-aosp-master
...
am: 3937fbb439
2018-06-26 09:48:08 -07:00
TreeHugger Robot
a744cce05c
Merge "Prepare for migration to the time detector service"
2018-06-26 16:44:27 +00:00
Laura Davis
116158689c
Merge "Docs: fixed variables" into pi-dev
2018-06-26 16:42:43 +00:00
TreeHugger Robot
1b72a7f520
Merge "NotificationManager: clean calling identity in dump()."
2018-06-26 16:40:18 +00:00
David Sehr
3937fbb439
Merge "Split fork and specialize in zygote" into stage-aosp-master
2018-06-26 16:34:43 +00:00
Neil Fuller
58969298c1
Merge "Add more behavior to TimeDetectorService" am: b1fc5a4c7e am: 325ecf7df4
...
am: 55b29baea1
2018-06-26 05:33:35 -07:00
Neil Fuller
55b29baea1
Merge "Add more behavior to TimeDetectorService" am: b1fc5a4c7e
...
am: 325ecf7df4
2018-06-26 05:23:26 -07:00
Neil Fuller
325ecf7df4
Merge "Add more behavior to TimeDetectorService"
...
am: b1fc5a4c7e
2018-06-26 05:14:31 -07:00
Jorim Jaggi
226d11f980
Merge "Defer stop for all activities becoming invisible" into pi-dev am: fd77e69f28
...
am: 72039c7a7c
2018-06-26 04:52:45 -07:00
Jorim Jaggi
72039c7a7c
Merge "Defer stop for all activities becoming invisible" into pi-dev
...
am: fd77e69f28
2018-06-26 04:44:36 -07:00
Jorim Jaggi
fd77e69f28
Merge "Defer stop for all activities becoming invisible" into pi-dev
2018-06-26 11:34:03 +00:00
Neil Fuller
dc5f024a6c
resolve merge conflicts of 55c0a66825 to stage-aosp-master am: e01a7adf5a
...
am: f18981698d
2018-06-26 04:11:04 -07:00
Neil Fuller
f18981698d
resolve merge conflicts of 55c0a66825 to stage-aosp-master
...
am: e01a7adf5a
2018-06-26 04:05:36 -07:00
Neil Fuller
e01a7adf5a
resolve merge conflicts of 55c0a66825 to stage-aosp-master
...
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie524607cabc6688911eee7e4f61c50fd406c71f4
2018-06-26 11:55:46 +01:00
Neil Fuller
0e44c66e08
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
2018-06-26 10:14:17 +01:00
Erik Kline
bdb921381b
Merge "Make auto-upstream the default tethering behaviour" am: e193298c4a am: 1239734050
...
am: 7f315a5c3c
2018-06-26 01:50:31 -07:00
Neil Fuller
b1fc5a4c7e
Merge "Add more behavior to TimeDetectorService"
2018-06-26 08:43:55 +00:00
Erik Kline
7f315a5c3c
Merge "Make auto-upstream the default tethering behaviour" am: e193298c4a
...
am: 1239734050
2018-06-26 01:40:33 -07:00
Neil Fuller
55c0a66825
Merge "Minimum viable TimeZoneDetectorService"
2018-06-26 08:34:56 +00:00
Erik Kline
1239734050
Merge "Make auto-upstream the default tethering behaviour"
...
am: e193298c4a
2018-06-26 01:32:31 -07:00
Treehugger Robot
e193298c4a
Merge "Make auto-upstream the default tethering behaviour"
2018-06-26 07:11:02 +00:00
Kazuki Takise
dd7b69d3c5
Merge "Position stack at top when always on top flag is set"
2018-06-26 04:14:41 +00:00
TreeHugger Robot
05e554dbc4
Merge "Copy collections to avoid concurrent crash"
2018-06-26 01:03:56 +00:00
Amit Mahajan
ee44571c34
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()" am: 3838ff457e am: 12b08d00b8
...
am: 6790ba2a59
2018-06-25 17:10:30 -07:00
Stan Iliev
da3fb57d52
Merge "Don't apply filter in readback, when there is no scaling" into pi-dev am: cea247e135
...
am: a69eae92c7
2018-06-25 16:43:38 -07:00
Amit Mahajan
6790ba2a59
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()" am: 3838ff457e
...
am: 12b08d00b8
2018-06-25 16:41:09 -07:00
Stan Iliev
a69eae92c7
Merge "Don't apply filter in readback, when there is no scaling" into pi-dev
...
am: cea247e135
2018-06-25 16:33:36 -07:00
Amit Mahajan
12b08d00b8
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
...
am: 3838ff457e
2018-06-25 16:31:55 -07:00
TreeHugger Robot
cea247e135
Merge "Don't apply filter in readback, when there is no scaling" into pi-dev
2018-06-25 23:20:23 +00:00
Makoto Onuki
bbb4b22f8b
NotificationManager: clean calling identity in dump().
...
When a device has work profile, "dumpsys notifiaction" often crashes
if the caller doesn't have the CROSS_USER permission.
The dump() method is protected with checkDumpAndUsageStatsPermission(),
and it won't need further permission check.
Test: "dumpsys notification"
Change-Id: Ief5269dec1e334bcd96013c349a468a0136a9551
2018-06-25 16:09:03 -07:00
Treehugger Robot
3838ff457e
Merge "Update comments for TelephonyManager.getUiccSlotsInfo()"
2018-06-25 22:22:25 +00:00
TreeHugger Robot
114fcb4144
Merge "Statsd: Update perfprofd config proto location"
2018-06-25 21:49:15 +00:00
Laura Davis
95aa3e124e
Merge "docs: fixed broken link" into pi-dev am: e07aeea926
...
am: d3f3a2354a
2018-06-25 14:47:56 -07:00
Laura Davis
d3f3a2354a
Merge "docs: fixed broken link" into pi-dev
...
am: e07aeea926
2018-06-25 14:37:54 -07:00
Laura Davis
e07aeea926
Merge "docs: fixed broken link" into pi-dev
2018-06-25 21:27:48 +00:00
TreeHugger Robot
10c67dd7b5
Merge "Dump ZenModeControllerImpl for debugging purposes."
2018-06-25 21:24:41 +00:00
TreeHugger Robot
b9d084d696
Merge "Use correct validator for SELECTED_SPELL_CHECKER_SUBTYPE"
2018-06-25 21:15:54 +00:00
Jorim Jaggi
5db9ae4001
Defer stop for all activities becoming invisible
...
If we are deferring a stop until a window is becoming visible,
it's a good idea to also defer stopping all other activities that
are go into stopping state to avoid flickers.
Furthermore we need to fix an issue where activities weren't
cleared from mActivitiesWaitingForVisibleActivity which messed
up the newly introduced logic.
This fixes an issue with quickstep when swiping right and the
previous activity hasn't finished pausing yet when we start the
new activity. In the normal case, prev=Launcher and all is fine,
as we wait with stopping launcher until the animation is done. In
the bad case, prev=the previous activity that was on screen before
swiping, so Launcher doesn't get added to the waiting list, which
means that it will be stopped too early, aborting the animation
because Launcher is also driving it.
Test: ActivityManagerDisplayLockedKeyguardTests
Test: go/wm-smoke
Test: Swipe right from Chrome to any other app, observe no jump
Fixes: 80313326
Bug: 110032866
Change-Id: I39454fe218ac10ef73cc4ca23efc7c9fb3bc87ad
2018-06-25 23:12:18 +02:00
Laura Davis
71a43c3fcd
Merge "docs: fixed typo in deprecation message" into pi-dev am: 0dabb070b8
...
am: 9a1acef1e7
2018-06-25 14:09:51 -07:00
Laura Davis
9a1acef1e7
Merge "docs: fixed typo in deprecation message" into pi-dev
...
am: 0dabb070b8
2018-06-25 14:03:32 -07:00
Matthew Ng
fe1740d9b4
Merge "Quick scrub has gradient follow user drag" into pi-dev am: 5f5c6e993f
...
am: d60292d292
2018-06-25 14:03:00 -07:00
Matthew Ng
d60292d292
Merge "Quick scrub has gradient follow user drag" into pi-dev
...
am: 5f5c6e993f
2018-06-25 13:54:19 -07:00
Laura Davis
0dabb070b8
Merge "docs: fixed typo in deprecation message" into pi-dev
2018-06-25 20:46:59 +00:00
