OSDN Git Service
Clara Bayarri [Fri, 9 Jun 2017 17:37:59 +0000 (17:37 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
am:
3eae564fec
Change-Id: I9993d1afdbf3cd88cfd1861872baa7b0ee23e7ba
Clara Bayarri [Fri, 9 Jun 2017 17:31:14 +0000 (17:31 +0000)]
Merge "Replace fonts of unknown origin" into oc-dev
Jason Monk [Fri, 9 Jun 2017 16:57:44 +0000 (16:57 +0000)]
Merge "Add notification listener plugin hook" into oc-dr1-dev
Bill Yi [Fri, 9 Jun 2017 16:10:02 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
728c610446 -s ours
Change-Id: Ide88aef2c9d0a04ed9376fcb45d3277f9e749afa
TreeHugger Robot [Fri, 9 Jun 2017 16:02:23 +0000 (16:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Sungsoo Lim [Fri, 9 Jun 2017 15:42:50 +0000 (15:42 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
am:
9cfd30202d
Change-Id: I5a12aef2922ccc468469c3b32f2fddda8e044fa0
Sungsoo Lim [Fri, 9 Jun 2017 15:38:42 +0000 (15:38 +0000)]
Merge "Fix the finding logic of MediaButtonSession" into oc-dev
Bill Yi [Fri, 9 Jun 2017 14:01:59 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I868ab44fa40985282a8a7b46ea94d951d18e4fd3
Auto-generated-cl: translation import
Wale Ogunwale [Fri, 9 Jun 2017 13:15:38 +0000 (13:15 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
am:
678477b383
Change-Id: I2c6149881b738777ed309209538c5d9726d36c36
Wale Ogunwale [Fri, 9 Jun 2017 13:07:13 +0000 (13:07 +0000)]
Merge "Fix deadlock when create alert window notification" into oc-dev
Bryce Lee [Fri, 9 Jun 2017 11:18:04 +0000 (11:18 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
am:
ac56b8adde
Change-Id: I78c8fc62d4050546896262245785084fd5cab609
Bryce Lee [Fri, 9 Jun 2017 11:11:12 +0000 (11:11 +0000)]
Merge "Prioritize reused activity's stack over computed stack." into oc-dev
Romain Guy [Fri, 9 Jun 2017 06:34:35 +0000 (06:34 +0000)]
Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev
Sungsoo [Fri, 9 Jun 2017 03:59:47 +0000 (12:59 +0900)]
Fix the finding logic of MediaButtonSession
When we find a media button session with the given UID, we should
ignore the sessions whose playback state is not set.
Bug:
62373831
Test: passed CtsMediaTestCases
Change-Id: I484c888c5bdbceb85dd4524c1353906efc0c4f02
Selim Cinek [Fri, 9 Jun 2017 04:36:31 +0000 (04:36 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
am:
dc66506f0a
Change-Id: Ia2ea2f1b69bdcab2d27a56e89fbfb87b8cc11eed
Selim Cinek [Fri, 9 Jun 2017 04:30:47 +0000 (04:30 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
am:
b9eb205bd7
Change-Id: I6cd3b23a9adcb20a93b112204154f1e42a7a3c21
Selim Cinek [Fri, 9 Jun 2017 04:25:36 +0000 (04:25 +0000)]
Merge "Fixed an issue where the notification could stay userlocked" into oc-dev
Selim Cinek [Fri, 9 Jun 2017 04:21:59 +0000 (04:21 +0000)]
Merge "Fixed a bug where systemui could crash while cloning" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:15:12 +0000 (04:15 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
am:
d1f55f6302
Change-Id: Ibbb9214593ee1b5dd51a0b0da8815c270b875257
Jorim Jaggi [Fri, 9 Jun 2017 04:11:31 +0000 (04:11 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am:
713ad88afe
Change-Id: Ie76d079092805920ebd6820ce412691ccdceb039
Jorim Jaggi [Fri, 9 Jun 2017 04:06:38 +0000 (04:06 +0000)]
Merge "Properly run window animations at vsync-sf (1/2)" into oc-dev
Jorim Jaggi [Fri, 9 Jun 2017 04:05:31 +0000 (04:05 +0000)]
Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
Romain Guy [Fri, 9 Jun 2017 01:24:25 +0000 (18:24 -0700)]
Fix CTS : BitmapRGBAF16Test#testSetPixel failure
Don't grab a pointer to a temporary object on the stack!
Bug:
62458021
Test: CtsGraphicsTestCase
Change-Id: Ic9662e76c9064b3f3af6f8a4534d2ef56f9c5eea
Adrian Roos [Fri, 9 Jun 2017 00:38:36 +0000 (00:38 +0000)]
Merge "AOD: Move clock to prevent burn in" into oc-dr1-dev
Jorim Jaggi [Thu, 8 Jun 2017 22:40:38 +0000 (15:40 -0700)]
Properly run window animations at vsync-sf (1/2)
- Add new Choreographer instance that runs on vsync-sf
- Use this new Choreographer for WindowAnimator, and remove all
the hacks around it
Test: Open apps and close apps, notice no stutter
Test: Screen zoom animations
Test: go/wm-smoke
Bug:
36631902
Change-Id: I988ae25645effc3ac20efa7cb9b68f23444da0d0
Jakub Pawlowski [Fri, 9 Jun 2017 00:03:31 +0000 (00:03 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
am:
556b10a4e6
Change-Id: I9477ac6e3990a4e2db4a8254f11702b1557591f3
Wale Ogunwale [Thu, 8 Jun 2017 23:51:48 +0000 (16:51 -0700)]
Fix deadlock when create alert window notification
Don't hold WM lock when calling into notification manager which
can call into activity manager.
Test: Make sure alert window notification is displayed
Change-Id: Id8831878093f8079f815a830ff8acdfad99d48cb
Fixes:
62458061
Jakub Pawlowski [Thu, 8 Jun 2017 23:51:21 +0000 (23:51 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" into oc-dev
Matthew Ng [Thu, 8 Jun 2017 23:25:36 +0000 (23:25 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
am:
008e620153
Change-Id: Id626a44a564ae0811338bb04c3c6efb698d07b37
Jason Monk [Thu, 8 Jun 2017 20:24:08 +0000 (16:24 -0400)]
Add notification listener plugin hook
Allows plugin control over notifications right at the entrance
to sysui and gives them the opportunity to mess with them how
they see fit.
Test: manual
Change-Id: I569bf37138da66d0524acecfa36ceb409f98fbb4
TreeHugger Robot [Thu, 8 Jun 2017 23:21:05 +0000 (23:21 +0000)]
Merge "Fixes the animation and state when docking a task by drag" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:15:04 +0000 (23:15 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
dd5886bc5b -s ours
Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f
Bill Yi [Thu, 8 Jun 2017 23:12:30 +0000 (23:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
67a947b636 -s ours
Change-Id: If19e88be06d1d63955c7213c95dff59056a86c88
Bill Yi [Thu, 8 Jun 2017 23:04:51 +0000 (23:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 8 Jun 2017 23:03:52 +0000 (23:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jorim Jaggi [Wed, 7 Jun 2017 21:33:04 +0000 (14:33 -0700)]
Boost android.anim and wm lock sections to -10 during transition
-4 is not enough if we have to compete against RT and main thread
from top app that have -10. Boost it more during app transitions
Test: Inspect systrace, make sure priorities are right, including
getting reset after the transition.
Test: Open Chrome 100x
Test: go/wm-smoke
Change-Id: Id6b060b8aafded67b4bae61b6e8960e37976b096
Fixes:
36631902
Bill Yi [Thu, 8 Jun 2017 22:41:45 +0000 (22:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
75b5199e9d -s ours
Change-Id: Ic7b1e9095cf413bd0401bd8d3cdfc469dd915988
Bill Yi [Thu, 8 Jun 2017 22:34:26 +0000 (22:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Adam Lesinski [Thu, 8 Jun 2017 21:20:03 +0000 (21:20 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
am:
887544e100
Change-Id: I440be882264d8687d7b5e3de036e54bf91386d6d
Adam Lesinski [Thu, 8 Jun 2017 21:14:02 +0000 (21:14 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
Adam Lesinski [Thu, 8 Jun 2017 20:16:39 +0000 (20:16 +0000)]
Revert "always adjust per-user application info"
This reverts commit
e0046cecb079ec4d063444cee64795a6b734e6e7.
Reason for revert: Regresses UI theme
Bug:
62445682
Bug:
36561125
Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e
Jakub Pawlowski [Wed, 7 Jun 2017 20:45:33 +0000 (13:45 -0700)]
Bluetooth: fix connectGatt overload invocations
Merged-In: I726252e85e78bff2c9585332d2748a0d92a9f6d3
Test: sl4a GattOverBrEdrTest
Bug:
62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
Selim Cinek [Thu, 8 Jun 2017 20:20:08 +0000 (13:20 -0700)]
Fixed a bug where systemui could crash while cloning
Because cloning wasn't synchronized, the notification
could become a non-root temporarily which in turn could
lead to a crash.
1. We're now properly synchronizing the cloning, such that
this can't happen anymore
2. We're now only cloning the old statusbar notification lightly
instead of heavily to avoid this altogether
Test: manual, update decoratedcustomview notifications really fast
Change-Id: Ia6525eec64ad9a26956ca2198e20198f55b2173c
Fixes:
62181033
Tyler Gunn [Thu, 8 Jun 2017 20:26:55 +0000 (20:26 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am:
980582e555
Change-Id: Id41b469e278c194337da36a0b34d02efa99b8906
Daichi Hirono [Thu, 8 Jun 2017 20:19:56 +0000 (20:19 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am:
ebb6e998d5
Change-Id: I03e1b4ddb5315a2eae099bb85b692bf90744ba3d
Mady Mellor [Thu, 8 Jun 2017 20:16:45 +0000 (20:16 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am:
f574869c11
Change-Id: I8b98780208ca4e89d249fc7ebd688b868b3fb9be
Winson Chung [Thu, 8 Jun 2017 20:10:36 +0000 (20:10 +0000)]
Merge "Fix crash when deleting task" into oc-dev
am:
c6fa8ee018
Change-Id: I65e242e2f3de857c508c9a7c768ef504121acb25
Tyler Gunn [Thu, 8 Jun 2017 20:06:52 +0000 (20:06 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
TreeHugger Robot [Thu, 8 Jun 2017 18:25:24 +0000 (18:25 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
TreeHugger Robot [Thu, 8 Jun 2017 17:39:37 +0000 (17:39 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
Winson Chung [Thu, 8 Jun 2017 17:37:53 +0000 (17:37 +0000)]
Merge "Fix crash when deleting task" into oc-dev
Jason Monk [Thu, 8 Jun 2017 17:00:40 +0000 (13:00 -0400)]
resolve merge conflicts of
a5b457b3bf6f to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aa49bfdbd2c44684d0edb21b52520fea406e167
Selim Cinek [Thu, 8 Jun 2017 16:54:58 +0000 (09:54 -0700)]
Fixed an issue where the notification could stay userlocked
When collapsing the shade while draging down (using fingerprint)
notifications would stay userlocked and would appear in a small
height instead of their regular size.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java
Change-Id: Ibd97a6ce063bc2fcd76f11e010e781a61bd76b5f
Fixes:
36469584
Jason Monk [Thu, 8 Jun 2017 16:35:21 +0000 (16:35 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
Bill Yi [Thu, 8 Jun 2017 16:13:11 +0000 (09:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia22276dc15f3b81471bb4061fc9080c1a117fa8a
Auto-generated-cl: translation import
Bill Yi [Thu, 8 Jun 2017 16:03:09 +0000 (09:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: If81fd2fdf1a8be8da0741c76a166466bf6680a4b
Auto-generated-cl: translation import
Svetoslav Ganov [Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
am:
053fb9120e
Change-Id: I5f07488ba286cb3d01c75d96e1003edba845daf8
TreeHugger Robot [Thu, 8 Jun 2017 15:55:05 +0000 (15:55 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
Bill Yi [Thu, 8 Jun 2017 14:49:22 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I425ed8791fdbbe1047353b9dae225080bbee78d8
Auto-generated-cl: translation import
Andrei Stingaceanu [Thu, 8 Jun 2017 14:44:20 +0000 (14:44 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
am:
cd603221e1
Change-Id: Iaa491c27aebc60be5fe16668dda7904e2b089f54
Wale Ogunwale [Thu, 8 Jun 2017 14:41:34 +0000 (14:41 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am:
13059cc2ad
Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5
TreeHugger Robot [Thu, 8 Jun 2017 14:36:07 +0000 (14:36 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
Wale Ogunwale [Thu, 8 Jun 2017 14:33:03 +0000 (14:33 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
Selim Cinek [Thu, 8 Jun 2017 14:15:29 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a
Selim Cinek [Thu, 8 Jun 2017 14:07:14 +0000 (14:07 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
Erik Kline [Thu, 8 Jun 2017 13:32:57 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: Iecb4498c004a45403213d6e4bd7b6f8725334646
Erik Kline [Thu, 8 Jun 2017 08:48:48 +0000 (17:48 +0900)]
Delete legacy "wifi interface name guessing" behaviour
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).
Test: as follows
- built
- flashed
- booted
- TetheringTest passes
Bug:
32163131
Bug:
62343300
Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
Felipe Leme [Thu, 8 Jun 2017 06:07:15 +0000 (06:07 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am:
9be8c96918
Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed
Mark Rathjen [Thu, 8 Jun 2017 06:04:54 +0000 (06:04 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am:
3492ed4376
Change-Id: I49015844829d55a903437a807b345688794002b5
Yuchen He [Thu, 8 Jun 2017 06:01:50 +0000 (06:01 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
am:
3671e9249b
Change-Id: I0a9c3a30877d1aa54cc45a67abcd4444eebf63c4
Adam Bookatz [Thu, 8 Jun 2017 05:59:56 +0000 (05:59 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am:
6029bce3b4
Change-Id: Ib8292cc59afe1933bad8d48907ad47c46bb73e87
Todd Kennedy [Thu, 8 Jun 2017 05:54:33 +0000 (05:54 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
am:
3834421c96
Change-Id: I691d03a8396d26193622f171f70f82d7aa91cea2
Phil Weaver [Thu, 8 Jun 2017 05:52:11 +0000 (05:52 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
am:
03a5b3a509
Change-Id: I2e463c1602d1aca9d791d351f4170b0bac9abc90
Todd Kennedy [Thu, 8 Jun 2017 05:50:03 +0000 (05:50 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
am:
dacdf2e978
Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639
Jeff Sharkey [Thu, 8 Jun 2017 05:47:38 +0000 (05:47 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
am:
fdb3d31504
Change-Id: I646e27241743297d62a5442c845b61ee42b47a2f
Sudheer Shanka [Thu, 8 Jun 2017 05:44:49 +0000 (05:44 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am:
f34713066e
Change-Id: Ic001bfa12fecb00b24d7170c841af21531bab28a
Ian Pedowitz [Thu, 8 Jun 2017 05:42:13 +0000 (05:42 +0000)]
Merge "resolve merge conflicts of
695f21a66189 to oc-dr1-dev" into oc-dr1-dev
Etan Cohen [Thu, 8 Jun 2017 05:26:13 +0000 (05:26 +0000)]
Merge "[AWARE] Add validity check on PMK/Passphrase lengths" into oc-dr1-dev
Felipe Leme [Thu, 8 Jun 2017 05:21:02 +0000 (05:21 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
Mark Rathjen [Thu, 8 Jun 2017 04:43:56 +0000 (04:43 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
Kevin Chyn [Mon, 5 Jun 2017 18:28:09 +0000 (11:28 -0700)]
Add setting and permission for assist gesture
Bug:
37427306
Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Yuchen He [Thu, 8 Jun 2017 04:32:31 +0000 (04:32 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev
Ian Pedowitz [Thu, 8 Jun 2017 00:47:38 +0000 (17:47 -0700)]
resolve merge conflicts of
695f21a66189 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
Adam Bookatz [Thu, 8 Jun 2017 02:43:14 +0000 (02:43 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
Svetoslav Ganov [Thu, 8 Jun 2017 01:50:02 +0000 (18:50 -0700)]
Ensure only test print services enabled - framework
Test: cts-tradefed run cts-dev -m CtsPrintTestCas
bug:
62232727
Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
TreeHugger Robot [Thu, 8 Jun 2017 01:40:03 +0000 (01:40 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev
* changes:
expand who can uninstall an instant app
Final changes to protect the API surface
Phil Weaver [Thu, 8 Jun 2017 01:37:43 +0000 (01:37 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev
Matthew Ng [Mon, 5 Jun 2017 21:06:32 +0000 (14:06 -0700)]
Fixes the animation and state when docking a task by drag
There was 3 issues in this bug.
First the wrong stack id was used to defer and continue updating bounds
that broke a lot of the animation. This was fixed by using the recents
stack id instead of home.
Secondly, the wrong transit was passed into AppTransition.java getting
the wrong animation for recents to be docked, defering surface layouts
ensures that the correct transition is gained in that transaction.
Lastly, remove the starting window for the docked-by-drag-from-recents
transition because it was causing the window container to freeze its
bounds causing clipping issues and 2 flickers (where it appears over
the thumbnail) during the animation. Added a TODO to fix it later.
Test: go/wm-smoke
Bug:
34099271
Change-Id: Iaf0dffe5c2f5108c9946c9ea23c6e3fd6a49c34d
Daichi Hirono [Thu, 18 May 2017 03:54:25 +0000 (12:54 +0900)]
Fix NPE in MtpDocumentsProviderTests
Previous patch ag/
2250238 broke MtpDocumentsProviderTests since
ServiceIntentSender's constructor refers the context argument which is
null in the tests.
The CL adds a test version of the constructor which does not use the
context argument in it.
Bug:
38363487
Test: MtpDocumentsProviderTests
Change-Id: I68a1d8cb6997499e5069c33f70fd0f675aaad77c
(cherry picked from commit
c5949bd39c788e98edd9862c7ac12e822a906ad5)
Selim Cinek [Tue, 6 Jun 2017 00:50:19 +0000 (17:50 -0700)]
Fixed a bug where the navigation notification would flicker
Change-Id: Id68ba339407287d67d8db888515389e79e09ece3
Fixes:
62339936
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
TreeHugger Robot [Thu, 8 Jun 2017 01:00:47 +0000 (01:00 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev
Yuchen He [Fri, 12 May 2017 01:49:22 +0000 (18:49 -0700)]
Fix AeModeAndLock test cases.
Bug:
36103813
Change-Id: Ie2e9938f6ae607f5fced5048c5ff5e41e4f7836b
(cherry picked from commit
e256bc9f66c6812f02326432ed22f7adca47cc9c)
Jeff Sharkey [Thu, 8 Jun 2017 00:32:30 +0000 (00:32 +0000)]
Merge "Add timeout to StrictMode flash." into oc-dev
Bryce Lee [Wed, 7 Jun 2017 23:54:11 +0000 (16:54 -0700)]
Prioritize reused activity's stack over computed stack.
It is possible that an activity in one stack may be reused in
another. For example, if an activity is started from a launcher
intent, but then is started from a home intent (from a
ResolverActivity). We currently do not move the activity, leading
to a inconsistency as the window manager proceeds to position the
task in the focus stack.
This changelist addresses the issue by using the reused activity's
stack rather than the computed stack.
Change-Id: Ie8a099e57e05a20b247bd0c97df8cda69e17c1bb
Fixes:
62402289
Test: go/wm-smoke
Adrian Roos [Thu, 1 Jun 2017 23:09:15 +0000 (16:09 -0700)]
AOD: Move clock to prevent burn in
Change-Id: I4d14aac0a379266b3bdef0a588575017ad345c4d
Merged-In: I4d14aac0a379266b3bdef0a588575017ad345c4d
Fixes:
35850027
Test: Enable AOD, observe that clock slightly moves every minute
Sudheer Shanka [Thu, 8 Jun 2017 00:08:40 +0000 (00:08 +0000)]
Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
Ian Pedowitz [Thu, 8 Jun 2017 00:00:16 +0000 (00:00 +0000)]
Merge "Fixed an issue where the icons had the wrong color" into oc-dev
Adrian Roos [Wed, 7 Jun 2017 23:59:53 +0000 (23:59 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
am:
2ff366a39a
Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9
Adrian Roos [Wed, 7 Jun 2017 23:54:00 +0000 (23:54 +0000)]
Merge "Keyguard: Increase clock size" into oc-dev
Winson Chung [Wed, 7 Jun 2017 23:53:03 +0000 (16:53 -0700)]
Fix crash when deleting task
- There are several code paths from the loaders (which run on a background
thread) which post the call to notify an update on the task which was
loaded. Not all of these are cleared when a task is unbound, and can
result in a notifyTaskDataLoaded() after the task is unbound. For now,
just ensure that the TaskView is bound to the Task before updating.
Bug:
62194807
Test: Have not been able to repro, just ensure that recents thumbnails still
load
Change-Id: Id9301025275f4b14a2832f7f6c1ebd5a1ce124ea