OSDN Git Service
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."
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
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
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':
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
Jim Miller [Wed, 13 Jan 2016 00:49:46 +0000 (00:49 +0000)]
Merge "Fix problem where keyguard shows spontaneously"
Takayuki Hoshi [Wed, 13 Jan 2016 00:47:25 +0000 (00:47 +0000)]
Merge "Do not show volume expander when there is no touch feature"
Adam Lesinski [Wed, 13 Jan 2016 00:43:39 +0000 (00:43 +0000)]
Merge "resolve merge conflicts of
551fc6823a to "
Adam Lesinski [Wed, 13 Jan 2016 00:41:48 +0000 (16:41 -0800)]
resolve merge conflicts of
551fc6823a to master.
Change-Id: I2778bf2a364c103fc0d351f2afc4fc73bede2f19
Ronghua Wu [Wed, 13 Jan 2016 00:40:38 +0000 (00:40 +0000)]
Merge "Revert "media: Add MIMETYPE_VIDEO_DOLBY_AVC and MIMETYPE_VIDEO_DOLBY_HEVC.""
Amit Mahajan [Wed, 13 Jan 2016 00:36:14 +0000 (00:36 +0000)]
Added constructor with looper param for OnSubscriptionsChangedListener
am:
831e401c05
* commit '
831e401c055391745691a58d0c87c48b49139f50':
Added constructor with looper param for OnSubscriptionsChangedListener
Thierry Strudel [Wed, 13 Jan 2016 00:33:13 +0000 (00:33 +0000)]
Merge changes I96415ec6,I5d3aa7f9,I6294915e,I361928c0
* changes:
Report SwapPss in dumpsys meminfo when requested and available
Report SwapPss in am_pss reports
Add Swap and SwapPss to meminfo checkin dump.
Report SwapPss usage if available as part of Pss
Jean-Michel Trivi [Wed, 13 Jan 2016 00:20:56 +0000 (00:20 +0000)]
Merge changes from topic 'recordingcallback'
* changes:
Audio recording notification API
AudioManager event dispatcher: make more generic
Kenny Root [Wed, 13 Jan 2016 00:14:24 +0000 (00:14 +0000)]
Merge "Track changes in libcore"
Amit Mahajan [Tue, 12 Jan 2016 23:43:36 +0000 (15:43 -0800)]
Added constructor with looper param for OnSubscriptionsChangedListener
This is needed for tests as subclasses may need to specify which
looper to use.
Bug:
25691379
Change-Id: Ia6eb2d34c439b420ef81622e3c8ff50a0290da22
Chris Craik [Wed, 13 Jan 2016 00:11:05 +0000 (16:11 -0800)]
Switch to new rendering pipeline
bug:
22480459
Change-Id: I3ca94c4b6c556ba6d133e2314ac0307e874651fa
Jean-Michel Trivi [Mon, 7 Dec 2015 19:59:31 +0000 (11:59 -0800)]
Audio recording notification API
AudioService can register a recording callback with AudioSystem.
Callbacks are handled in a new class, RecordingActivityMonitor.
This class notifies registered AudioManager instances
of updates, only if this AudioManager has client callbacks.
Each AudioManager dispatches updates to its registered
callbacks.
Bug
22876530
Change-Id: I95c6e5ec0631e53af53a490bcecca96089490089
Pavel Zhamaitsiak [Wed, 13 Jan 2016 00:09:05 +0000 (00:09 +0000)]
Merge "resolve merge conflicts of
68514d5325 to "
Pavel Zhamaitsiak [Wed, 13 Jan 2016 00:03:04 +0000 (00:03 +0000)]
resolve merge conflicts of
68514d5325 to master.
Change-Id: Ifbd3766e8a799a72e49adcdc6c5d509f2b8b53a6
Pavel Zhamaitsiak [Tue, 12 Jan 2016 23:44:08 +0000 (23:44 +0000)]
Merge "resolve merge conflicts of
68514d5325 to "
Chris Craik [Tue, 12 Jan 2016 23:44:02 +0000 (23:44 +0000)]
Merge "Fix shadow bounds calculation"
Pavel Zhamaitsiak [Tue, 12 Jan 2016 23:43:11 +0000 (15:43 -0800)]
resolve merge conflicts of
68514d5325 to master.
Change-Id: I989230fe4a307070f7d13b53b9eea9f23a4b5e34
Chris Craik [Tue, 12 Jan 2016 23:38:14 +0000 (15:38 -0800)]
Fix shadow bounds calculation
Change-Id: I78b6aa91d62c3c4838ffc80b380604c7863e8467
Chris Craik [Tue, 12 Jan 2016 23:00:50 +0000 (23:00 +0000)]
Merge "Rename Reorderers to Builders"
Chris Craik [Tue, 12 Jan 2016 22:45:08 +0000 (14:45 -0800)]
Rename Reorderers to Builders
Change-Id: I9bb5a2e70055e2f6d14912fbd86ab72ac0d6e20c
Kenny Root [Tue, 12 Jan 2016 22:20:52 +0000 (14:20 -0800)]
Track changes in libcore
The OCSP update added some API changes necessary to interact with it.
This change tracks the addition of the API.
Change-Id: I04438fda92cbcde8bc9c66be4f0440066926b51a
Geoff Mendal [Tue, 12 Jan 2016 22:19:43 +0000 (22:19 +0000)]
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev am:
66841a62f1 -s ours am:
73992aee94 -s ours am:
0663959eb7 -s ours am:
8635657b17 -s ours am:
4c042b096e -s ours am:
e7ca49b098 -s ours
am:
e4476a7904 -s ours
* commit '
e4476a79048550f480f9a3f4719c94242808558f':
Revert "Import translations. DO NOT MERGE"
Chris Craik [Tue, 12 Jan 2016 22:10:19 +0000 (22:10 +0000)]
Merge "Fix 9 patch mesh usage"
Filip Gruszczynski [Tue, 12 Jan 2016 22:10:10 +0000 (22:10 +0000)]
Merge "Use full display size for calculating volume dialog size."
Jeff Sharkey [Tue, 12 Jan 2016 21:57:32 +0000 (21:57 +0000)]
Merge "Follow installd changes, throw exceptions."
Ben Kwa [Tue, 12 Jan 2016 21:56:39 +0000 (21:56 +0000)]
Merge "Embiggen the progress bar."
Chris Craik [Tue, 12 Jan 2016 21:45:34 +0000 (13:45 -0800)]
Fix 9 patch mesh usage
Change-Id: I638fd5816d68a9ecd7f1709624fde2f372de5fa7
Wale Ogunwale [Tue, 12 Jan 2016 20:20:18 +0000 (12:20 -0800)]
Fixed some activity visiblility issues in picture-in-picutre mode
- Previously when don't re-launch an activity due to configuration
change if the activity is currently pausing. And, once the pause is
complete we destroy the activity. This logic is based on the assumption
that all activities are fullscreen and pausing is the same as stopping
which means the activity is no longer visible and can be destoried.
This assumption is not true in multi-window mode where you can have
visible activities in the paused state.
We now relaunch the activity once it is done pausing.
- Previously we set the return type of the top task in a stack to home
if the previously focused stack is home while add the task to the stack.
This logic is based on the assumption that the focus stack is the front
stack which isn't true for pinned stack. This causes an activity behind
the top translucent activity in the pinned stack to be marked as invisible
and stopped since the top task is over the home task so we should be
showing the home task behind it and not other tasks in the stack.
We now set the return to task type to application type for task added to
the pinned stack.
Bug:
26273032
Change-Id: I0ffac81f46c57e2d0d900db3417381f059aee7ea
Ben Kwa [Tue, 12 Jan 2016 20:14:26 +0000 (12:14 -0800)]
Embiggen the progress bar.
BUG=
26159818
Change-Id: I12a33be503dd29d03cb85b814b287879c016275d
Filip Gruszczynski [Tue, 12 Jan 2016 21:22:38 +0000 (13:22 -0800)]
Use full display size for calculating volume dialog size.
Bug:
26485500
Change-Id: I25ef29a3d611617b4dc59a315b072fafb3f3f825
Jeff Sharkey [Tue, 12 Jan 2016 00:34:24 +0000 (17:34 -0700)]
Follow installd changes, throw exceptions.
Start by passing down flags to work on both CE and DE storage areas;
a future change will refine this further.
Force consistent argument checking and null handling for all
installd callers. Throw explicit exceptions instead of returning int
values that can accidentally be ignored.
Bug:
26466827
Change-Id: Iddb591f6b3c7786d210d3f132ff7f9886a97b749
Jeff Sharkey [Tue, 12 Jan 2016 21:06:58 +0000 (14:06 -0700)]
Parsing a static archive should be stateless.
When the caller hasn't specific encryption-related matching flags,
we should match both aware and unaware components.
Bug:
26508249
Change-Id: I2c35f6e00e451ba3f5fa0810223b7a3d80dee233
Jeff Sharkey [Tue, 12 Jan 2016 20:44:20 +0000 (13:44 -0700)]
Don't spin up encryption unaware providers twice.
Bug:
26503591
Change-Id: I31b92f3a31103dffb17de8ac8d887d864cb0de28
Yohei Yukawa [Tue, 12 Jan 2016 20:38:58 +0000 (20:38 +0000)]
Merge "Suppress NPE in IMS#onEvaluateInputViewShown()."
Chris Craik [Tue, 12 Jan 2016 20:31:17 +0000 (20:31 +0000)]
Merge "Fix a couple crashes in the new reorderer"
Adrian Roos [Tue, 12 Jan 2016 20:21:25 +0000 (20:21 +0000)]
Merge "Apply transformations while offsetting focused rects"
Chris Craik [Tue, 12 Jan 2016 20:09:19 +0000 (12:09 -0800)]
Fix a couple crashes in the new reorderer
Also fixes the layer clear scissor logic in BakedOpRenderer, fixing a
flicker.
Change-Id: I61106a18938ea35e31f0a0b585b5743544245773
Yohei Yukawa [Tue, 12 Jan 2016 19:54:58 +0000 (11:54 -0800)]
Suppress NPE in IMS#onEvaluateInputViewShown().
This is a follow up CL for the previous commit [1], which may have
triggered an unknown bug in either Android Framework or LatinIME.
[1]: Id4d332e3909590c68345e10e1f2e18650efb2eb7
7b739a802cb7d97460a0bf8a1e9774efe96fa552
InputMethodService#mSettingsObserver is initialized in #onCreate() and
cleard with null in #onDestroy(). Hence hitting NPE against it implies
that InputMethodService#onEvaluateInputViewShown() can be called before
InputMethodService#onCreate() or after InputMethodService#onDestroy().
Both possibilities are equaly problematic. Note that this might be a
long-standing issue that just became obvious because of [1].
This CL does not attempt to fix the root cause but just tries to
suppresses the NPE to unblock QA tasks. A proper fix should be made in
subsequent CLs.
Bug:
22517687
Bug:
26511607
Change-Id: I6bc87c3d18b560fe2253fb9f05557b95b04d0cf0
Chris Craik [Tue, 12 Jan 2016 20:03:48 +0000 (20:03 +0000)]
Merge "Fix deep copy of entry queue"
Derek Sollenberger [Tue, 12 Jan 2016 19:58:33 +0000 (19:58 +0000)]
Merge "Fix build breakage due to API update in SkShader."
Derek Sollenberger [Tue, 12 Jan 2016 19:58:33 +0000 (19:58 +0000)]
Merge "Override getSaveLayerStrategy instead of willSaveLayer"
Kweku Adams [Tue, 12 Jan 2016 19:46:52 +0000 (11:46 -0800)]
Fix documentation typo.
Change-Id: Ia40d67069f4789d8f8d0a7cb5dcf447cedec9950
Steve McKay [Tue, 12 Jan 2016 19:42:41 +0000 (19:42 +0000)]
Merge "Grid view padding + explicit background."
Steve McKay [Tue, 12 Jan 2016 19:14:33 +0000 (11:14 -0800)]
Grid view padding + explicit background.
Also move section break holder into the wrapper class.
Change-Id: I949e81af180f11514aff558615cfeda44cb96a3c
Zach Kuznia [Tue, 12 Jan 2016 19:34:48 +0000 (19:34 +0000)]
Merge "Renable split tapping while in Touch Explore mode."
Thierry Strudel [Sat, 19 Dec 2015 01:31:48 +0000 (17:31 -0800)]
Report SwapPss in dumpsys meminfo when requested and available
When requested (-a or -S options), add to the meminfo dump the
proportional swap when available to the system. The reported amount is
the PSS memory not having being accessed recently and being swapped out
of memory.
Total PSS by process:
76,265K: system (pid 912) ( 290K in swap)
67,080K: com.android.systemui (pid 3133) ( 270K in swap)
...
Total PSS by category:
287,803K: .dex mmap ( 0K in swap)
264,575K: Native ( 25,184K in swap)
241,077K: Dalvik ( 9,391K in swap)
Bug:
26190445
Change-Id: I96415ec65b60c9f60e397d2b3acca9a6e1399aba
Filip Gruszczynski [Tue, 12 Jan 2016 18:41:19 +0000 (18:41 +0000)]
Merge "Pass correct task for retrieving of overview task bounds."
Udam Saini [Tue, 12 Jan 2016 18:40:45 +0000 (18:40 +0000)]
Merge "Makes captive portal server calculation in one place."
Adam Powell [Tue, 12 Jan 2016 18:30:47 +0000 (18:30 +0000)]
Merge "Eagerly update fragment state when moving between states"
Adam Powell [Tue, 12 Jan 2016 18:11:42 +0000 (10:11 -0800)]
Eagerly update fragment state when moving between states
As seen in frameworks/support!
Previously we would not set a fragment's new state until the move to a
new target state was fully complete. This causes problems when other
parts of the fragment manager infrastructure (such as lazily
initializing a child fragment manager) read that state while we're
dispatching a state change call to a fragment.
In this situation, adding a child fragment and then calling
executePendingTransactions on the child FragmentManager would not have
the intended effect, as the child FragmentManager would still be in
state INITIALIZING. The expected lifecycle callbacks to the child
fragment would then occur later.
Fix this by updating the fragment state as we go through each phase of
moveToState before we dispatch to the associated onState method,
matching our usual pattern of invoking onFoo methods after foo has
occurred. Delete the redundant resumed field as we now can use the
state directly.
Bug
25019275
Change-Id: I97fe45578d59ab643c9779eaeb475a331e446335
Sudheer Shanka [Tue, 12 Jan 2016 18:25:00 +0000 (18:25 +0000)]
Merge "Move restricted padlock support to SettingsLib"
Filip Gruszczynski [Tue, 12 Jan 2016 18:23:58 +0000 (10:23 -0800)]
Pass correct task for retrieving of overview task bounds.
This fixes the recents to freeform animation.
Bug:
24913782
Change-Id: I7df32f08c72c86d46d8b25b49bd7e063b8ba214b
Derek Sollenberger [Tue, 5 Jan 2016 19:08:24 +0000 (14:08 -0500)]
Fix build breakage due to API update in SkShader.
bug:
25344771
Change-Id: I64198a77c75d6768091dafd5c045b02ef66dfdad
(cherry picked from commit
f4eca05cdc19c095cdc0a9140d512737533a87c5)
Leon Scroggins III [Mon, 4 Jan 2016 14:37:42 +0000 (09:37 -0500)]
Override getSaveLayerStrategy instead of willSaveLayer
willSaveLayer was removed in https://codereview.chromium.org/
1537193002
Requires SkCanvas::SaveLayerFlagsToSaveFlags, added in ag/839104
(Ic78acd6d780245bd30b891e7dcabe29daacc17f4)
Change-Id: Idc49b38fc7939620267b4402ff3846b29f27c81a
(cherry picked from commit
e208643a6f9d076274dd683c51a086b1e3679896)
Thierry Strudel [Fri, 8 Jan 2016 02:08:04 +0000 (18:08 -0800)]
Report SwapPss in am_pss reports
Change-Id: I5d3aa7f9d4b7b0b167ec214fa50fdf665cdc328f
Martijn Coenen [Mon, 14 Dec 2015 14:28:51 +0000 (15:28 +0100)]
Add Swap and SwapPss to meminfo checkin dump.
And make --checkin an accepted argument.
Change-Id: I6294915ec02c49415c7071f54ad995aa76b67e6c
Martijn Coenen [Fri, 8 Jan 2016 01:04:22 +0000 (17:04 -0800)]
Report SwapPss usage if available as part of Pss
Parse "SwapPss:" lines from /proc/pid/smaps if it exist, and store them
in a seperate stat entry.
Report SwapPss if made available by kernel, otherwise we fall back to
legacy Swap.
Fix getTotalSwappablePss documentation.
Change-Id: I361928c0f44c7dc9b959b91c127c916215063866
Signed-off-by: Thierry Strudel <tstrudel@google.com>
Gustav Sennton [Tue, 12 Jan 2016 18:14:45 +0000 (18:14 +0000)]
Merge "More string resources for WebView implementation setting."
Sudheer Shanka [Tue, 12 Jan 2016 17:22:06 +0000 (17:22 +0000)]
Move restricted padlock support to SettingsLib
Change-Id: Ib0b1c58d1f45e017b6b17ce0a55ca839b900cba4
Joseph Pirozzo [Tue, 12 Jan 2016 18:01:25 +0000 (18:01 +0000)]
Merge "Update Activity Manager to prevent popups while driving."
Alan Viverette [Tue, 12 Jan 2016 17:48:42 +0000 (17:48 +0000)]
Merge "Don't explicitly set the title's layout direction"
Jeff Tinker [Tue, 12 Jan 2016 17:42:16 +0000 (17:42 +0000)]
Merge "Support AES-CBC sample encryption in MediaDrm"
Philip P. Moltmann [Tue, 12 Jan 2016 17:18:20 +0000 (17:18 +0000)]
Merge "Deal with UserState#getEnabledPrintServices returning null."
Tony Mantler [Tue, 12 Jan 2016 17:17:00 +0000 (17:17 +0000)]
Merge "Move a bunch of app restrictions logic to SettingsLib"
Tony Mantler [Mon, 11 Jan 2016 19:42:12 +0000 (11:42 -0800)]
Move a bunch of app restrictions logic to SettingsLib
Change-Id: I68cd6304164744fd0676d13ef6badffac79adab5
Philip P. Moltmann [Tue, 12 Jan 2016 16:54:55 +0000 (08:54 -0800)]
Deal with UserState#getEnabledPrintServices returning null.
Bug:
26492364
Change-Id: I234b1632168c88d32bdd134630442756701118b6
Alan Viverette [Tue, 12 Jan 2016 15:52:32 +0000 (15:52 +0000)]
Merge "Apply Spinner dropDownSelector value from XML"
Alan Viverette [Tue, 12 Jan 2016 14:47:09 +0000 (09:47 -0500)]
Clean up LayerDrawable, refactoring only
Uses consistent naming and ordering for padding and inset calculations.
Updates documentation to include UNDEFINED_INSET as public API, since we
return the value and will accept the value as a valid param. Flattens
out RTL logic for readability.
Change-Id: Ie704e2e5fc7f5763500ebe1217ddbbf4d0c5ef86
Victor Chang [Tue, 12 Jan 2016 11:51:01 +0000 (11:51 +0000)]
Merge "Create a new device policy for controlling work contacts search"
Victor Chang [Mon, 4 Jan 2016 20:16:23 +0000 (20:16 +0000)]
Create a new device policy for controlling work contacts search
BUG=
25981902
Change-Id: I5cea59d7d09bf54051ae0e56e824e4d3a08a49e7
Adrian Roos [Fri, 8 Jan 2016 15:49:17 +0000 (16:49 +0100)]
Apply transformations while offsetting focused rects
Change-Id: Id6ebf8d50bd74f52fb76cf12bf14ccc0dcf7e34b
Daichi Hirono [Tue, 12 Jan 2016 04:23:07 +0000 (04:23 +0000)]
Merge "Remove unused lines in MtpDocumentsProvider."
Tyler Gunn [Tue, 12 Jan 2016 03:59:29 +0000 (03:59 +0000)]
Merge "Add KEY_USE_RCS_PRESENCE_BOOL carrier config option."
Chris Craik [Tue, 12 Jan 2016 03:28:17 +0000 (19:28 -0800)]
Fix deep copy of entry queue
also fixes several 64 bit compilation issues
Change-Id: I1825f822d02be72c21bdcd07cefa68217856ddc2
Tyler Gunn [Tue, 12 Jan 2016 03:25:00 +0000 (19:25 -0800)]
Add KEY_USE_RCS_PRESENCE_BOOL carrier config option.
- New carrier config option is used to determine if presence is used
to determine whether a contact is capable of video calling.
- Also, improve logging for PhoneAccount capabilities.
Bug:
20257833
Change-Id: Ifcc7df95677eb4399f08eb8849c4004892957e90
Daichi Hirono [Tue, 12 Jan 2016 03:20:45 +0000 (03:20 +0000)]
Merge "Reland "Add event parameters to MtpEvent.""
Jeff Sharkey [Tue, 12 Jan 2016 03:16:22 +0000 (03:16 +0000)]
Merge "Install non-EA providers once user is unlocked."
Daichi Hirono [Mon, 11 Jan 2016 04:33:41 +0000 (13:33 +0900)]
Reland "Add event parameters to MtpEvent."
The CL was previously reviewed at ag/842930.
> We can obtain detailed information of MtpEvent from devices. e.g. object
> handle of changed object. The CL adds the detailed information as
> properties of MtpEvent class.
>
> BUG=
26480986
Change-Id: I93afad9caf118d74cd0923d70242133c4fb2a648
Daichi Hirono [Tue, 12 Jan 2016 02:34:03 +0000 (02:34 +0000)]
Merge "Revert "Add event parameters to MtpEvent.""
Tyler Gunn [Tue, 12 Jan 2016 02:32:19 +0000 (02:32 +0000)]
Merge "Adding @IntDef checking for Video Quality and Video State values."
Daichi Hirono [Tue, 12 Jan 2016 02:31:48 +0000 (02:31 +0000)]
Revert "Add event parameters to MtpEvent."
This reverts commit
592356b63f7446eec2e521a5649e986582183c49.
Change-Id: I9d5eae69c20c914d7946d4e933ada905f428dcb6
Daichi Hirono [Tue, 12 Jan 2016 02:27:46 +0000 (02:27 +0000)]
Merge "Add event parameters to MtpEvent."
Takayuki Hoshi [Thu, 17 Dec 2015 11:50:25 +0000 (20:50 +0900)]
Do not show volume expander when there is no touch feature
Bug:
26099430
Change-Id: Ieeeb896dae824681a9a655849c84200a9f25214d
(cherry picked from commit
e49bc6ea98c2eafdcdaedc3f6c9ffbe02ee48628)
Chris Craik [Tue, 12 Jan 2016 02:14:29 +0000 (02:14 +0000)]
Merge "Fix clip serialization crash"
Chris Craik [Tue, 12 Jan 2016 01:50:08 +0000 (17:50 -0800)]
Fix clip serialization crash
Can't safely rewind clip allocations, since those pointers are cached by
ClipArea. Instead add early rejection to handle most cases, and update
tests.
Change-Id: Ic32f95cf95602f427f25761a8da1583c4495f36d
Filip Gruszczynski [Tue, 12 Jan 2016 01:49:12 +0000 (01:49 +0000)]
Merge "Deliver onNewIntent before onResume when launching recents."
Filip Gruszczynski [Tue, 12 Jan 2016 01:15:22 +0000 (17:15 -0800)]
Deliver onNewIntent before onResume when launching recents.
Bug:
25837292
Change-Id: I9da5d2a87c0e33006ef1488dfab5389911955922
Doris Liu [Tue, 12 Jan 2016 01:44:19 +0000 (01:44 +0000)]
Merge "Get animation update timing for AVD" into mnc-dr1.5-dev am:
a73abeaf4b
am:
7537aa7596
* commit '
7537aa75968d127525ef8fba84f365514ae789a3':
Get animation update timing for AVD