Commit Graph

326561 Commits

Author SHA1 Message Date
Mark Rathjen
3492ed4376 Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev 2017-06-08 04:44:07 +00:00
Kevin Chyn
4fddc9fa4d Add setting and permission for assist gesture
Bug: 37427306

Test: manual
Merged-In: I659fa43fb085575df4d62e7765d88c6fd615fb7d
Change-Id: I659fa43fb085575df4d62e7765d88c6fd615fb7d
2017-06-07 21:42:55 -07:00
Yuchen He
c592c63a2d Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
am: 3671e9249b

Change-Id: I2ebc01dc54f654d60e03696490c681a656a7b958
2017-06-08 04:38:16 +00:00
Yuchen He
3671e9249b Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev 2017-06-08 04:32:36 +00:00
Andreas Gampe
76f6da62e6 Merge "Framework: Remove SamplingProfiler" am: d2ecee2506
am: 3ea0309e39  -s ours

Change-Id: I41f6a58ee13d3b07298d41d9dfea330e91547b9b
2017-06-08 03:22:23 +00:00
Andreas Gampe
3ea0309e39 Merge "Framework: Remove SamplingProfiler"
am: d2ecee2506

Change-Id: Iccba75c67041593131bec64e518a1bd968cb1bb0
2017-06-08 03:16:54 +00:00
Treehugger Robot
d2ecee2506 Merge "Framework: Remove SamplingProfiler" 2017-06-08 03:05:59 +00:00
Ian Pedowitz
5eee5988c1 resolve merge conflicts of 7ea4f66f35 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6f26542780c2b911e6aeea187c22e9d70823cd7a
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
2017-06-07 19:54:21 -07:00
Ian Pedowitz
a27856d443 resolve merge conflicts of 695f21a661 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
2017-06-07 19:52:10 -07:00
Adam Bookatz
300ebee8c4 Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev
am: 6029bce3b4

Change-Id: I67da5b543fc839031d3d2544f3723b730edaa1a8
2017-06-08 02:48:32 +00:00
Adam Bookatz
6029bce3b4 Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev 2017-06-08 02:43:20 +00:00
Svetoslav Ganov
2dcedc1276 Ensure only test print services enabled - framework
Test: cts-tradefed run cts-dev -m CtsPrintTestCas

bug:62232727

Change-Id: I1050272586d1c03dc1b1dfdb8b10e258912a249b
2017-06-07 18:50:05 -07:00
Todd Kennedy
4d2a9a9f50 Merge changes Iea24e5a1,If71385bc into oc-dev
am: 3834421c96

Change-Id: I6ed4a41dbd9af3a97b774e7d2854fea1c66cc582
2017-06-08 01:49:03 +00:00
Phil Weaver
3d5bf99e7f Merge "Confirm a11y shortcut service for correct user" into oc-dev
am: 03a5b3a509

Change-Id: I99dbc13b0456e05f42d47b887e999931658f101d
2017-06-08 01:45:56 +00:00
TreeHugger Robot
3834421c96 Merge changes Iea24e5a1,If71385bc into oc-dev
* changes:
  expand who can uninstall an instant app
  Final changes to protect the API surface
2017-06-08 01:40:07 +00:00
Phil Weaver
03a5b3a509 Merge "Confirm a11y shortcut service for correct user" into oc-dev 2017-06-08 01:37:48 +00:00
Mathieu Chartier
42cd265639 Add system property for hot startup method threshold
The property is dalvik.vm.hot-startup-method-samples, setting this
controls how many startup samples are required before methods are
marked as hot in the profile.

Test: adb shell setprop dalvik.vm.hot-startup-method-samples 12
Test: adb shell setprop dalvik.vm.extra-opts -verbose:profiler
Test: adb logcat | grep Profile

Bug: 36457259

(cherry picked from commit 5eee004b92)

Change-Id: Ibf8075aafc6e5bd2ba10385973b26faee3d807df
2017-06-07 18:33:48 -07:00
Hall Liu
b6a16546b5 Merge "Embms download setup" am: da5b77fa9b
am: a807ee8f1c

Change-Id: I6a78b3873814283d768c7e9a642b882bef8b11fc
2017-06-08 01:32:43 +00:00
Hall Liu
a807ee8f1c Merge "Embms download setup"
am: da5b77fa9b

Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6
2017-06-08 01:26:28 +00:00
Matthew Ng
606dd80700 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
2017-06-07 18:23:55 -07:00
Hall Liu
da5b77fa9b Merge "Embms download setup" 2017-06-08 01:20:49 +00:00
Daichi Hirono
fecc78036d 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 c5949bd39c)
2017-06-08 01:19:49 +00:00
TreeHugger Robot
837f1167ca Merge "Framework: Remove SamplingProfiler" into oc-dev-plus-aosp 2017-06-08 01:08:24 +00:00
Todd Kennedy
ddb322a000 Merge "Passing callingUid to internal methods" into oc-dev
am: dacdf2e978

Change-Id: I11bcd48eb91c1f877a27f1cb06d6269aef76d3d2
2017-06-08 01:05:25 +00:00
Selim Cinek
131f1a4bc4 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
2017-06-07 18:04:57 -07:00
TreeHugger Robot
dacdf2e978 Merge "Passing callingUid to internal methods" into oc-dev 2017-06-08 01:00:52 +00:00
Jeff Sharkey
b1a2cde4fd Merge "Add timeout to StrictMode flash." into oc-dev
am: fdb3d31504

Change-Id: I13684a6c952e978eed035e8c217605469c3b8665
2017-06-08 00:36:09 +00:00
Yuchen He
526239e800 Fix AeModeAndLock test cases.
Bug: 36103813

Change-Id: Ie2e9938f6ae607f5fced5048c5ff5e41e4f7836b
(cherry picked from commit e256bc9f66)
2017-06-08 00:32:43 +00:00
Jeff Sharkey
fdb3d31504 Merge "Add timeout to StrictMode flash." into oc-dev 2017-06-08 00:32:35 +00:00
Bryce Lee
a19b5ad748 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
2017-06-07 17:17:19 -07:00
Sudheer Shanka
736cb0e33a Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev
am: f34713066e

Change-Id: I7ba4faeae53df155de0a25347efcc15974f2cc8c
2017-06-08 00:15:23 +00:00
Adrian Roos
dc747bd82e 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
2017-06-07 17:13:01 -07:00
Android Build Merger (Role)
1520d813e0 Merge "Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a am: dacd9ed196" into oc-dr1-dev-plus-aosp 2017-06-08 00:11:05 +00:00
Ian Pedowitz
7ea4f66f35 Merge "Fixed an issue where the icons had the wrong color" into oc-dev
am: 695f21a661

Change-Id: Id515004fae2e8ad90346ce82b334ae6f61b2c086
2017-06-08 00:10:39 +00:00
Sudheer Shanka
f34713066e Merge "Update KernelUidCpuFreqTimeReader to handle uid removals." into oc-dev 2017-06-08 00:08:47 +00:00
Adrian Roos
cd8210731b Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a
am: dacd9ed196

Change-Id: I72b507987f85e2b17f8a98de72a61e64f7b980bd
2017-06-08 00:08:30 +00:00
Adrian Roos
fcaf2d1ae9 Merge "Keyguard: Increase clock size" into oc-dev am: 2ff366a39a
am: b42e50a3a0

Change-Id: I1ca543cb1b23221adf96a7d09a152fea4461b8f5
2017-06-08 00:08:22 +00:00
Adrian Roos
b42e50a3a0 Merge "Keyguard: Increase clock size" into oc-dev
am: 2ff366a39a

Change-Id: I0369da0041d3d8bf001340e7e8f88a60894c2c7d
2017-06-08 00:00:25 +00:00
Ian Pedowitz
695f21a661 Merge "Fixed an issue where the icons had the wrong color" into oc-dev 2017-06-08 00:00:20 +00:00
Adrian Roos
dacd9ed196 Merge "Keyguard: Increase clock size" into oc-dev
am: 2ff366a39a

Change-Id: I758d95a87400fe4643cd6cdb2c776de1975336b9
2017-06-07 23:59:53 +00:00
Adrian Roos
2ff366a39a Merge "Keyguard: Increase clock size" into oc-dev 2017-06-07 23:54:05 +00:00
Winson Chung
b69258b23d 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
2017-06-07 16:53:03 -07:00
Adrian Roos
813d6177bc Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev
am: 4317e457ba

Change-Id: Ieef81f7433083085e8c4ad9e503ba2d333c90cd1
2017-06-07 23:48:03 +00:00
Android Build Merger (Role)
983a3c4f5b Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f am: cf8cfc4412" into oc-dr1-dev-plus-aosp 2017-06-07 23:43:01 +00:00
Bryce Lee
3243d73e81 Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f
am: cf8cfc4412

Change-Id: Iceb7d0a6b88b3bf011e585ead483e924e1cc1b98
2017-06-07 23:41:57 +00:00
Android Build Merger (Role)
3b0ceaf0b1 Merge "Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f am: 50caf4af60" into oc-dr1-dev-plus-aosp 2017-06-07 23:41:55 +00:00
TreeHugger Robot
4317e457ba Merge "AmbientIndication: Add tap again hint" into oc-dr1-dev 2017-06-07 23:40:37 +00:00
Bryce Lee
69569e269a Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev am: f867733d4f
am: 50caf4af60

Change-Id: I46c77e2180b981e1d9e89b81d73e9f47a3519c55
2017-06-07 23:40:06 +00:00
Sundeep Ghuman
1a58d16f74 Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad
am: 8d4014995d

Change-Id: I26ab39fbc393a8fcf89c1daad50a8b02081c947a
2017-06-07 23:39:00 +00:00
Android Build Merger (Role)
f10bf2902d Merge "Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad am: 216f596cee" into oc-dr1-dev-plus-aosp 2017-06-07 23:36:27 +00:00