OSDN Git Service
Christopher Ferris [Sat, 16 Jun 2018 06:56:14 +0000 (23:56 -0700)]
[automerger skipped] Merge "Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787" into pi-dev-plus-aosp
am:
da5fb6eac7 -s ours
Change-Id: If0cfb06266b5d75dc50d900117a154b94823853b
Christopher Ferris [Sat, 16 Jun 2018 06:32:04 +0000 (23:32 -0700)]
[automerger skipped] Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787
am:
4d5ba2e496 -s ours
Change-Id: I4f1d4939e3b45b57dea8b8af2392501351e2b84b
Beverly [Sat, 16 Jun 2018 06:14:36 +0000 (23:14 -0700)]
Merge "Skip null values in Utils.safeForeach" into pi-dev am:
c5901f5a06
am:
e0d3e1c2d5
Change-Id: I9d1d3756c508771551b727755a1cab86e2aa4afb
Kevin Chyn [Sat, 16 Jun 2018 06:07:17 +0000 (23:07 -0700)]
Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce" into pi-dev-plus-aosp
am:
fe611a5700
Change-Id: I1aba793c0c71573e06d52f14aec823a4f6d3ad93
Android Build Merger (Role) [Sat, 16 Jun 2018 05:58:39 +0000 (05:58 +0000)]
Merge "Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787" into pi-dev-plus-aosp
Christopher Ferris [Sat, 16 Jun 2018 05:58:09 +0000 (22:58 -0700)]
Merge "Use the malloc debug heap dumper." am:
0ec0c17596
am:
84c9e9a787
Change-Id: I96c46291cc73c021945c370c7bb33164bc0a3a0b
Colin Cross [Sat, 16 Jun 2018 05:56:59 +0000 (22:56 -0700)]
Merge "Fix ManifestMerger issues" am:
684b5f038b am:
c5e5b64b04
am:
6c40e4745d
Change-Id: Ide97a39158b8ec9310ded188fa9f75c6795fc2b5
Beverly [Sat, 16 Jun 2018 05:55:05 +0000 (22:55 -0700)]
Merge "Skip null values in Utils.safeForeach" into pi-dev
am:
c5901f5a06
Change-Id: I60c1ee2c2036b883a456d916e26576bb206a39ec
Android Build Merger (Role) [Sat, 16 Jun 2018 05:50:04 +0000 (05:50 +0000)]
Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce" into pi-dev-plus-aosp
Kevin Chyn [Sat, 16 Jun 2018 05:49:30 +0000 (22:49 -0700)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am:
a74fbef8ce
Change-Id: Ib14cc5a35991dec3623ecf2dfdb72cbbccd7e53e
Colin Cross [Sat, 16 Jun 2018 05:46:10 +0000 (22:46 -0700)]
Merge "Fix ManifestMerger issues" am:
684b5f038b
am:
c5e5b64b04
Change-Id: I4b8e51aaec1f825e4ccf7ccbc60e61b82e05c509
Christopher Ferris [Sat, 16 Jun 2018 05:41:30 +0000 (22:41 -0700)]
Merge "Use the malloc debug heap dumper."
am:
0ec0c17596
Change-Id: I0f0d6a01a4a0d55f18e3f7b7ac7c64534d4b8f54
TreeHugger Robot [Sat, 16 Jun 2018 03:16:06 +0000 (03:16 +0000)]
Merge "Skip null values in Utils.safeForeach" into pi-dev
TreeHugger Robot [Sat, 16 Jun 2018 00:44:22 +0000 (00:44 +0000)]
Merge "WM: Fix seamless rotation"
TreeHugger Robot [Sat, 16 Jun 2018 00:28:17 +0000 (00:28 +0000)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
TreeHugger Robot [Sat, 16 Jun 2018 00:10:10 +0000 (00:10 +0000)]
Merge "[Notif] Reset falsing check for blocking helper"
Colin Cross [Fri, 15 Jun 2018 23:59:21 +0000 (16:59 -0700)]
Merge "Fix ManifestMerger issues"
am:
684b5f038b
Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
Selim Cinek [Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev am:
37e96a8fa5
am:
0dac634ed0
Change-Id: I774d517aa5312c149c256c3955022fa28933cda9
Adrian Roos [Fri, 15 Jun 2018 23:39:35 +0000 (16:39 -0700)]
[automerger skipped] Merge changes I90451c14,I9fb27a0a into pi-dev am:
b91dd1d944
am:
22ffb55de6 -s ours
Change-Id: I29096c00ca57a4b872f31f3c79bf75239bef56be
Adrian Roos [Thu, 7 Jun 2018 13:29:34 +0000 (15:29 +0200)]
WM: Fix seamless rotation
With the introduction of the surface hierarchy, the seamless rotation
behavior in WSA is no longer correct: it also applies the WindowState's
offset, which leads to that being applied twice.
Instead of doing that, we simply rotate the WSA surface within the place
that WindowState dictates now.
Finally, the location of the WindowState itself also needs to be
transformed into the new orientation.
Fixes:
109927566
Test: atest CoordinateTransformsTest
Test: atest 'WindowStateTests#testSeamlesslyRotateWindow'
Change-Id: I9fb27a0a8a2bddc6ec88a4fcce6d6ea00929fb91
(cherry picked from commit
41f7e9d10306603c7a4410938e77418f13f6e939)
TreeHugger Robot [Fri, 15 Jun 2018 23:10:50 +0000 (23:10 +0000)]
Merge "Removed TODO introduced in ag/
4344061"
TreeHugger Robot [Fri, 15 Jun 2018 22:53:18 +0000 (22:53 +0000)]
Merge "Make oneway calls from AFM to AFMS."
TreeHugger Robot [Fri, 15 Jun 2018 22:28:27 +0000 (22:28 +0000)]
Merge "Fix missing entries in TSMS dump"
Selim Cinek [Fri, 15 Jun 2018 21:53:49 +0000 (14:53 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev
am:
37e96a8fa5
Change-Id: I60a5aa171261b97b4f6de41515332fa93016eb8d
Adrian Roos [Fri, 15 Jun 2018 21:48:23 +0000 (14:48 -0700)]
Merge changes I90451c14,I9fb27a0a into pi-dev
am:
b91dd1d944
Change-Id: I58459846d6cb79d616b4bd9c83450dc911e5115c
Wale Ogunwale [Fri, 15 Jun 2018 21:47:46 +0000 (14:47 -0700)]
Removed TODO introduced in ag/
4344061
After further digging, we determined that the workaround is the
best way forward.
Change-Id: If046cdd16a22f0eec63a611eb21ce5e4c875896d
Fixes:
110159357
Test: N/A
TreeHugger Robot [Fri, 15 Jun 2018 21:44:28 +0000 (21:44 +0000)]
Merge "Update user on user switched for color inversion"
Felipe Leme [Wed, 6 Jun 2018 23:27:56 +0000 (16:27 -0700)]
Make oneway calls from AFM to AFMS.
AFM should not block the UI thread when calling AFMS; this CL is a
"low-hanging fruit" change that makes oneway call from the existing functions
that return void.
Test: mmma -j ./frameworks/base/apct-tests/perftests/autofill/ && \
adb install -r $OUT/data/app/AutofillPerfTests/AutofillPerfTests.apk && \
adb shell am instrument -w -e class android.view.autofill.LoginTest \
com.android.perftests.autofill/android.support.test.runner.AndroidJUnitRunner
Test: CtsAutoFillServiceTestCases
Bug:
73536867
Change-Id: I09e84b797153cd02d3c02262994a2be1f38639ea
Christopher Ferris [Fri, 15 Jun 2018 21:36:42 +0000 (21:36 +0000)]
Merge "Use the malloc debug heap dumper."
TreeHugger Robot [Fri, 15 Jun 2018 21:26:31 +0000 (21:26 +0000)]
Merge "Fixed an issue where the shadow wasn't rounded properly"
Yohei Yukawa [Fri, 15 Jun 2018 21:09:31 +0000 (14:09 -0700)]
Fix missing entries in TSMS dump
This CL fixes another regression that was introduced when we enabled
multiple users to use spell checker APIs at the same time [1].
Somehow TextServicesManagerService#mOnGoingSessionRequests were not
fully dumped into dumpsys due to an unnecessary '++j' in the loop.
[1]: I06c27ef834203a21cc445dc126602c799384527b
06a2624049f09e1ad68f8ab74fdb525aacd5c1e5
Bug:
63041121
Test: Manually verified that 'adb shell dumpsys textservices' dumps
all the elements in #mOnGoingSessionRequests.
Change-Id: Ia26ab1c8ca19e74aaefb8562fb06ff64c3d8d677
Treehugger Robot [Fri, 15 Jun 2018 20:47:30 +0000 (20:47 +0000)]
Merge "Fix ManifestMerger issues"
Selim Cinek [Fri, 15 Jun 2018 20:44:08 +0000 (20:44 +0000)]
Merge "Hiding replied notification icons from AOD" into pi-dev
Adrian Roos [Fri, 15 Jun 2018 20:28:13 +0000 (20:28 +0000)]
Merge changes I90451c14,I9fb27a0a into pi-dev
* changes:
DO NOT MERGE WM: correctly draw the rounded corner / cutout overlay during rotation
WM: Fix seamless rotation
Rohan Shah [Thu, 14 Jun 2018 20:14:18 +0000 (13:14 -0700)]
[Notif] Reset falsing check for blocking helper
Currently, if you long press on the notif in lock screen and then are
interacting with the blocking helper UI (NotificationInfo), the content
automatically closes after 8 seconds even if you've hit stop/undo/etc.
Instead of letting this happen, reset the timeout.
Test: Manually that it doesn't timeout after 8s on LS after update
Bug:
110213459
Change-Id: I0169a7749b718714595bd7239375308f30bf4c43
Christopher Ferris [Wed, 13 Jun 2018 20:19:57 +0000 (13:19 -0700)]
Use the malloc debug heap dumper.
Instead of having the malloc debug heap dump code live in frameworks
code, call into malloc debug to do the dump.
Test: Ran am dumpheap -n <PID> <FILE> of a process with and without
Test: malloc debug enabled.
Change-Id: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
Merged-In: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
(cherry picked from commit
38e2c3bc9c50770aa5efce47f90fbcfcdda523de)
Christopher Ferris [Fri, 15 Jun 2018 19:19:25 +0000 (19:19 +0000)]
Merge "Use the malloc debug heap dumper."
TreeHugger Robot [Fri, 15 Jun 2018 18:48:36 +0000 (18:48 +0000)]
Merge "Remove log spam in MediaRouter"
TreeHugger Robot [Fri, 15 Jun 2018 18:07:52 +0000 (18:07 +0000)]
Merge changes Idad77721,I9717ac4b
* changes:
Split internal interface activities from current AM interface (3/n)
Cancel Pip animation if stack is already removed
Eric Laurent [Fri, 15 Jun 2018 18:06:47 +0000 (11:06 -0700)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev am:
706303541e
am:
94dce7ac8b
Change-Id: I001c3b390be7ee4e5522a5fd2599c9f34e6a7686
Android Build Merger (Role) [Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)]
[automerger] Merge "audioservice: fix a2dp connection race condition" into pi-dev am:
706303541e am:
c9abc289a0
Change-Id: Iabc86b907a6a430b824e876bab44b8cee192a71a
Eric Laurent [Fri, 15 Jun 2018 17:59:08 +0000 (10:59 -0700)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev
am:
706303541e
Change-Id: I7ce96cb90aad6c826bbeb7be0e80950f2a89b517
Philip P. Moltmann [Fri, 15 Jun 2018 17:58:56 +0000 (10:58 -0700)]
Merge "Abbreviate permission labels less aggressively" into pi-dev am:
af76df93e3
am:
53427b7237
Change-Id: I20ae335fec3d0837bdbbe524b8a6576560dff948
Eric Laurent [Fri, 15 Jun 2018 17:58:55 +0000 (10:58 -0700)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev
am:
706303541e
Change-Id: Id4bbff8834f97f60c211dd3c45ce59af95fbb810
Android Build Merger (Role) [Fri, 15 Jun 2018 17:48:50 +0000 (17:48 +0000)]
[automerger] Merge "Abbreviate permission labels less aggressively" into pi-dev am:
af76df93e3 am:
3dce361445
Change-Id: Iea45f6992477e090e0f7ecaf2c4689354ad24786
Philip P. Moltmann [Fri, 15 Jun 2018 17:48:34 +0000 (10:48 -0700)]
Merge "Abbreviate permission labels less aggressively" into pi-dev
am:
af76df93e3
Change-Id: I61a45dd4489c930f2c5b3fbcf6f7632771d6f18e
Philip P. Moltmann [Fri, 15 Jun 2018 17:48:02 +0000 (10:48 -0700)]
Merge "Abbreviate permission labels less aggressively" into pi-dev
am:
af76df93e3
Change-Id: Ic78313f9bf162478b76ef35028659a1c93c9c58d
Eric Laurent [Fri, 15 Jun 2018 17:43:42 +0000 (17:43 +0000)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev
Sungsoo Lim [Mon, 11 Jun 2018 03:55:25 +0000 (12:55 +0900)]
Remove log spam in MediaRouter
Bug:
110007356
Test: build
Change-Id: I249154eaf3c009429bb9731ca38b9e5eec271670
Selim Cinek [Wed, 30 May 2018 18:47:08 +0000 (11:47 -0700)]
Fixed an issue where the shadow wasn't rounded properly
Previously the implementation required the bottom roundness
to be treated specially when it came to the outline and
the clip path but this isn't necessary anymore and was
leading to issues with the shadows.
We now always apply the clipBottomAmount to the outline and
the clipping and can remove the special case.
Test: add notification, observe rounded clipping on bottom
Test: add groups, observe normal rounded clipping
Fixes:
80431867
Change-Id: Id65d11ce48c08adc138e1177226a03bc25ef6345
Beverly [Wed, 13 Jun 2018 14:49:26 +0000 (10:49 -0400)]
Update user on user switched for color inversion
When the user switches, also update the user associated
with the listener for color inversion of the rounded
corners and display cutout.
Fixes:
110037623
Test: manually switch to secondary user, set color inversion on/off
and see cutout is the correct color (it should always be black)
Change-Id: I53dcffa374cb46c212f25d402c7e8a35da667624
Beverly [Fri, 15 Jun 2018 15:04:02 +0000 (11:04 -0400)]
Skip null values in Utils.safeForeach
Test: ZenModeControllerImplTest.java
Bug:
110209145
Change-Id: I4234be630c84444a70d8cb380ca6a692a4ff5cbc
TreeHugger Robot [Fri, 15 Jun 2018 17:20:59 +0000 (17:20 +0000)]
Merge "Skip null values in Utils.safeForeach"
Philip P. Moltmann [Fri, 15 Jun 2018 17:18:52 +0000 (17:18 +0000)]
Merge "Abbreviate permission labels less aggressively" into pi-dev
Wale Ogunwale [Thu, 3 May 2018 22:52:51 +0000 (15:52 -0700)]
Split internal interface activities from current AM interface (3/n)
3rd step in unifying the window hierarchy that is currently split
within AM and WM packages. We separate the the internal interface used
to communicate within system server dealing with activities and their
containers (tasks, stack, display) from the rest of AM internal
interface.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: Idad77721c1fe10621b9be5dced42a0a11f0183e5
Wale Ogunwale [Fri, 15 Jun 2018 15:26:07 +0000 (08:26 -0700)]
Cancel Pip animation if stack is already removed
It is possible for the pinned stack to be removed before the system has
a chance to run the scheduled bounds animation on it. In this case we
should just cancel the animation.
Also fixed:
- Issue where we are synchronizing on the wrong object in
PinnedActivityStack.updatePictureInPictureModeForPinnedStackAnimation
- Issue where the enterPipRunnable in
ActivityTaskManagerService.enterPictureInPictureMode wasn't synchronized
Change-Id: I9717ac4b5849eafa6332fb0043310a0e8387a05f
Fixes:
110255768
Test: atest ActivityManagerActivityVisibilityTests#testHomeVisibleOnActivityTaskPinned
Beverly [Fri, 15 Jun 2018 15:04:02 +0000 (11:04 -0400)]
Skip null values in Utils.safeForeach
Test: ZenModeControllerImplTest.java
Bug:
110209145
Change-Id: I4234be630c84444a70d8cb380ca6a692a4ff5cbc
Amin Shaikh [Tue, 12 Jun 2018 22:25:43 +0000 (18:25 -0400)]
Do not announce selected state for QS tiles.
Change-Id: Ia461baa4a12818a0e91c6e1862eb9e13e232e720
Fixes:
110105146
Test: manual
Anton Philippov [Fri, 4 May 2018 18:53:34 +0000 (19:53 +0100)]
Use FullRestoreEngine in adb restore.
PerformAdbRestoreTask and FullRestoreEngine has shared a lot of code,
remove the copy that was in PerformAdbRestoreTask.
Test: adb restore
Change-Id: Ib4ce8b50eff8aed4a2c0660808c05b80f378ea98
Bernardo Rufino [Fri, 15 Jun 2018 08:43:50 +0000 (08:43 +0000)]
Merge "Protect unbindBackupAgent() with CONFIRM_FULL_BACKUP permission"
Bill Lin [Wed, 13 Jun 2018 11:26:15 +0000 (19:26 +0800)]
Adjust QuickQSPanel to fit Tablet display size
- Remove legacy standard_notification_panel_width
- Define default max columns for QQS layout
- Fix Pixcel C & Nexus 7 QQS Tiles over boundry problem
Test: atest SystemUITests
Fix:
110123402
Change-Id: I18ab3d966b3d18775d0b13d6d60d7c09485ba8ae
Sundong Ahn [Fri, 15 Jun 2018 05:26:03 +0000 (22:26 -0700)]
Merge "Build com.android.location.provider with java_sdk_library" am:
aa5d8dfeb0 am:
abdaa314f8
am:
07fed30c31
Change-Id: If214f52c141ef4d0f106bc3f5d2778f9b8f40b1e
Sundong Ahn [Fri, 15 Jun 2018 05:12:45 +0000 (22:12 -0700)]
Merge "Build com.android.location.provider with java_sdk_library" am:
aa5d8dfeb0
am:
abdaa314f8
Change-Id: If55a20564704769fc750fb6675533e9a0b8f3b6a
Bernie Innocenti [Fri, 15 Jun 2018 05:12:11 +0000 (22:12 -0700)]
Merge "Make dumpHexString() tolerate null arrays." am:
a917c1db32 am:
7bb253d078
am:
3e0f3ef8ad
Change-Id: I1fbea877d10b4f270fc1722ec1c14e9bd8f131a3
Bernie Innocenti [Fri, 15 Jun 2018 05:02:58 +0000 (22:02 -0700)]
Merge "Make dumpHexString() tolerate null arrays." am:
a917c1db32
am:
7bb253d078
Change-Id: Id58b8039510baa518d8d10b03237681a7b842d0f
Sundong Ahn [Fri, 15 Jun 2018 04:59:40 +0000 (21:59 -0700)]
Merge "Build com.android.location.provider with java_sdk_library"
am:
aa5d8dfeb0
Change-Id: I53720ed4fcbe9f00f2f1f607d07efa9adaaf7bb4
Bernie Innocenti [Fri, 15 Jun 2018 04:55:53 +0000 (21:55 -0700)]
Merge "Make dumpHexString() tolerate null arrays."
am:
a917c1db32
Change-Id: Ib0160e232cab0a713853a65eef26f7a02d65c1f1
Treehugger Robot [Fri, 15 Jun 2018 03:41:18 +0000 (03:41 +0000)]
Merge "Build com.android.location.provider with java_sdk_library"
TreeHugger Robot [Fri, 15 Jun 2018 03:30:24 +0000 (03:30 +0000)]
Merge "Refresh visible IME proc boost upon onBindingDied"
Tony Huang [Fri, 15 Jun 2018 03:22:43 +0000 (20:22 -0700)]
Fix solid circle show on message notification am:
1250cd1407
am:
cb74f9c13d
Change-Id: I74ddf43c3da0f8f567c9ab6aef18a6cbdcfebca5
Android Build Merger (Role) [Fri, 15 Jun 2018 03:14:48 +0000 (03:14 +0000)]
[automerger] Fix solid circle show on message notification am:
1250cd1407 am:
51e6cce63c
Change-Id: I20b8317a34eac3642ec6054f5f2332d1e001a7ab
Tony Huang [Fri, 15 Jun 2018 03:13:32 +0000 (20:13 -0700)]
Fix solid circle show on message notification
am:
1250cd1407
Change-Id: I9742ab1f93c797e23d4545d6659efcfa4808b03c
Tony Huang [Fri, 15 Jun 2018 03:13:30 +0000 (20:13 -0700)]
Fix solid circle show on message notification
am:
1250cd1407
Change-Id: I805908a107f7e082a0f5c3294a777235efa74b16
Tony Huang [Wed, 6 Jun 2018 07:40:47 +0000 (15:40 +0800)]
Fix solid circle show on message notification
Message app or other apps will use some format code or controll
code on SenderName to fit RTL or other design, and symbols will
produced by these code. The special code pattern not include these
code, so it will go charIcon flow.
Although these code is not visible, we should just ignore them to
get symbol strings
Change-Id: I20ef459b10ba7504ec0c997ed815cb485817d2bc
Fixes:
109746235
Test: Check notification form message app on RTL
Test: atest SystemUITests
Tiger Huang [Fri, 15 Jun 2018 02:50:44 +0000 (02:50 +0000)]
Merge "Perform layout after removing the focused window"
Treehugger Robot [Fri, 15 Jun 2018 02:32:54 +0000 (02:32 +0000)]
Merge "Make dumpHexString() tolerate null arrays."
Adrian Roos [Thu, 31 May 2018 16:07:28 +0000 (18:07 +0200)]
DO NOT MERGE WM: correctly draw the rounded corner / cutout overlay during rotation
When we freeze the screen, we really don't want the overlay to appear
on the screenshot - otherwise this will lead to it rotating with the
screen content. This means the overlay currently disappears during the
transition. We cannot just draw it over the screenshot, because it
might be in inconsistent state.
We fix this by temporarily undoing the effects of the screen rotation
transform on the overlay's window token. Then, once the window has
performed relayout and is redrawn in the new orientation, we switch to
that representation. This is mostly seamless rotation, with the
difference that we force it always, and it must also work for 180
degree rotation (which regular seamless rotation does not).
Do not merge, because we want to harmonize seamless rotation and the
newly added forced seamless rotation in Q.
Also move the rounded corner overlay from the display overlay layer
to the root of the hierarchy such that it can draw over the screen
off animation's ColorLayer.
Bug:
79112140
Test: Enable display cutout overlay, rotate phone to all orientations, ensure that emulated display cutout never flashes or disappears.
Test: atest CoordinateTransformsTest
Change-Id: I90451c14dc28daa3f90a74c3117548fead25af3f
Adrian Roos [Thu, 7 Jun 2018 13:29:34 +0000 (15:29 +0200)]
WM: Fix seamless rotation
With the introduction of the surface hierarchy, the seamless rotation
behavior in WSA is no longer correct: it also applies the WindowState's
offset, which leads to that being applied twice.
Instead of doing that, we simply rotate the WSA surface within the place
that WindowState dictates now.
Finally, the location of the WindowState itself also needs to be
transformed into the new orientation.
Fixes:
109927566
Test: atest CoordinateTransformsTest
Test: atest 'WindowStateTests#testSeamlesslyRotateWindow'
Change-Id: I9fb27a0a8a2bddc6ec88a4fcce6d6ea00929fb91
TreeHugger Robot [Fri, 15 Jun 2018 00:50:50 +0000 (00:50 +0000)]
Merge "StatsPullerManager not use singleton"
Tracy Zhou [Fri, 15 Jun 2018 00:17:11 +0000 (17:17 -0700)]
Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev am:
b2b255a131
am:
09b4dbdf2a
Change-Id: I8d7cf4edc03e798e0cebb63c8f933eb58417fafb
Eric Laurent [Thu, 14 Jun 2018 02:36:42 +0000 (19:36 -0700)]
audioservice: fix a2dp connection race condition
In case of fast (< 1 second) A2DP disconnect/connect sequence, there
is a potential race condition where the delayed disconnection message
(due to becoming noisy intent) is received after the not delayed
connection message.
- Make sure all messages related to device connection/disconnection
(including MSG_A2DP_DEVICE_CONFIG_CHANGE and MSG_BTA2DP_DOCK_TIMEOUT)
are handled by queueMsgUnderWakeLock().
- Make sure messages are processed in the same order as API calls.
- Add check for null address in makeA2dpDeviceUnavailableNow().
Bug:
109903807
Bug:
78837311
Test: repro steps in bugs. A2DP connection and playback
Change-Id: Ib81b3805f945f7206b1a60de74e9bbeeef89bdd0
Tracy Zhou [Thu, 14 Jun 2018 23:50:53 +0000 (16:50 -0700)]
Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev
am:
b2b255a131
Change-Id: I585b9c7df35114b47ea0ab9af7ee0b881b195e4e
Android Build Merger (Role) [Thu, 14 Jun 2018 23:46:31 +0000 (23:46 +0000)]
[automerger] Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev am:
b2b255a131 am:
86e5aa8731
Change-Id: I46bc865fd3794d2ce8b79415b12be64ce0a46c36
Tracy Zhou [Thu, 14 Jun 2018 23:45:40 +0000 (16:45 -0700)]
Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev
am:
b2b255a131
Change-Id: I7ad4536ff6d1ac5724f32e18693f8fcb14097a36
Dianne Hackborn [Thu, 14 Jun 2018 23:42:46 +0000 (23:42 +0000)]
Merge "Expose new AppOps API that we had to leave hidden in P."
Tracy Zhou [Thu, 14 Jun 2018 23:28:34 +0000 (23:28 +0000)]
Merge "Revert "Change quickstep onboarding tip window type to"" into pi-dev
Chenjie Yu [Fri, 8 Jun 2018 17:07:51 +0000 (10:07 -0700)]
StatsPullerManager not use singleton
This is to be consistent with other patterns such as UidMap.
This also makes unit test simpler.
Change-Id: I1558cd609e470481f269ecf2ae616277a95cfbf0
Bug:
72722120
Test: unit test
Xiangyu/Malcolm Chen [Thu, 14 Jun 2018 22:44:55 +0000 (22:44 +0000)]
Merge "Have proper permission check in getConfigForSubId"
Wale Ogunwale [Thu, 14 Jun 2018 22:39:17 +0000 (15:39 -0700)]
Make testSplitscreenPortraitAppOrientationRequests pass to unblock release am:
cf2d6475f9
am:
6b99b6e3a3
Change-Id: Ia5697a4cae08cf56f94244db1445b92929e4dde9
Colin Cross [Thu, 14 Jun 2018 22:23:21 +0000 (15:23 -0700)]
Fix ManifestMerger issues
Set LOCAL_MIN_SDK_VERSION in SettingsLib so that the build system
doesn't raise the minSdkVersion value specified in the manifest,
which causes ManifestMerger to error when trying to merge it into
a package that specifies a lower minSdkVersion.
Bug:
78447299
Test: m java
Change-Id: Ie2c2458647cd6495418999b35894dc92343992cc
Wale Ogunwale [Thu, 14 Jun 2018 22:18:36 +0000 (15:18 -0700)]
Make testSplitscreenPortraitAppOrientationRequests pass to unblock release
am:
cf2d6475f9
Change-Id: I93ac74e692e5d0f7f78d2c431b9e4fd4300aec09
Android Build Merger (Role) [Thu, 14 Jun 2018 22:16:14 +0000 (22:16 +0000)]
[automerger] Make testSplitscreenPortraitAppOrientationRequests pass to unblock release am:
cf2d6475f9 am:
2dfb03f6f4
Change-Id: Idc3ae3c6d91f93a48a134280e176452ce050f21e
Wale Ogunwale [Thu, 14 Jun 2018 22:15:35 +0000 (15:15 -0700)]
Make testSplitscreenPortraitAppOrientationRequests pass to unblock release
am:
cf2d6475f9
Change-Id: Ie0862784fd537c0a669d3085b2d86a7ab482db7f
TreeHugger Robot [Thu, 14 Jun 2018 21:49:39 +0000 (21:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Neil Fuller [Thu, 14 Jun 2018 21:41:41 +0000 (14:41 -0700)]
Merge "Clear calling identity before doing any work" am:
31686e954a am:
3eb2ad1096
am:
ed66a8b2a6
Change-Id: I412d623de4ae2c32e0070bcb105010c234fe56b7
Neil Fuller [Thu, 14 Jun 2018 21:31:23 +0000 (14:31 -0700)]
Merge "Clear calling identity before doing any work" am:
31686e954a
am:
3eb2ad1096
Change-Id: I3a940e1fb84bc04b7b53cbe25111768deb3e6d0c
Neil Fuller [Thu, 14 Jun 2018 21:15:04 +0000 (14:15 -0700)]
Merge "Clear calling identity before doing any work"
am:
31686e954a
Change-Id: I144fd2b5f46ce7d7a06195a2dd5207d44cd951f0
TreeHugger Robot [Thu, 14 Jun 2018 20:12:24 +0000 (20:12 +0000)]
Merge "Uses autofill callback to throttle performance tests."
Treehugger Robot [Thu, 14 Jun 2018 19:13:29 +0000 (19:13 +0000)]
Merge "Clear calling identity before doing any work"
Philip P. Moltmann [Thu, 14 Jun 2018 18:52:14 +0000 (11:52 -0700)]
Abbreviate permission labels less aggressively
We switched the package installer app to always abbreviate all labels
loaded from foreign packages. This is done so that a foreign app cannot
crorrupt the UI via super-long strings.
The default abbreviation is very aggressive and abbreviates to ~5 cm.
When an app with a targetSDK <= M gets installed, all permissions will
get auto-granted. Hence when a user side-loads such an app, we show the
permissions during install so that the user is aware of this.
Unfortunately most permission labels and restrictions do not fit into a
single line.
This change allows much longer strings for permissions names and
descriptions. It still abbreviates eventually and handles permission
descriptions with weird characters (such as back-space) correctly.
Fixes:
110209410
Test: Side-loaded old app and verified that permission labels and
descriptions are not abbreviated.
Change-Id: Ie1db240883c9f5cb9c1b74ca7bdcb80625e3f7f2