OSDN Git Service
Ian Pedowitz [Wed, 13 Jan 2016 23:10:41 +0000 (23:10 +0000)]
Merge "Add ITelephonyDebug.aidl"
Wale Ogunwale [Wed, 13 Jan 2016 23:10:15 +0000 (23:10 +0000)]
Merge "Fix build breakage."
Pavel Zhamaitsiak [Mon, 4 Jan 2016 23:54:31 +0000 (15:54 -0800)]
Add ITelephonyDebug.aidl
(cherry picked from commit
f91818ca3458f9c1f1d6b6d278f8d6cc2fc14511)
Change-Id: Ie3c846a90632e3afa793e6e60f5a3390a260c5a5
Wale Ogunwale [Wed, 13 Jan 2016 23:08:29 +0000 (15:08 -0800)]
Fix build breakage.
Bug:
22405482
Change-Id: I8fc522885801e9735544ec3820c8fdd4a4368d71
Pavel Zhamaitsiak [Wed, 13 Jan 2016 23:08:20 +0000 (23:08 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am:
9ae30e69ad am:
fba6bccff5
am:
e737a028b1
* commit '
e737a028b1b1151d43e3ecceb1b2bb10e0c75665':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Keisuke Kuroyanagi [Wed, 13 Jan 2016 23:05:34 +0000 (23:05 +0000)]
Tests for getPrimaryHorizontal with grapheme boundaries am:
a5c53291a8 am:
3bb115ba5c
am:
404a22cf74
* commit '
404a22cf74f47bbdbeccb3452aefcfd3c34eee74':
Tests for getPrimaryHorizontal with grapheme boundaries
Adam Lesinski [Wed, 13 Jan 2016 23:03:08 +0000 (23:03 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev am:
f2cc98bc96 am:
112e26646f
am:
dd0957caf4 -s ours
* commit '
dd0957caf4d16c46971444b00befb415f9a6d549':
UsageStats: Fix issue where initializing data for first time would cause crash
Xiyuan Xia [Wed, 13 Jan 2016 22:32:21 +0000 (22:32 +0000)]
Merge "Fix a race condition during async credential check"
Filip Gruszczynski [Wed, 13 Jan 2016 22:01:05 +0000 (22:01 +0000)]
Merge "Fix delivery of visible behind cancel action."
Filip Gruszczynski [Wed, 13 Jan 2016 21:22:44 +0000 (13:22 -0800)]
Fix delivery of visible behind cancel action.
Bug:
26471802
Change-Id: I4e35f904080d1c57bbb034725d34d8c5bca87238
Yin-Chia Yeh [Wed, 13 Jan 2016 21:50:02 +0000 (21:50 +0000)]
Merge "Camera: cleanup dead code"
Samuel Tan [Wed, 13 Jan 2016 21:42:00 +0000 (13:42 -0800)]
resolve merge conflicts of
3caecaec60 to master.
Change-Id: Ic3e9909c69f03a6ef1911a6b7589afbc02d7494f
Robert Sesek [Wed, 13 Jan 2016 21:24:00 +0000 (21:24 +0000)]
Felipe Leme [Wed, 13 Jan 2016 21:23:09 +0000 (21:23 +0000)]
Merge "Save bugreport info on share intent."
Felipe Leme [Wed, 13 Jan 2016 02:12:09 +0000 (18:12 -0800)]
Save bugreport info on share intent.
When a bugreport is finished, BugreportProgressService sends a
INTENT_BUGREPORT_SHARE intent containing the bugreport pid; then when
the user clicks the share notification, BugreportProgressService uses
the pid to retrieve the bugreport info.
The problem with this approach is that if the service dies before the
user clicks the notification, the bugreport won't be shared.
This change fix this scenario by saving the bugreport info in the share intent.
BUG:
26513652
Also added more logging statements.
Change-Id: Iba86d06369f843ad88194fb1dad0c8b69764df78
Chong Zhang [Wed, 13 Jan 2016 20:55:55 +0000 (20:55 +0000)]
Merge "Several fixes for docking non-resizeable tasks"
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:44:08 +0000 (20:44 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev am:
9ae30e69ad
am:
fba6bccff5
* commit '
fba6bccff5d230b581e46ed64911d0c67e4be442':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Robert Sesek [Wed, 13 Jan 2016 18:51:07 +0000 (13:51 -0500)]
Fix SDK docs after
b9a8666eb5504f022343fef9087135b7d937ddf8.
Change-Id: Icad19dd1c888b4857d288b460d88bebb9ec20a13
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:35:46 +0000 (20:35 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile\'s MCCMNCs" into mnc-dr1.5-dev
am:
9ae30e69ad
* commit '
9ae30e69ada03ebf3408ed1d2f24a5a67ea33b68':
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Chong Zhang [Wed, 13 Jan 2016 18:39:51 +0000 (10:39 -0800)]
Several fixes for docking non-resizeable tasks
- Keep track of original task bounds and scrolled bounds separately,
so that we can reset the scrolling when the it's no longer in effect.
- Calculate the vertical offset for the toast on top half using the
content rect. The original toast position was relative to the bottom
of the content rect, not the display rect.
- Move toast display to prepareSurfaceLocked, as performShowLocked() may
not be called if the app surface is already shown.
related-to: b/
26451625
related-to: b/
26447921
Change-Id: I82113683c9e3c3beb4938dbd0829d0abf491efd9
Julia Reynolds [Wed, 13 Jan 2016 20:30:48 +0000 (20:30 +0000)]
Merge "Mock compliance for notification guts."
Pavel Zhamaitsiak [Wed, 13 Jan 2016 20:30:46 +0000 (20:30 +0000)]
Merge "Add WiFi Calling overlays for T-Mobile's MCCMNCs" into mnc-dr1.5-dev
xin He [Wed, 13 Jan 2016 20:18:58 +0000 (20:18 +0000)]
Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev
am:
5961142109 -s ours
* commit '
596114210980ae89d040ee86a5daad257c6e5f4c':
Initial codes for Quality network selection [DO NOT MERGE]
Julia Reynolds [Tue, 12 Jan 2016 13:47:04 +0000 (08:47 -0500)]
Mock compliance for notification guts.
Change-Id: I6fc63ad5b9c241d5e003a9810fde6f5aea48214e
xin He [Wed, 13 Jan 2016 20:03:50 +0000 (20:03 +0000)]
Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev
Adam Lesinski [Wed, 13 Jan 2016 20:03:26 +0000 (20:03 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash"
Dongwon Kang [Wed, 13 Jan 2016 20:01:22 +0000 (20:01 +0000)]
Merge "MediaResourceMonitor: Shorten the TAG"
Chong Zhang [Wed, 13 Jan 2016 19:52:45 +0000 (19:52 +0000)]
Merge "Fix rect convert from screen to surface coordinates with scaling"
Dongwon Kang [Wed, 13 Jan 2016 19:39:38 +0000 (11:39 -0800)]
MediaResourceMonitor: Shorten the TAG
Bug:
26541185
Change-Id: Iad1115cfc31b458dc0daa0fe37efd795fb0a32fb
Sandra Kwan [Wed, 13 Jan 2016 19:46:21 +0000 (19:46 +0000)]
Merge "AccountManager: make account session APIs SystemApi."
Chong Zhang [Wed, 13 Jan 2016 18:33:27 +0000 (10:33 -0800)]
Fix rect convert from screen to surface coordinates with scaling
When there is scaling, the top/left coordinates are also scaled. They
could be non-zero if the app is being cropped (eg. due to two-finger
scroll).
bug:
26451625
Change-Id: I90d537347b312d2438993780f52b023c2332eb68
Filip Gruszczynski [Wed, 13 Jan 2016 19:31:31 +0000 (19:31 +0000)]
Merge "Only request stack resize after non full screen bounds were set."
Filip Gruszczynski [Tue, 12 Jan 2016 23:40:13 +0000 (15:40 -0800)]
Only request stack resize after non full screen bounds were set.
Also make sure that the bounds passed to stacks and tasks are not bogus,
as these would mess up the configuration.
Bug:
26512887
Change-Id: I1a3a9c867a2c258a326b31df2bac614ccbb00579
Chet Haase [Wed, 13 Jan 2016 19:30:29 +0000 (19:30 +0000)]
Merge "Make Animation.cancel() actually work"
Pavel Zhamaitsiak [Wed, 13 Jan 2016 19:19:05 +0000 (11:19 -0800)]
Add WiFi Calling overlays for T-Mobile's MCCMNCs
Bug:
26024279
Change-Id: I71920fc45dec3e4fe5a3f4e349ff1ba3df703000
Chong Zhang [Wed, 13 Jan 2016 19:18:39 +0000 (19:18 +0000)]
Merge "Launch non-resizeable task with fullscreen bounds in docked stack."
Chris Craik [Wed, 13 Jan 2016 19:16:16 +0000 (19:16 +0000)]
Merge "Skip layer updates for layerless nodes"
Chris Craik [Wed, 13 Jan 2016 02:59:38 +0000 (18:59 -0800)]
Skip layer updates for layerless nodes
bug:
26535405
Change-Id: I4d5ea8401f59815715c5b51f88d549474876160c
Jason Monk [Wed, 13 Jan 2016 19:07:33 +0000 (19:07 +0000)]
Merge "Round out the QS API"
Keisuke Kuroyanagi [Wed, 13 Jan 2016 19:03:56 +0000 (19:03 +0000)]
Tests for getPrimaryHorizontal with grapheme boundaries am:
a5c53291a8
am:
3bb115ba5c
* commit '
3bb115ba5c8f176a355384f98e0b5348499b8b76':
Tests for getPrimaryHorizontal with grapheme boundaries
Adam Lesinski [Wed, 13 Jan 2016 19:03:35 +0000 (11:03 -0800)]
UsageStats: Fix issue where initializing data for first time would cause crash
With the updated rolling window of stats for app idleness, we need to make sure
it is populated before we initialize some defaults.
Now that we look at older entries to figure out idleness, if those
entries are in the future (due to time change), set them to the current
screen on time.
Bug:
26504153
Change-Id: I4c21e8f094a1a6727373368d043f523053280d7d
Matthew Bouyack [Wed, 13 Jan 2016 19:00:07 +0000 (19:00 +0000)]
Merge "In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments." into cw-e-dev am:
eebf168e43 am:
e0845e8629 am:
6222bb0f6a
am:
099bd9ca8f
* commit '
099bd9ca8fea02795424d62c05c723290d68ae14':
In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments.
Michael Wright [Wed, 13 Jan 2016 18:57:49 +0000 (18:57 +0000)]
Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl" am:
6fa9c5cd01
am:
35bdda107f
* commit '
35bdda107fe76ab62087527946b201551ddfe965':
Animate backlight quickly when display state request to change or power mode changed
Make sure NaturalSurfaceLayout is consistent with SurfaceControl
Keisuke Kuroyanagi [Wed, 13 Jan 2016 18:57:42 +0000 (18:57 +0000)]
Tests for getPrimaryHorizontal with grapheme boundaries
am:
a5c53291a8
* commit '
a5c53291a8123fa0296c849fe153a7dcf79b4dda':
Tests for getPrimaryHorizontal with grapheme boundaries
Alan Viverette [Wed, 13 Jan 2016 18:56:24 +0000 (18:56 +0000)]
Merge "Clean up lint warnings in popup menu presenter classes"
Kenny Root [Wed, 13 Jan 2016 18:53:10 +0000 (18:53 +0000)]
Merge "Track changes in libcore" am:
a15ef2abab
am:
5defc912cd
* commit '
5defc912cd2d8f15d03226b901ffc43db9f2d39e':
Track changes in libcore
Alan Viverette [Wed, 13 Jan 2016 18:51:40 +0000 (18:51 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Alan Viverette [Wed, 13 Jan 2016 18:51:02 +0000 (18:51 +0000)]
Merge "Avoid drawable invalidation during draw()" into mnc-dr1.5-dev am:
cf6885b7b7 am:
c783ebc13a
am:
ea2e422c23
* commit '
ea2e422c2381298b67f3ce81d01b454e85dbe269':
Avoid drawable invalidation during draw()
Chris Craik [Wed, 13 Jan 2016 18:50:56 +0000 (18:50 +0000)]
Merge "Disable buildLayer crash"
Keisuke Kuroyanagi [Wed, 13 Jan 2016 06:47:34 +0000 (15:47 +0900)]
Tests for getPrimaryHorizontal with grapheme boundaries
Bug:
25375561
Change-Id: I022473627499d7f18105e3a300754fae5be7da8e
Alan Viverette [Wed, 13 Jan 2016 18:47:59 +0000 (18:47 +0000)]
Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev am:
d9434699e4 am:
9c0890ea4b
am:
19150f05c4
* commit '
19150f05c4c3b4b73175edc764fbd64fe6988197':
Handle null result from getVirtualChildAt()
Jason Monk [Wed, 13 Jan 2016 18:46:13 +0000 (18:46 +0000)]
Get data type from service state as well am:
67b2c16a9a am:
05130f3f23
am:
8ced692e44
* commit '
8ced692e445526a74d51391f2c7c30bd43322d46':
Get data type from service state as well
Chong Zhang [Wed, 13 Jan 2016 18:29:24 +0000 (10:29 -0800)]
Launch non-resizeable task with fullscreen bounds in docked stack.
This case could happen in real world if a non-resizeable activity opens
another activity (eg. Messenger app opens an activity to write up the
message). Need to make sure the new activity is not resized.
Change-Id: I222985fa7ee2cbd94c843ac1190239cce31d3c0c
Alan Viverette [Wed, 13 Jan 2016 18:33:17 +0000 (13:33 -0500)]
Clean up lint warnings in popup menu presenter classes
Change-Id: I6b4cce1c4788b408615af0c93575e02e75b4c3ca
Steve McKay [Wed, 13 Jan 2016 18:21:08 +0000 (18:21 +0000)]
Merge "Stop listening root change events when the activity is destroyed."
Dongwon Kang [Wed, 13 Jan 2016 18:21:00 +0000 (18:21 +0000)]
Merge "Add a way for SystemUI to receive media resource (e.g. A/V codec) usage"
Clara Bayarri [Wed, 13 Jan 2016 18:06:38 +0000 (18:06 +0000)]
Merge "Request Keyboard Shortcuts for SysUI Dialog via Window"
Jae Seo [Wed, 13 Jan 2016 17:50:19 +0000 (17:50 +0000)]
Merge "TIF: Fix typos"
Robert Sesek [Wed, 13 Jan 2016 17:23:36 +0000 (17:23 +0000)]
Merge "Add external services, a way to run isolated processes as a different package."
Geoff Mendal [Wed, 13 Jan 2016 17:05:42 +0000 (17:05 +0000)]
Merge "Import translations. DO NOT MERGE"
Clara Bayarri [Wed, 29 Jul 2015 15:20:40 +0000 (16:20 +0100)]
Request Keyboard Shortcuts for SysUI Dialog via Window
Keyboard shortcuts are requested via WindowManager, and
the request pipes through to the view root and the window
callback.
Bug:
22405482
Change-Id: Ic0071e91c7b554be3ac9df71e9539ee8a60e822e
Geoff Mendal [Wed, 13 Jan 2016 16:56:52 +0000 (17:56 +0100)]
Import translations. DO NOT MERGE
Change-Id: I02b0f5198801a8c8f836a123d15bd1dd8e2caf52
Auto-generated-cl: translation import
Jason Monk [Wed, 13 Jan 2016 15:58:42 +0000 (15:58 +0000)]
Merge "Make QS only have one Host and Tiles"
Adrian Roos [Wed, 6 Jan 2016 19:49:41 +0000 (20:49 +0100)]
Scroll to RemoteInputView
Scrolls to the RemoteInputView when it's beneath the IME.
Also fixes ViewRootImpl to take into account translation
when calculating the location of the focused rect.
Bug:
22452379
Change-Id: I9b9649edeabf9bcab8fc487fe92dec62f388737e
Chet Haase [Tue, 12 Jan 2016 18:28:28 +0000 (10:28 -0800)]
Make Animation.cancel() actually work
Cancel() has apparently never worked. Calling cancel() results
in the startTime being set to Long.MIN_VALUE. In theory, this means that
on the next animation frame (getTransformation()), the elapsed time
(currentTime - startTime) should result in a large positive number, which
is way more than needed to prove that the elapsed fraction is >1 and
therefore that the animation has ended. But in practice, anything subtracting
MIN_VALUE will result in a large negative number due to Long wraparound, so the
end check fails and the animation continues. Forever.
Moreover, event fixing the cancel issue results in a repeating animation
continuing to repeat, because the logic was never there to determine whether
a repeating animation was canceled.
This fix addresses both issues, but in a minimal way. The risk in fixing this
for real is changing the behavior of cancel in a way that existing apps would not
expect. For example, it's weird that cancel causes one more frame to run. And even weirder
that it does so with a negative elapsed duration (resulting in an animation fraction of 0).
But I wouldn't want to change that behavior for fear that I'd break apps who rely on
that weird behavior.
Instead, there's a simple check for for the "expired" check and the "repeat?" check that
sees whether the startTime has the magic value of MIN_VALUE, which should only happen
when an animation has been canceled. If this is the case, it ensures that the animation ends.
For real.
Issue #
24984018 canceled animation runs forever
Change-Id: Ia137eb04bd7df3976a4d9cef86fd39a78dc56f39
Derek Sollenberger [Wed, 13 Jan 2016 15:34:57 +0000 (15:34 +0000)]
Merge "CreateLightingFilter is now on SkColorMatrixFilter"
Alan Viverette [Wed, 13 Jan 2016 15:16:11 +0000 (15:16 +0000)]
Merge "Apply tick mark tint during view construction"
Alan Viverette [Wed, 13 Jan 2016 15:10:22 +0000 (10:10 -0500)]
Apply tick mark tint during view construction
...otherwise it never gets applied.
Change-Id: I06991b3cedcf3dcfb8e98ae61e3d679c35b68839
Mike Reed [Tue, 12 Jan 2016 19:52:04 +0000 (14:52 -0500)]
CreateLightingFilter is now on SkColorMatrixFilter
Change-Id: Ic53071aa5dc618ce1a72c531180d18304c7e522a
Alan Treadway [Wed, 13 Jan 2016 14:07:38 +0000 (14:07 +0000)]
Merge "Add extra to control USER_SETUP_COMPLETE behavior."
Clara Bayarri [Wed, 13 Jan 2016 14:04:20 +0000 (14:04 +0000)]
Merge "Fix missing MANAGE_USER error on calls to isDeviceSecure"
Geoff Mendal [Wed, 13 Jan 2016 13:58:38 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 13 Jan 2016 13:58:06 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 13 Jan 2016 13:55:54 +0000 (05:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: If349d6b1bd99c61e78a7076d4c7b506abb7c9ac0
Auto-generated-cl: translation import
Geoff Mendal [Wed, 13 Jan 2016 13:52:37 +0000 (05:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I81cf6e3ce955937cc57289a59ffb794e75f72d20
Auto-generated-cl: translation import
Geoff Mendal [Wed, 13 Jan 2016 13:43:16 +0000 (13:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 13 Jan 2016 13:37:19 +0000 (05:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I488d48ed5a95fb2764dd2129fc512fa1c2db5fdb
Auto-generated-cl: translation import
Clara Bayarri [Tue, 12 Jan 2016 17:29:29 +0000 (17:29 +0000)]
Fix missing MANAGE_USER error on calls to isDeviceSecure
A poorly placed clear identity was causing some crashes as
apps were required to have the MANAGE_USERS permission to
query if the current user is secured.
Change-Id: I1120b1e4405e78389fcbcb3e7d1dba8c80500da3
Geoff Mendal [Wed, 13 Jan 2016 13:15:14 +0000 (13:15 +0000)]
Merge "Import translations. DO NOT MERGE"
Adrian Roos [Tue, 12 Jan 2016 20:00:45 +0000 (21:00 +0100)]
Improve bouncer restart prompt message
Bug:
26325366
Change-Id: I21ce92b763417f8f9cef571ceab840db71224bb7
Geoff Mendal [Wed, 13 Jan 2016 13:06:28 +0000 (05:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7e6b5a16f8f7c7835fb85abf4453ef979b2cfb2e
Auto-generated-cl: translation import
Alan Treadway [Mon, 11 Jan 2016 10:25:23 +0000 (10:25 +0000)]
Add extra to control USER_SETUP_COMPLETE behavior.
For split-user cases it has been identified that provisioning
a profile-owner during user setup-wizard shouldn't cause
the setup-wizard to exit early generally. Adding this extra
allows a DPC to control whether the user can take further steps
in the setup-wizard after management provisioning completes.
Adding as a hidden extra since we don't expect this to be useful
until after N release.
Bug:
25858670
Change-Id: I599a5df4aef659769a6323402efe078d0d12d2ed
Clara Bayarri [Fri, 18 Dec 2015 16:29:18 +0000 (16:29 +0000)]
Create Work Challenge per-user condition
Change the current static condition to a per-user condition so we
can check and enable/disable the work challenge properly. Also add
an isAllowed API, as the Work Challenge can only be used when the
user's DPC targets N or above to maintain backwards compatibility.
Change-Id: I0cb8b475838816801868ffb24726407aa257b4de
Keisuke Kuroyanagi [Wed, 13 Jan 2016 08:02:00 +0000 (08:02 +0000)]
Merge "TextView: Offer suggestions in context menu."
Jae Seo [Wed, 13 Jan 2016 07:13:14 +0000 (23:13 -0800)]
TIF: Fix typos
Change-Id: I82f7fc68840d9fcdc579fc451e9d295c04512083
Jaewan Kim [Wed, 13 Jan 2016 04:58:46 +0000 (04:58 +0000)]
Merge "Revive volume up/down long press in TV"
Jaewan Kim [Tue, 12 Jan 2016 05:45:42 +0000 (14:45 +0900)]
Revive volume up/down long press in TV
PhoneWindowManager.interceptKeyBeforeQueuing isn't good place
to handle long press because rejecting a down event will not
synthesize further key repeat.
Move the logic to PhoneWindowManager.interceptKeyBeforeDispatching
instead.
This is the regression caused by following CL
001c59c Route volume keys directly to the audio system on TVs
Bug:
26268032
Change-Id: Ic8f6dfaec473c0d45ffa42475763622dc700e635
Daichi Hirono [Wed, 13 Jan 2016 04:19:02 +0000 (13:19 +0900)]
Stop listening root change events when the activity is destroyed.
BUG=
26454244
Change-Id: I4be98f21843d6d501dd9c6fc343e905e107fc1c1
Chris Craik [Wed, 13 Jan 2016 02:55:15 +0000 (18:55 -0800)]
Disable buildLayer crash
Change-Id: Ia51e8da01d5c694fb1a084cea8dfce865c56a456
Chris Craik [Wed, 13 Jan 2016 02:27:29 +0000 (02:27 +0000)]
Merge "Fix the build"
Chris Craik [Wed, 13 Jan 2016 02:26:35 +0000 (18:26 -0800)]
Fix the build
Change-Id: I11aaa6dabdc3998155ee7f1ee58083bb88f19aad
Doris Liu [Wed, 13 Jan 2016 02:23:45 +0000 (02:23 +0000)]
Merge "Get animation update timing for AVD" into mnc-dr1.5-dev am:
a73abeaf4b am:
7537aa7596
am:
65abc0e3d3 -s ours
* commit '
65abc0e3d37e2df3caa6c02624ee7e999e0c1f26':
Get animation update timing for AVD
Adam Lesinski [Wed, 13 Jan 2016 02:12:06 +0000 (02:12 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev am:
f2cc98bc96
am:
112e26646f
* commit '
112e26646f334bed6ee202765b09e6687dde1436':
UsageStats: Fix issue where initializing data for first time would cause crash
Raph Levien [Wed, 13 Jan 2016 02:10:15 +0000 (02:10 +0000)]
Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp
am:
07ee518281
* commit '
07ee51828196e4af5fd7841c20acda96791f7f70':
Adam Lesinski [Wed, 13 Jan 2016 02:04:17 +0000 (02:04 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev
am:
f2cc98bc96
* commit '
f2cc98bc967c1b14d779198046137bf13aeb219c':
UsageStats: Fix issue where initializing data for first time would cause crash
Adam Lesinski [Wed, 13 Jan 2016 01:48:45 +0000 (01:48 +0000)]
Merge "UsageStats: Fix issue where initializing data for first time would cause crash" into mnc-dr1.5-dev
Raph Levien [Wed, 13 Jan 2016 01:45:34 +0000 (17:45 -0800)]
resolve merge conflicts of
957bdc56c5 to master.
Change-Id: I4c8749f92a1fa39bf0d08e10155d9e68c87401c0
Chris Craik [Wed, 13 Jan 2016 01:13:32 +0000 (01:13 +0000)]
Merge "Switch to new rendering pipeline"
Wale Ogunwale [Wed, 13 Jan 2016 00:59:34 +0000 (00:59 +0000)]
Merge "Fixed some activity visiblility issues in picture-in-picutre mode"
Raph Levien [Wed, 13 Jan 2016 00:54:58 +0000 (00:54 +0000)]
Merge "Fix measurement to respect grapheme and span boundaries" into mnc-dr1.5-dev am:
36c5ab3542 am:
50c22adc25
am:
243efe13a4
* commit '
243efe13a44faf3617e2df409fa8f4bd30078a5d':
Fix measurement to respect grapheme and span boundaries