OSDN Git Service
Keisuke Kuroyanagi [Thu, 8 Oct 2015 10:12:56 +0000 (19:12 +0900)]
Add mouse interaction UI test for TextView.
Bug:
19544351
Bug:
24475013
Change-Id: If8109ad30a13d5cef4c7aff212b2a8389db0e57d
Filip Gruszczynski [Sun, 4 Oct 2015 23:02:06 +0000 (16:02 -0700)]
Remove accidentally added logging.
Change-Id: Ibffca5e034c5009684bfe6b9a04bd476b9385053
Filip Gruszczynski [Sat, 3 Oct 2015 20:59:49 +0000 (13:59 -0700)]
Only request resize for tasks on the freeform stack.
This fixes a crash during orientation changes, where window manager
requests a resize for a docked task, but activity manager throws an
exception since dock tasks can only be resized when their stack is
being resized.
Bug:
24575031
Change-Id: I954c4e6ae60931b30200b10c8a4834b0a5757606
Stephen Hines [Sat, 3 Oct 2015 00:52:32 +0000 (00:52 +0000)]
am
697e3dd6: am
ee144b1e: resolved conflicts for
bd57dac5 to stage-aosp-master
* commit '
697e3dd6b9a8be4451e19ab7c03ced310602b92a':
Don't unregister Fonts from renderer at destruction
Stephen Hines [Sat, 3 Oct 2015 00:46:17 +0000 (00:46 +0000)]
am
ee144b1e: resolved conflicts for
bd57dac5 to stage-aosp-master
* commit '
ee144b1e60a88e8f097113e046813f0b61c38b9b':
Don't unregister Fonts from renderer at destruction
Filip Gruszczynski [Sat, 3 Oct 2015 00:36:55 +0000 (00:36 +0000)]
Merge "Fix lack of dim layer behind "Power off" window."
Stephen Hines [Sat, 3 Oct 2015 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for
bd57dac5 to stage-aosp-master
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
Filip Gruszczynski [Thu, 1 Oct 2015 19:30:31 +0000 (12:30 -0700)]
Fix lack of dim layer behind "Power off" window.
This enables dim behind functionality for both tasks and stacks and
groups it inside a controller that manages the dim layers (including
shared dim layers for full screen tasks/stacks).
Bug:
24331704
Change-Id: I0d1ba996d9e00d05e0203166b82268da00fbb35e
Stefan Kuhne [Fri, 2 Oct 2015 23:26:25 +0000 (23:26 +0000)]
Merge "Possible resize flickering on config change"
Skuhne [Fri, 2 Oct 2015 23:08:26 +0000 (16:08 -0700)]
Possible resize flickering on config change
It is possible that while a config change is going on, the
view hiererchy got created but not layouted. In that case
the reported size of the main window would be 0,0. In this
event we need to use the cached window sizes from the past
render.
Bug:
24595899
Change-Id: Ia41f7ae0999e4f2bda364506029bcbdfd7d3f4b4
Fyodor Kupolov [Fri, 2 Oct 2015 23:17:36 +0000 (23:17 +0000)]
Merge "Do now allow current user to be removed"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:04:55 +0000 (23:04 +0000)]
am
3cb53543: am
24f02483: am
67775422: Retry if interrupted before mMessageThread has joined
* commit '
3cb53543e224c0f98801d71c22a2d81974186597':
Retry if interrupted before mMessageThread has joined
Fyodor Kupolov [Fri, 2 Oct 2015 23:04:07 +0000 (23:04 +0000)]
Merge "Restart USB stack only if data is unlocked"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:59:51 +0000 (22:59 +0000)]
am
24f02483: am
67775422: Retry if interrupted before mMessageThread has joined
* commit '
24f02483172a9802222da29e9db3832b93dd46a6':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:54:04 +0000 (22:54 +0000)]
am
67775422: Retry if interrupted before mMessageThread has joined
* commit '
677754225d9dcd3982d486bc4ead31d6f74de89b':
Retry if interrupted before mMessageThread has joined
Fyodor Kupolov [Fri, 2 Oct 2015 22:41:46 +0000 (15:41 -0700)]
Restart USB stack only if data is unlocked
When switching users, USB stack shouldn't be restarted if mUsbDataUnlocked =
false, e.g. device is in charge only mode.
Bug:
24611765
Change-Id: I3b12f8c8926235546fe916a200aa57ed618193de
Winson Chung [Fri, 2 Oct 2015 22:41:35 +0000 (22:41 +0000)]
Merge "Refactoring several TaskView callbacks."
Chong Zhang [Fri, 2 Oct 2015 22:36:44 +0000 (22:36 +0000)]
Merge "Put ResovlerActivity and noDisplay activities in the source task"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit
2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
Chris Craik [Fri, 2 Oct 2015 22:30:09 +0000 (22:30 +0000)]
Merge "Don't unregister Fonts from renderer at destruction"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:22:13 +0000 (22:22 +0000)]
am
e3ae9e71: am
5fbb2452: am
ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '
e3ae9e71b3217e280f5c671591841ae437fd4dab':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:16:20 +0000 (22:16 +0000)]
am
5fbb2452: am
ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '
5fbb245230317b5ca312556b73380195871827eb':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:08:11 +0000 (22:08 +0000)]
am
ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '
ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 21:58:50 +0000 (21:58 +0000)]
Merge "Retry if interrupted before mMessageThread has joined"
Xiaohui Chen [Fri, 2 Oct 2015 21:54:37 +0000 (21:54 +0000)]
Merge "Cleanup USER_OWNER in pm"
Xiaohui Chen [Fri, 2 Oct 2015 21:54:17 +0000 (21:54 +0000)]
Merge "Cleanup USER_OWNER in mount service"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
Xiaohui Chen [Fri, 2 Oct 2015 21:40:27 +0000 (14:40 -0700)]
Cleanup USER_OWNER in pm
Bug:
19913735
Change-Id: I27947f539ca8346e3abd96fc1f800a65945be128
Xiaohui Chen [Fri, 2 Oct 2015 21:41:42 +0000 (14:41 -0700)]
Cleanup USER_OWNER in mount service
Also removed a failing unit test and the related code which is
now deprecated.
Bug:
19913735
Bug:
24064753
Change-Id: I9b11130b52caeb0ad890cc6adaaf7fb2fc7b5db6
Chris Craik [Fri, 2 Oct 2015 21:19:39 +0000 (14:19 -0700)]
Don't unregister Fonts from renderer at destruction
bug:
24584749
Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.
Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
Chong Zhang [Fri, 2 Oct 2015 20:36:38 +0000 (13:36 -0700)]
Put ResovlerActivity and noDisplay activities in the source task
Launch the ResolverActivity in the source task, so that the chooser
stays in the bounds of the task, instead of always at the bottom of
the screen.
Also put the nodisplay activities in the source task, it could launch
other activities (eg. ResolverActivity), we need the original task.
Bug:
24136124
Change-Id: I8b22d7f6cba4dc9e57cb19d357091013a74826bb
Tim Murray [Fri, 2 Oct 2015 21:08:09 +0000 (21:08 +0000)]
am
e6a4f902: am
0e28d919: am
3af80eff: am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
e6a4f902617f6bc23a0a43550b89683f1ed63e62':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:59:09 +0000 (20:59 +0000)]
am
0e28d919: am
3af80eff: am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
0e28d9196deb28af89c0ea075a91ca45c989fde9':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:54:58 +0000 (20:54 +0000)]
am
3af80eff: am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
3af80eff608b2ee2de7291f82b9163d5df4b15cf':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:48:04 +0000 (20:48 +0000)]
am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
791763796e5f21e34c3ae81c1faad2a4c1a515dd':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:43:30 +0000 (20:43 +0000)]
Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
Andrew Lee [Fri, 2 Oct 2015 20:37:47 +0000 (20:37 +0000)]
Merge "Add BLOCKED and REJECTED call types."
Wale Ogunwale [Fri, 2 Oct 2015 20:35:27 +0000 (20:35 +0000)]
Merge "Fixed issue with not force resizing a task when drag ends."
Jorim Jaggi [Fri, 2 Oct 2015 20:20:19 +0000 (20:20 +0000)]
am
99d661ff: am
c69f4b96: am
54afa2bd: am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
99d661ffc0f1b6626b18d72b6880f1765e3bf3e8':
Add minimum time for double tap gesture
Jorim Jaggi [Fri, 2 Oct 2015 20:15:06 +0000 (20:15 +0000)]
am
c69f4b96: am
54afa2bd: am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
c69f4b962e1111ed44399c1243829384f83b9f2f':
Add minimum time for double tap gesture
Jorim Jaggi [Fri, 2 Oct 2015 20:08:11 +0000 (20:08 +0000)]
am
54afa2bd: am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
54afa2bdc2be09542feea634f7a87a0f2f9defac':
Add minimum time for double tap gesture
Jorim Jaggi [Fri, 2 Oct 2015 20:00:34 +0000 (20:00 +0000)]
am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
8c66fa94361b51f39f87530f6d1f714120437cc6':
Add minimum time for double tap gesture
Jorim Jaggi [Fri, 2 Oct 2015 19:55:26 +0000 (19:55 +0000)]
Merge "Add minimum time for double tap gesture" into mnc-dr-dev
Wale Ogunwale [Fri, 2 Oct 2015 19:43:27 +0000 (12:43 -0700)]
Fixed issue with not force resizing a task when drag ends.
We were checking mResizing when the drag ends to see if we
should force resize, but it was being set to false just before
the force resize check in endDragLocked.
Also, don't call AM to resize task if bounds isn't going to change.
Change-Id: Ice2c32a0f15f7489a7c80f21bd79c31104ba4487
Zach Kuznia [Fri, 2 Oct 2015 19:31:05 +0000 (19:31 +0000)]
Merge "Use the standard GestureDetector to handle double tap and hold in TouchExplorer."
Toni Barzic [Fri, 2 Oct 2015 19:29:06 +0000 (19:29 +0000)]
Merge "[a11y] Add default autoclick delay value to AccessibilityManager"
Fyodor Kupolov [Thu, 1 Oct 2015 20:54:22 +0000 (13:54 -0700)]
Do now allow current user to be removed
It was possible to remove a foreground user using pm remove-user command.
The system ends up in the inconsistent state, because switch does not happen
and the removed user stays in the foreground, but its state is removed.
Also added am get-current-user command.
Change-Id: Ida2dce8f99bac55e106cdd44c93e96cc9142d7fb
Tenghui Zhu [Fri, 2 Oct 2015 17:32:59 +0000 (17:32 +0000)]
Merge "Early return when the scale is 0."
Chris Craik [Fri, 2 Oct 2015 17:28:36 +0000 (17:28 +0000)]
Merge "Move more utils into paintutils"
Chris Craik [Fri, 2 Oct 2015 17:28:01 +0000 (17:28 +0000)]
Merge "Move ortho matrix out of glop"
Oren Blasberg [Fri, 2 Oct 2015 17:27:14 +0000 (17:27 +0000)]
Merge "Change popup menu header color to secondary color."
Teng-Hui Zhu [Thu, 1 Oct 2015 23:49:16 +0000 (16:49 -0700)]
Early return when the scale is 0.
b/
24534579
Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
Doris Liu [Fri, 2 Oct 2015 17:16:34 +0000 (17:16 +0000)]
Merge "Fix behavior change for animators without a start delay"
Steve McKay [Fri, 2 Oct 2015 16:51:39 +0000 (16:51 +0000)]
Merge "Normalize and improve menu fiddling."
Steve McKay [Thu, 1 Oct 2015 18:39:24 +0000 (11:39 -0700)]
Normalize and improve menu fiddling.
Also, don't show copy/paste menu items (though they can still be invoked via keyboard).
Show copy to /move to instead.
Change-Id: I6e7bdf35bf370ea30d4f12a5a200ad38ff0221f4
John Reck [Thu, 1 Oct 2015 21:46:12 +0000 (14:46 -0700)]
Fix Paint's JNI
Bug:
22409077
Change-Id: I99e1a11bf14f5b62c41107528f573eaf9f2d4b2f
Stefan Kuhne [Fri, 2 Oct 2015 14:12:42 +0000 (14:12 +0000)]
Merge "Rendering the window frame with a second thread"
Skuhne [Tue, 22 Sep 2015 16:51:39 +0000 (09:51 -0700)]
Rendering the window frame with a second thread
Using a multi threaded render node to render the window frame
asynchronously from the application relayout.
Bug:
22527834
Bug:
24400680
Bug:
24459827
Bug:
24409773
Bug:
24537510
Change-Id: I1010fc6a8b6e38424178140afa3ca124433ab7e4
Jean-Michel Trivi [Fri, 2 Oct 2015 09:06:12 +0000 (09:06 +0000)]
am
182e6287: am
11568be8: am
5f48baef: am
24806db8: AudioService: alternative way of handling device rotation
* commit '
182e628711a5859765479fd75066bbeac886c3f6':
AudioService: alternative way of handling device rotation
Jianing Wei [Fri, 2 Oct 2015 09:06:04 +0000 (09:06 +0000)]
am
5a15b952: am
98e0cec2: am
3c708be3: am
6ffe9f05: am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
5a15b9529197d1e9a787814aceed0b815a144357':
Camera2: Update video stabilization API doc.
Jean-Michel Trivi [Fri, 2 Oct 2015 08:27:01 +0000 (08:27 +0000)]
am
11568be8: am
5f48baef: am
24806db8: AudioService: alternative way of handling device rotation
* commit '
11568be85e943063c43a9528da0a6b5fb2a92b3b':
AudioService: alternative way of handling device rotation
Jianing Wei [Fri, 2 Oct 2015 08:26:54 +0000 (08:26 +0000)]
am
98e0cec2: am
3c708be3: am
6ffe9f05: am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
98e0cec203cd5463c9dd314455ef02781e241b44':
Camera2: Update video stabilization API doc.
Jean-Michel Trivi [Fri, 2 Oct 2015 02:56:39 +0000 (02:56 +0000)]
am
5f48baef: am
24806db8: AudioService: alternative way of handling device rotation
* commit '
5f48baef5f42dd39fff9bc03b3ac8ba222955b86':
AudioService: alternative way of handling device rotation
Jean-Michel Trivi [Fri, 2 Oct 2015 02:52:40 +0000 (02:52 +0000)]
am
24806db8: AudioService: alternative way of handling device rotation
* commit '
24806db8f6f523542510097ce0af4a32beeda83b':
AudioService: alternative way of handling device rotation
Jianing Wei [Fri, 2 Oct 2015 02:23:10 +0000 (02:23 +0000)]
am
3c708be3: am
6ffe9f05: am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
3c708be364d4c2a45aacc66ca027cdcb19d7dda5':
Camera2: Update video stabilization API doc.
Jianing Wei [Fri, 2 Oct 2015 02:11:55 +0000 (02:11 +0000)]
am
6ffe9f05: am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
6ffe9f05de81fab8e3cb4031a784e26c2c0acce1':
Camera2: Update video stabilization API doc.
Doris Liu [Thu, 1 Oct 2015 20:26:01 +0000 (13:26 -0700)]
Fix behavior change for animators without a start delay
This CL maintains the behavior that animators without any
start delay will get started right away, instead of being delayed
to the first frame as it was in the previous refactor.
Bug:
23825781
Change-Id: I7873bc6c7a761c1b4d48ee5e17af631b359fd676
Jean-Michel Trivi [Thu, 1 Oct 2015 22:00:59 +0000 (15:00 -0700)]
AudioService: alternative way of handling device rotation
For devices that monitor orientation (primarily for channel assignment
to stereo speakers):
The com.android.server.policy.WindowOrientationListener API is more
power efficient than simply monitoring the device's orientation. When
supported, use it instead of android.view.OrientationEventListener.
When WindowOrientationListener reports an orientation change, start
a thread to poll the UI orientation, as its change may lag behind
the observed rotation. Gradually increasing delays between polls
are stored in a table.
Bug
24415763
Change-Id: I69bf68da6107af24cd02a48961dd17ceab557816
Tim Murray [Fri, 2 Oct 2015 00:07:12 +0000 (17:07 -0700)]
Send POWER_HINT_INTERACTION on rotate.
Send a POWER_HINT_INTERACTION to improve redraw performance when the
phone is rotated.
bug
24583227
Change-Id: I1978f0dfb9a25c00ad4da5b44d10410ad7412001
Winson Chung [Thu, 1 Oct 2015 23:34:25 +0000 (23:34 +0000)]
Merge "Using EventBus for AppWidgetProviderChanges."
Chris Craik [Thu, 1 Oct 2015 23:20:30 +0000 (23:20 +0000)]
Merge "Simplify DeferredDisplayList construction"
Winson [Thu, 1 Oct 2015 22:49:31 +0000 (15:49 -0700)]
Refactoring several TaskView callbacks.
- Moving header bar event handling to TaskViewHeader
- Removing several proxy callbacks from RecentsView
Change-Id: I7dc99a7b580c1beaa93216d2b29c94246b35ec5d
Chris Craik [Thu, 1 Oct 2015 19:36:07 +0000 (12:36 -0700)]
Move more utils into paintutils
Change-Id: I1eb3fd52386bc61a592da235533e40b509eeec24
Nick Kralevich [Thu, 1 Oct 2015 21:56:47 +0000 (21:56 +0000)]
Merge "Fix security issues when using Parcel.setDataPosition() with untrusted input"
Yohei Yukawa [Thu, 1 Oct 2015 21:46:48 +0000 (21:46 +0000)]
Merge "Unbind IME client when unsetting the current IME."
Winson [Fri, 25 Sep 2015 00:22:57 +0000 (17:22 -0700)]
Using EventBus for AppWidgetProviderChanges.
Change-Id: Ifa3bf1527eb733d614374f27fd8afbf5b49faaa6
Jorim Jaggi [Thu, 1 Oct 2015 21:13:04 +0000 (14:13 -0700)]
Add minimum time for double tap gesture
Bug:
24304031
Change-Id: I15629d6b05175aea9b0d02571f6245966094f162
Winson Chung [Thu, 1 Oct 2015 21:00:26 +0000 (21:00 +0000)]
Merge "Incorporating event bus to proxy recents events."
Adam Lesinski [Tue, 22 Sep 2015 20:02:09 +0000 (13:02 -0700)]
Fix security issues when using Parcel.setDataPosition() with untrusted input
When seeking forward in the Parcel, adding the extracted size to the Parcel.dataPosition()
can result in an overflow. Guard against this.
Bug:
23909429
Change-Id: If37cdebbf05a92810300363d1a6ecd8b42b6da26
Winson [Thu, 24 Sep 2015 23:06:29 +0000 (16:06 -0700)]
Incorporating event bus to proxy recents events.
- Initial change to use the event bus by dispatching
package events directly to the TaskStackViews instead
of passing them down the view hierarchy manually.
Change-Id: Ic68df9eeefb79eab8ded84b74264a93719b40643
Keisuke Kuroyanagi [Thu, 1 Oct 2015 20:11:49 +0000 (20:11 +0000)]
Merge "Add tests: Paint#measureText for bidirectional text."
Makoto Onuki [Thu, 1 Oct 2015 19:50:12 +0000 (19:50 +0000)]
Merge "Refactor DPMS tests to be able to test more different cases."
Makoto Onuki [Tue, 29 Sep 2015 23:53:38 +0000 (16:53 -0700)]
Refactor DPMS tests to be able to test more different cases.
- DpmMockContext.addUser() allows to create more users. This will set up
UserManager properly and create a data directory.
- Updated DevicePolicyManagerTest so it can now easily emulate calls from
different secondary users.
Change-Id: Ic9d3e8d0d1e7f41e184c82e6dc323c244535b8d8
Wale Ogunwale [Thu, 1 Oct 2015 19:31:46 +0000 (19:31 +0000)]
Merge "Create non-docked stack with right bounds if docked stack exist"
Toni Barzic [Thu, 1 Oct 2015 17:47:44 +0000 (10:47 -0700)]
[a11y] Add default autoclick delay value to AccessibilityManager
The goal is to make this value shareable with Settings code (without
adding dependency on com.android.server)
Change-Id: Ic41af575dcf8081de69bdcdb20fba430bcf3257e
Wale Ogunwale [Thu, 1 Oct 2015 18:30:34 +0000 (11:30 -0700)]
Create non-docked stack with right bounds if docked stack exist
We previously created a new stack with a bounds of half the screen
instead of using whatever space is left by the docked stack.
Change also takes care of issue where the adjustment bounds was
slightly off for non-docked stack.
Bug:
24460346
Bug:
24501077
Change-Id: Ib7f6c62bdf9309ca8916527dbb206e3719a36d9e
Chong Zhang [Thu, 1 Oct 2015 19:19:36 +0000 (19:19 +0000)]
Merge "Do not change task's stack in resizeTaskLocked"
Chong Zhang [Thu, 1 Oct 2015 01:25:21 +0000 (18:25 -0700)]
Do not change task's stack in resizeTaskLocked
Move the task to the right stack before calling resizeTaskLocked
and let resizeTaskLocked only handle the resize.
Bug:
24462900
Change-Id: I3401c92f1893eaefde2909a9b20b00b5ea6cdf01
Doris Liu [Thu, 1 Oct 2015 18:19:17 +0000 (18:19 +0000)]
Merge "Update doc to reflect requirement of a Looper for changing animation's frame delay"
Doris Liu [Thu, 1 Oct 2015 18:08:54 +0000 (11:08 -0700)]
Update doc to reflect requirement of a Looper for changing animation's frame delay
Bug:
24569533
Change-Id: Ie886394a5e3cd7ceebbedbf09e2d9645b464a9c6
Steve McKay [Thu, 1 Oct 2015 17:48:41 +0000 (17:48 +0000)]
Merge "Provide previous stack when opening new window."
Amith Yamasani [Thu, 1 Oct 2015 17:32:42 +0000 (17:32 +0000)]
Merge "Delay cleaning user tasks until user is removed"
Jianing Wei [Thu, 1 Oct 2015 16:40:21 +0000 (16:40 +0000)]
am
2813b0fa: Camera2: Update video stabilization API doc.
* commit '
2813b0fae99fed1096dc23c3899e223459a54cec':
Camera2: Update video stabilization API doc.
Todd Kennedy [Thu, 1 Oct 2015 14:15:41 +0000 (14:15 +0000)]
Merge "Update PackageInstaller install handing"
Erik Kline [Thu, 1 Oct 2015 13:06:44 +0000 (13:06 +0000)]
Merge "Only log exceptions if the IpReachabilityMonitor is still running."
Erik Kline [Thu, 1 Oct 2015 11:38:03 +0000 (20:38 +0900)]
Only log exceptions if the IpReachabilityMonitor is still running.
It's not terribly interesting to see logged exceptions about reads
on sockets that were deliberately closed due to normal tear down.
Change-Id: Ib6834a98b6f086fc40ce19db60c161414459d758
Sergio Giro [Thu, 1 Oct 2015 11:14:03 +0000 (12:14 +0100)]
resolved conflicts for
31e5ded6 to master
Change-Id: Iae4e1abe697f1c00a82b54c17afa7d4edddc006b
Sergio Giro [Thu, 1 Oct 2015 10:22:39 +0000 (10:22 +0000)]
am
6706b71d: am
86e67d70: Merge "frameworks/base: delete TinyHashMap"
* commit '
6706b71d7cfb9a916fd482189c04a0d59c19c103':
frameworks/base: delete TinyHashMap
Sergio Giro [Thu, 1 Oct 2015 10:16:44 +0000 (10:16 +0000)]
am
86e67d70: Merge "frameworks/base: delete TinyHashMap"
* commit '
86e67d708d738807c843850a3b6c9170e514ff8f':
frameworks/base: delete TinyHashMap
Sergio Giro [Thu, 1 Oct 2015 10:10:10 +0000 (10:10 +0000)]
Merge "frameworks/base: delete TinyHashMap"