OSDN Git Service
Neil Fuller [Tue, 19 Jun 2018 11:53:47 +0000 (12:53 +0100)]
Minimum viable TimeZoneDetectorService
This is a do-nothing TimeZoneDetectorService that can be
populated in following commits. A temporary method has been
added so the service has one method.
Unit tests can be run with:
atest FrameworksServicesTests:TimeZoneDetectorServiceTest
Test: build / boot
Test: See above
Change-Id: I565fb5dd2f18b7aac2e5779d346bfe69e9da02af
Ming-Shin Lu [Tue, 19 Jun 2018 03:11:57 +0000 (03:11 +0000)]
Merge "Prevent NPEs when no focusable stack."
lumark [Fri, 15 Jun 2018 07:43:12 +0000 (15:43 +0800)]
Prevent NPEs when no focusable stack.
Fallback to home stack when no focusable stack
(e.g. launcher force stopped & enter PIP mode with no other app task),
Fix NPEs for logWindowState & getTopRunningActivity from null stack.
Change-Id: I0a0134661dfc20ff844a0bc19ce6833242f4a865
Fixes:
110078217
Test: Manual
Test: atest ActivityStackSupervisorTests ActivityStackTests ActivityStarterTests
felkachang [Thu, 24 May 2018 07:38:04 +0000 (15:38 +0800)]
Fix the icon overlay after density change
After showing the heads up for the fullscreen notification, to
change the density by user will have the status bar icons
not show normally. It will the only one icon overlay on the
clock but actually there are more than one icons. And, it can't
back to normal after expandable notification and collapse the
notification panel.
The root cause is that all of instances of PhoneStatusBarView,
Clock, HeadsUpStatusBarView, and HeadsUpAppearanceController are
recreated by FragmentManager after configuration density and
font changing. The new HeadsUpAppearanceController status is
neither consistent with HeadsUpManager's status nor the state of
the previous instances.
The solution is that to apply the onSaveInstanceState and
onRestoreInstanceState in PhoneStatusBarView, Clock, PanelBar, and
HeadsUpStatusBarView. To make sure that the values of the fields
in the new instance, which are set by other source, have the
consistence with the state of the old instances.
HeadsUpAppearanceController's Constructor.
To hook onLayoutChangedListener to sync the status with
HeadsUpManager's status to HeadsUpStatusBarView if there is a
pinnded heads up notification.
In original, PanelBar.mState is the only one state to save. Instead
of only saving one, to save the view tree state in
CollapsedStatusBarFragment.onSaveInstanceState and restore the view
state in CollapsedStatusBarFragment.onViewCreated.
CollapsedStatusBarFragment.mDisabled1 doesn't need to save and
restore because CommandQueue.recomputeDisableFlags will give it
the correct value.
After density changed, RemoteViews will reinflate the instances of
NotificationHeaderView and the wrapper instances of
NoticationContentView will also recreated in
NotificationContentView.setAmbientChild. The recreated instance
should synchronized with the ExpandableNotificationRow intance.
Fixes:
80224819
Fixes:
80426687
Test: atest SystemUITests
Change-Id: Ia3f8a0f138f403c8e0c74c00d56bd93baf604d3a
Android Build Merger (Role) [Tue, 19 Jun 2018 02:08:21 +0000 (02:08 +0000)]
Merge "Merge "Fixed the incorrect permission for data/network service binding" am:
a9bf7a8810 am:
65c04cd491 am:
574b298e9e"
Jack Yu [Tue, 19 Jun 2018 02:07:15 +0000 (19:07 -0700)]
Merge "Fixed the incorrect permission for data/network service binding" am:
a9bf7a8810 am:
65c04cd491
am:
574b298e9e
Change-Id: Ib69ec8bd57533112fcda72927db49c58619cf7ee
Wale Ogunwale [Tue, 19 Jun 2018 02:06:26 +0000 (02:06 +0000)]
Merge "Switched ActivityStackSupervisor.mService to ActivityTaskManagerService (8/n)"
Jack Yu [Tue, 19 Jun 2018 01:57:57 +0000 (18:57 -0700)]
Merge "Fixed the incorrect permission for data/network service binding" am:
a9bf7a8810
am:
65c04cd491
Change-Id: I67a28d628e14798dc8d31a20536f2248c8cc0b8f
Jack Yu [Tue, 19 Jun 2018 01:49:09 +0000 (18:49 -0700)]
Merge "Fixed the incorrect permission for data/network service binding"
am:
a9bf7a8810
Change-Id: Ic3c463d7e7755efcb048e84c338ffbe256475874
Treehugger Robot [Tue, 19 Jun 2018 00:36:38 +0000 (00:36 +0000)]
Merge "Fixed the incorrect permission for data/network service binding"
Android Build Merger (Role) [Mon, 18 Jun 2018 23:44:54 +0000 (23:44 +0000)]
[automerger skipped] [DO NOT MERGE] Update kernel timezone if call to setTime causes DST offset to change skipped:
c5d576de23
Change-Id: I2de32fcc46815c1a2f025b6385feb73ef27ee6c6
Christine Hallstrom [Mon, 21 May 2018 21:27:23 +0000 (14:27 -0700)]
[DO NOT MERGE] Update kernel timezone if call to setTime causes DST offset to change
If AlarmManager#setTime is called with a time that has a different DST
offset than the current system time, update the kernel timezone offset
with the correct value for the time being set.
Test: Manually set time to two times with different DST offsets, ensure
kernel time zone updates properly.
Bug:
80142036
Bug:
80098370
Change-Id: I8884bce471cf4b95372d6d33a36e8c9e92bd6a96
(cherry picked from commit
f5d585aec90743c2b3d691b9e307d11dd7a63c65)
TreeHugger Robot [Mon, 18 Jun 2018 23:03:28 +0000 (23:03 +0000)]
Merge "Add same padding to mobile datatype as wifi"
Wale Ogunwale [Tue, 8 May 2018 21:28:07 +0000 (14:28 -0700)]
Switched ActivityStackSupervisor.mService to ActivityTaskManagerService (8/n)
Objects that contain or represent activities like ActivityStackSupervisor
can no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I9fd5564f69170201c560bd3325594541db146106
Oscar Shu [Mon, 18 Jun 2018 22:36:42 +0000 (22:36 +0000)]
Merge "metrics: add proto field for wifi radio usage"
Erik Wolsheimer [Mon, 18 Jun 2018 22:14:25 +0000 (22:14 +0000)]
Merge changes from topic "am-
b983e737-8063-4bbb-b24b-
3dea9090b65e"
* changes:
[automerger skipped] DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream skipped:
a43886bcaa
DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream
Colin Cross [Mon, 18 Jun 2018 20:38:11 +0000 (13:38 -0700)]
Merge "Fix ManifestMerger issues" into stage-aosp-master am:
669c4d7ae7
am:
fae24f5aa2
Change-Id: I66e9b74a7db9ae9a0c4040e37a3f2807b24aa391
Colin Cross [Mon, 18 Jun 2018 20:29:08 +0000 (13:29 -0700)]
Merge "Fix ManifestMerger issues" into stage-aosp-master
am:
669c4d7ae7
Change-Id: I54eb99fde659f6c1651ae34c49d6cd81ba198e93
TreeHugger Robot [Mon, 18 Jun 2018 20:15:00 +0000 (20:15 +0000)]
Merge "Fix ManifestMerger issues" into stage-aosp-master
Nan Zhang [Mon, 18 Jun 2018 19:57:03 +0000 (12:57 -0700)]
Merge "Enabled annotations for Metalava based api-stubs." am:
79d3bf6e54 am:
0da95a5d64
am:
7c96332354
Change-Id: Iea928b33e984049904ca0fdba4923ee06cfd5971
Android Build Merger (Role) [Mon, 18 Jun 2018 19:44:41 +0000 (19:44 +0000)]
Merge "Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev am:
1b65af27d8 am:
e7f0de228b"
felkachang [Mon, 18 Jun 2018 19:44:16 +0000 (12:44 -0700)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev am:
1b65af27d8
am:
e7f0de228b
Change-Id: Icc155a27deaaabfbdbdd5bb6df84e4debd54c91f
TreeHugger Robot [Mon, 18 Jun 2018 19:44:06 +0000 (19:44 +0000)]
Merge "No-op code cleanup of TSMS#getCurrentSpellCheckerSubtype"
Nan Zhang [Mon, 18 Jun 2018 19:37:13 +0000 (12:37 -0700)]
Merge "Enabled annotations for Metalava based api-stubs." am:
79d3bf6e54
am:
0da95a5d64
Change-Id: Ie3385442c0bf28a1da52cb2d687ed45921604f80
Android Build Merger (Role) [Mon, 18 Jun 2018 19:22:09 +0000 (19:22 +0000)]
[automerger skipped] DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream skipped:
a43886bcaa
Change-Id: I26225bb9c186bf9a5a9e42bdd8130bfe1a29066b
Erik Wolsheimer [Tue, 6 Jun 2017 21:58:35 +0000 (14:58 -0700)]
DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream
Bug:
62147987
Bug:
28455483
Exempt-From-Owner-Approval: Will not merge to master
Change-Id: I4577c66d7d66c22c8b9e2ab0b50a59e97d7e9647
TreeHugger Robot [Mon, 18 Jun 2018 19:17:31 +0000 (19:17 +0000)]
Merge "Fix broken language matching logic in TSMS"
Nan Zhang [Mon, 18 Jun 2018 19:13:35 +0000 (12:13 -0700)]
Merge "Enabled annotations for Metalava based api-stubs."
am:
79d3bf6e54
Change-Id: I8b91e2259ce3b15313d5d4b822bf77696a6ebd5b
Android Build Merger (Role) [Mon, 18 Jun 2018 19:09:58 +0000 (19:09 +0000)]
[automerger] Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev am:
1b65af27d8 am:
10ab15dee0
Change-Id: I5b8e28e40de9ee97b715d53d11249337398967c1
felkachang [Mon, 18 Jun 2018 19:09:20 +0000 (12:09 -0700)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
am:
1b65af27d8
Change-Id: Ic1759f350085ec6340faf9f03eddde4c0eaa0b71
felkachang [Mon, 18 Jun 2018 19:07:53 +0000 (12:07 -0700)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
am:
1b65af27d8
Change-Id: I7236f5d24afc376709b43b032af328732aab963c
TreeHugger Robot [Mon, 18 Jun 2018 18:42:47 +0000 (18:42 +0000)]
Merge "Fix NotificaitonPanelView x-axis shift with IME" into pi-dev
Lucas Dupin [Mon, 18 Jun 2018 18:31:49 +0000 (11:31 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev am:
0e52664b0c
am:
d7330c4888
Change-Id: I5d46625235cbf58090b42594af3b49b290f7e878
TreeHugger Robot [Mon, 18 Jun 2018 18:28:19 +0000 (18:28 +0000)]
Merge "Fix StringIndexOutOfBoundsException in AccessibilityUtils"
Aaron Heuckroth [Mon, 18 Jun 2018 18:22:14 +0000 (18:22 +0000)]
Merge "Add delay to notifications before they can be dismissed."
Android Build Merger (Role) [Mon, 18 Jun 2018 18:18:40 +0000 (18:18 +0000)]
[automerger] Merge "Fade to black without showing system wallpaper" into pi-dev am:
0e52664b0c am:
2e575f413c
Change-Id: I28b6f791597056c07b504d070ab704d74a37d1df
Lucas Dupin [Mon, 18 Jun 2018 18:17:44 +0000 (11:17 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev
am:
0e52664b0c
Change-Id: I7aeb34e75245f5bc9974110d9847efd03445acbd
Lucas Dupin [Mon, 18 Jun 2018 18:17:34 +0000 (11:17 -0700)]
Merge "Fade to black without showing system wallpaper" into pi-dev
am:
0e52664b0c
Change-Id: I68c83452ffcff8424aa58a0527a14f90497990d1
Aaron Heuckroth [Thu, 14 Jun 2018 18:28:08 +0000 (14:28 -0400)]
Add delay to notifications before they can be dismissed.
Test: Run jank tests. Create notifications with a delay, then attempt
to swipe them away as soon as they are perceivable to the user.
Swiping during the animation should not result in notification dismissal,
but swiping after the animation completes should.
Fixes:
70293267
Change-Id: Ibca02666255693255185b8bd326cc97d8c574b2e
Lucas Dupin [Mon, 18 Jun 2018 18:08:41 +0000 (18:08 +0000)]
Merge "Fade to black without showing system wallpaper" into pi-dev
Selim Cinek [Mon, 18 Jun 2018 17:52:53 +0000 (10:52 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am:
ed9df0d176
am:
ae158f3925
Change-Id: Ieb7a009989c3f505c1f799e7eabc243929957a8b
Android Build Merger (Role) [Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)]
[automerger] Merge "Fixed an issue where the contentHeight was wrong" into pi-dev am:
ed9df0d176 am:
5c2a056a83
Change-Id: I501b10108f3f075b171ed0d97bc0ae1385e49a55
Selim Cinek [Mon, 18 Jun 2018 17:45:01 +0000 (10:45 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am:
ed9df0d176
Change-Id: Ib607094d49ba35e14dd33d6993e343cda7594b5f
Selim Cinek [Mon, 18 Jun 2018 17:45:00 +0000 (10:45 -0700)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
am:
ed9df0d176
Change-Id: I7f9778580993a4762895839136209d307fdc765a
TreeHugger Robot [Mon, 18 Jun 2018 17:41:22 +0000 (17:41 +0000)]
Merge "Improved logging on autofill authentication."
felkachang [Mon, 11 Jun 2018 07:56:15 +0000 (15:56 +0800)]
Fix NotificaitonPanelView x-axis shift with IME
IME will trigger the fitSystemWindow. And, there is a difference of
the parameter insets between IME and no IME. The insets.right and
insets.left report 0 without IME but positive number with IME
because IME is a type of system window and trigger fitSystemWindow
and then take the cutout as part of system window.
StatusBarWindowView handle the following condition
cutout > 0 && cutout == systemWindowInset and make its children not
layout on the safe inset both of cut out and system window. In order
to handle that cut out become system window, to take the maximum of
cut out and system window to make sure that the safe inset is
decided in StatusBarWindowView and its view decent only care about
the corner cut out.
Because StatusBarWindowView make both of PhoneStatusBarView's parent
and NotificationPanelView to have the margin for both of cutout and
system window, the counting of the padding and panel translation of
the HeadsUpStatusBarView need to do the relative changes.
Change-Id: Iafdc6a85e0e7d360b1bfc1e820f6e0779c32753f
Fix:
79957419
Fix:
109945733
Fix:
109865908
Test: atest SystemUITests
Selim Cinek [Mon, 18 Jun 2018 17:32:20 +0000 (17:32 +0000)]
Merge "Fixed an issue where the contentHeight was wrong" into pi-dev
TreeHugger Robot [Mon, 18 Jun 2018 17:31:32 +0000 (17:31 +0000)]
Merge "Fixes for enqueued adjustments"
Lucas Dupin [Mon, 18 Jun 2018 17:21:42 +0000 (10:21 -0700)]
Merge "Pulse animation synchronization" into pi-dev am:
32066387e1
am:
f7dc3e269c
Change-Id: I9df3bdc93d2a6999334984bbdf487c73dc9f869c
Android Build Merger (Role) [Mon, 18 Jun 2018 17:09:56 +0000 (17:09 +0000)]
[automerger] Merge "Pulse animation synchronization" into pi-dev am:
32066387e1 am:
a5ca4128ef
Change-Id: I9b24483005a0cb0a714fc5816200d60e165c4144
Lucas Dupin [Mon, 18 Jun 2018 17:09:35 +0000 (10:09 -0700)]
Merge "Pulse animation synchronization" into pi-dev
am:
32066387e1
Change-Id: I8c3737cff95213b63fbee10195c6a246829b2843
Fan Zhang [Mon, 18 Jun 2018 16:42:38 +0000 (09:42 -0700)]
Fix StringIndexOutOfBoundsException in AccessibilityUtils
The string splitter is a sigleton but the access is not thread-safe. So
now it's changed to be a local instance to avoid threading problems.
Also removed a few unused test classes as clean up.
Change-Id: Ia2b3f3058fcbb0b28afff4e3d1b29184072bf45e
Fixes:
110255579
Test: robotests
Lucas Dupin [Mon, 18 Jun 2018 17:09:03 +0000 (10:09 -0700)]
Merge "Pulse animation synchronization" into pi-dev
am:
32066387e1
Change-Id: Ia2c8219d869fb61d22b5b81bf641fd488a5415a9
TreeHugger Robot [Mon, 18 Jun 2018 16:57:24 +0000 (16:57 +0000)]
Merge "Pulse animation synchronization" into pi-dev
Treehugger Robot [Mon, 18 Jun 2018 16:55:28 +0000 (16:55 +0000)]
Merge "Enabled annotations for Metalava based api-stubs."
TreeHugger Robot [Mon, 18 Jun 2018 16:49:51 +0000 (16:49 +0000)]
Merge "Remove dependency on IME subtype from TSMS"
Lucas Dupin [Mon, 11 Jun 2018 23:18:15 +0000 (16:18 -0700)]
Fade to black without showing system wallpaper
When on the lock screen, and going to AOD animated, user would
temporarily see the system wallpaper. That's not what we want,
we want to fade from semi-transparent black to black, on top
of the backdrop - lock screen wallpaper or media art.
Test: press power on the lock screen when playing media
Test: press power on the lock screen after dismissing media
Test: unlock from AOD
Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
Fixes:
80575770
Change-Id: I6796e844add889ff86be0cd2052db7c5d5073039
Jorim Jaggi [Mon, 18 Jun 2018 16:18:52 +0000 (09:18 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev am:
e8a1e7a423
am:
04749aa5c6 -s ours
Change-Id: I3145ec152a52aa552114b6fcf4f1e02ec24bd42f
Android Build Merger (Role) [Mon, 18 Jun 2018 16:10:26 +0000 (16:10 +0000)]
[automerger skipped] Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev am:
e8a1e7a423 skipped:
ea7b5d8020
Change-Id: I73708c52edf65365e4bf961b51211710d05bfcdb
Jorim Jaggi [Mon, 18 Jun 2018 16:09:43 +0000 (09:09 -0700)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am:
e8a1e7a423
Change-Id: I160e9cab3b4ebd4d5a39443b8ea3990a7943d102
Jorim Jaggi [Mon, 18 Jun 2018 16:09:33 +0000 (09:09 -0700)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am:
e8a1e7a423
Change-Id: I2b70059cc6735bfdf3fd60f4837b413f8966c637
Jorim Jaggi [Mon, 18 Jun 2018 15:52:09 +0000 (15:52 +0000)]
Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
Jorim Jaggi [Mon, 18 Jun 2018 15:46:32 +0000 (08:46 -0700)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev am:
58150a7e6e
am:
8897621da4
Change-Id: I5df4d999aeb2acb702af78ab3de308380dd5904a
Android Build Merger (Role) [Mon, 18 Jun 2018 15:39:44 +0000 (15:39 +0000)]
[automerger] Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev am:
58150a7e6e am:
f3ebcb5905
Change-Id: Iabeab79445e736401ba39cc09331bdbf501c66af
Jorim Jaggi [Mon, 18 Jun 2018 15:38:58 +0000 (08:38 -0700)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
am:
58150a7e6e
Change-Id: Ifeac639bd3d5b3dcd969beb0a6f9168c7971e5cf
Jorim Jaggi [Mon, 18 Jun 2018 15:38:51 +0000 (08:38 -0700)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
am:
58150a7e6e
Change-Id: I02e61ad1e4759433fa39cb8d16e8926382d415f8
Julia Reynolds [Mon, 18 Jun 2018 14:19:20 +0000 (10:19 -0400)]
Fixes for enqueued adjustments
- Accept adjustments that arrie too late - send through the
normal 'apply adjustment to posted notification' flow
- Apply adjustments that are received onEnqueue
Test: runtest systemui-notification
Bug:
110347047
Change-Id: Ic4c9839cf2f63ef1689d72eb291f6bfae8f0674b
Jorim Jaggi [Mon, 18 Jun 2018 15:25:03 +0000 (15:25 +0000)]
Merge "Prevent showing windows while animating to avoid color mode switch" into pi-dev
Wale Ogunwale [Tue, 8 May 2018 20:43:21 +0000 (13:43 -0700)]
Switched ActivityStack.mService to ActivityTaskManagerService (7/n)
Objects that contain or represent activities like ActivityStack can
no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I7ea20169245bee91f1be254ac30e88d2382c62a3
TreeHugger Robot [Mon, 18 Jun 2018 14:49:11 +0000 (14:49 +0000)]
Merge "Switched TaskRecord.mService to ActivityTaskManagerService (6/n)"
Julia Reynolds [Mon, 18 Jun 2018 14:11:26 +0000 (14:11 +0000)]
Merge "Fix notification interruption stats"
Jorim Jaggi [Fri, 8 Jun 2018 13:25:35 +0000 (15:25 +0200)]
Prevent showing windows while animating to avoid color mode switch
If we switch the color mode during a transition, it's pretty much
guaranteed that SF is going to jank. To work around that, we
disallow showing the real content while an activity with a
non-standard-color mode is animating.
Test: Reopen photos, observe no jank
Bug:
79878256
Change-Id: Id27db483844d9424ccfb9afdebd31325eae0cdd8
Wale Ogunwale [Tue, 8 May 2018 17:35:38 +0000 (10:35 -0700)]
Switched TaskRecord.mService to ActivityTaskManagerService (6/n)
Objects that contain or represent activities like TaskRecord can
no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: Ia17591f7d709839c18762d1eb2474b2e2f649dfc
Android Build Merger (Role) [Mon, 18 Jun 2018 13:12:56 +0000 (13:12 +0000)]
[automerger] Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4 am:
bba3c54256
Change-Id: Ia5fc6a5bef9664456dccf594798f2ccc53975720
Ahmed ElArabawy [Mon, 18 Jun 2018 13:12:22 +0000 (06:12 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
am:
ef4a56f9e4
Change-Id: I623d20464db6ebd8efe589987606f23c870d6283
Android Build Merger (Role) [Mon, 18 Jun 2018 13:05:41 +0000 (13:05 +0000)]
[automerger] Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7 am:
42fb737d13 am:
abac6b84c1
Change-Id: I4af26a8ef76833a741ef62f21bcb42adbed6d5b2
Android Build Merger (Role) [Mon, 18 Jun 2018 13:05:21 +0000 (13:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours am:
bc1dc5c368 -s ours am:
8d70303da7 -s ours skipped:
13d94b91d2
Change-Id: I614fa2aebd202c9478ff782f4762cd22eb8a87af
Bill Yi [Mon, 18 Jun 2018 13:04:41 +0000 (06:04 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7
am:
42fb737d13
Change-Id: I38f6349a440fb068af4a6382c11b0914e30e6047
Android Build Merger (Role) [Mon, 18 Jun 2018 12:57:30 +0000 (12:57 +0000)]
Merge "Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4 am:
77d5344926"
Bill Yi [Mon, 18 Jun 2018 12:56:01 +0000 (05:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours am:
bc1dc5c368 -s ours
am:
8d70303da7 -s ours
Change-Id: I8fc6b85610ce5747d02053c587c4e8cd05be4a42
Android Build Merger (Role) [Mon, 18 Jun 2018 12:55:32 +0000 (12:55 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours am:
97ee183747 -s ours am:
15123e0230 -s ours skipped:
86b491a574
Change-Id: Ib1f7efbe4b2dbacfdcf6c64d94416a11c7feed3f
Ahmed ElArabawy [Mon, 18 Jun 2018 12:55:20 +0000 (05:55 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4
am:
77d5344926
Change-Id: I89f4fc12b5a566a060cbdc88debad2c5108e0b72
Bill Yi [Mon, 18 Jun 2018 12:55:01 +0000 (05:55 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours am:
97ee183747 -s ours
am:
15123e0230 -s ours
Change-Id: Ide3590768b6e472991376ced275114191a3f552d
Android Build Merger (Role) [Mon, 18 Jun 2018 12:54:28 +0000 (12:54 +0000)]
[automerger] Merge "Skip null values in Utils.safeForeach" into pi-dev am:
c5901f5a06 am:
547d43e878
Change-Id: I319ccd1f3da743a286b7fc451743ce22906b4bef
Beverly [Mon, 18 Jun 2018 12:54:05 +0000 (05:54 -0700)]
Merge "Skip null values in Utils.safeForeach" into pi-dev
am:
c5901f5a06
Change-Id: I7a715578f6e715262ccb294d2e5ea2326ae1c075
Android Build Merger (Role) [Mon, 18 Jun 2018 12:49:52 +0000 (12:49 +0000)]
[automerger] Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce am:
114e58a6f9
Change-Id: I72e82a69c75b1ad155dcb8c657175248b68442ab
Kevin Chyn [Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am:
a74fbef8ce
Change-Id: I28f349b3674126a85731489fd8119b41385934a7
Jorim Jaggi [Mon, 18 Jun 2018 12:24:11 +0000 (14:24 +0200)]
DO NOT MERGE Fix crash in case of no overlays
Fixes:
110330180
Test: Rotate a device without overlays/cutout
Change-Id: Ib0701e26893489fcee0de6aaec26901aef0b8348
Android Build Merger (Role) [Mon, 18 Jun 2018 12:44:53 +0000 (12:44 +0000)]
[automerger] Merge "Hiding replied notification icons from AOD" into pi-dev am:
37e96a8fa5 am:
fb0a932ccc
Change-Id: I6633bfc08619d736664eae529fcec03763edbd1d
Selim Cinek [Mon, 18 Jun 2018 12:44:33 +0000 (05:44 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev
am:
37e96a8fa5
Change-Id: Iee5f8b80ead2427af699f72aad297617b2fc3329
Ahmed ElArabawy [Mon, 18 Jun 2018 12:40:36 +0000 (05:40 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
am:
ef4a56f9e4
Change-Id: I360dc4b35d2b6acf956fd442299df330d54cbb5d
Android Build Merger (Role) [Mon, 18 Jun 2018 12:40:14 +0000 (12:40 +0000)]
[automerger] Merge changes I90451c14,I9fb27a0a into pi-dev am:
b91dd1d944 am:
f000c614dc
Change-Id: If0984fc32694d47900095e278922834ddc36aa63
Adrian Roos [Mon, 18 Jun 2018 12:39:20 +0000 (05:39 -0700)]
Merge changes I90451c14,I9fb27a0a into pi-dev
am:
b91dd1d944
Change-Id: I0e33553729a96e597b8e6f8e741b6cae37504175
Ahmed ElArabawy [Mon, 18 Jun 2018 12:26:40 +0000 (12:26 +0000)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
Chalard Jean [Mon, 18 Jun 2018 11:17:19 +0000 (04:17 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am:
84d4e535ae am:
ea044ca373
am:
52688e800f
Change-Id: If2794c9ff81ecad4b30a5c7c2578c1ee7e8c85b9
Chalard Jean [Mon, 18 Jun 2018 11:07:09 +0000 (04:07 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am:
84d4e535ae
am:
ea044ca373
Change-Id: Iea011d1dc5df03b58fcbb9dcbd4833b20cb5b5a8
Chalard Jean [Mon, 18 Jun 2018 10:06:05 +0000 (03:06 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
am:
84d4e535ae
Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee
Chalard Jean [Mon, 18 Jun 2018 09:00:40 +0000 (09:00 +0000)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
* changes:
[PT09] Add javadoc comments to all ProxyTracker methods/members.
[PT08] Move setDefaultProxy to ProxyTracker
[PT07] Small cleanup of setGlobalProxy
Kazuki Takise [Mon, 18 Jun 2018 08:55:09 +0000 (08:55 +0000)]
Merge "Add always on top feature support"
Andreas Gampe [Mon, 18 Jun 2018 08:37:04 +0000 (01:37 -0700)]
Merge "Apf: Avoid constant overflow" am:
5b99659943 am:
4afe1f957b
am:
a2f5d7481c
Change-Id: I5b33123f2044cc00c5516be8bcbe82591c78b670
OSDN Git Service
