229485 Commits

Author SHA1 Message Date
Yohei Yukawa
cf8403bc36 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
2016-01-12 12:17:42 -08:00
Chris Craik
67031a12f3 Merge "Fix deep copy of entry queue" 2016-01-12 20:03:48 +00:00
Derek Sollenberger
ad6f5766f6 Merge "Fix build breakage due to API update in SkShader." 2016-01-12 19:58:33 +00:00
Derek Sollenberger
2a5c242cb8 Merge "Override getSaveLayerStrategy instead of willSaveLayer" 2016-01-12 19:58:33 +00:00
Kweku Adams
eb80f7c6d6 Fix documentation typo.
Change-Id: Ia40d67069f4789d8f8d0a7cb5dcf447cedec9950
2016-01-12 19:57:34 +00:00
Steve McKay
2e41878000 Merge "Grid view padding + explicit background." 2016-01-12 19:42:41 +00:00
Steve McKay
76be620a6f Grid view padding + explicit background.
Also move section break holder into the wrapper class.

Change-Id: I949e81af180f11514aff558615cfeda44cb96a3c
2016-01-12 11:41:26 -08:00
Zach Kuznia
7ef1e7ffbc Merge "Renable split tapping while in Touch Explore mode." 2016-01-12 19:34:48 +00:00
Thierry Strudel
5aa3c441cf 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
2016-01-12 10:42:40 -08:00
Filip Gruszczynski
ba2d7e57ab Merge "Pass correct task for retrieving of overview task bounds." 2016-01-12 18:41:19 +00:00
Udam Saini
b6bb986889 Merge "Makes captive portal server calculation in one place." 2016-01-12 18:40:45 +00:00
Adam Powell
0c57596905 Merge "Eagerly update fragment state when moving between states" 2016-01-12 18:30:47 +00:00
Adam Powell
d1d4d9cb3a 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
2016-01-12 10:26:16 -08:00
Sudheer Shanka
9ec29e3d6d Merge "Move restricted padlock support to SettingsLib" 2016-01-12 18:25:00 +00:00
Filip Gruszczynski
b4cc67a3f6 Pass correct task for retrieving of overview task bounds.
This fixes the recents to freeform animation.

Bug: 24913782
Change-Id: I7df32f08c72c86d46d8b25b49bd7e063b8ba214b
2016-01-12 10:23:58 -08:00
Derek Sollenberger
e1721099b5 Fix build breakage due to API update in SkShader.
bug: 25344771
Change-Id: I64198a77c75d6768091dafd5c045b02ef66dfdad
(cherry picked from commit f4eca05cdc19c095cdc0a9140d512737533a87c5)
2016-01-12 18:21:17 +00:00
Leon Scroggins III
5518e7cbd4 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)
2016-01-12 18:20:38 +00:00
Thierry Strudel
f0a44183cd Report SwapPss in am_pss reports
Change-Id: I5d3aa7f9d4b7b0b167ec214fa50fdf665cdc328f
2016-01-12 10:16:16 -08:00
Martijn Coenen
41f94edd5a Add Swap and SwapPss to meminfo checkin dump.
And make --checkin an accepted argument.

Change-Id: I6294915ec02c49415c7071f54ad995aa76b67e6c
2016-01-12 10:16:15 -08:00
Martijn Coenen
e076485754 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>
2016-01-12 10:15:25 -08:00
Gustav Sennton
32895546c6 Merge "More string resources for WebView implementation setting." 2016-01-12 18:14:45 +00:00
Sudheer Shanka
7ff866d286 Move restricted padlock support to SettingsLib
Change-Id: Ib0b1c58d1f45e017b6b17ce0a55ca839b900cba4
2016-01-12 18:14:24 +00:00
Joseph Pirozzo
951bc3b514 Merge "Update Activity Manager to prevent popups while driving." 2016-01-12 18:01:25 +00:00
Alan Viverette
b06271db81 Merge "Don't explicitly set the title's layout direction" 2016-01-12 17:48:42 +00:00
Jeff Tinker
c8c0de38d1 Merge "Support AES-CBC sample encryption in MediaDrm" 2016-01-12 17:42:16 +00:00
Philip P. Moltmann
6ec7ed2f96 Merge "Deal with UserState#getEnabledPrintServices returning null." 2016-01-12 17:18:20 +00:00
Tony Mantler
231c9fd727 Merge "Move a bunch of app restrictions logic to SettingsLib" 2016-01-12 17:17:00 +00:00
Tony Mantler
e662ca6b5e Move a bunch of app restrictions logic to SettingsLib
Change-Id: I68cd6304164744fd0676d13ef6badffac79adab5
2016-01-12 09:16:21 -08:00
Philip P. Moltmann
05e3423070 Deal with UserState#getEnabledPrintServices returning null.
Bug: 26492364
Change-Id: I234b1632168c88d32bdd134630442756701118b6
2016-01-12 09:13:21 -08:00
Alan Viverette
866d37d3c9 Merge "Apply Spinner dropDownSelector value from XML" 2016-01-12 15:52:32 +00:00
Alan Viverette
0ef12aefe5 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
2016-01-12 09:47:09 -05:00
Victor Chang
c754dffe19 Merge "Create a new device policy for controlling work contacts search" 2016-01-12 11:51:01 +00:00
Victor Chang
1060c61866 Create a new device policy for controlling work contacts search
BUG=25981902

Change-Id: I5cea59d7d09bf54051ae0e56e824e4d3a08a49e7
2016-01-12 11:31:16 +00:00
Adrian Roos
83e725da7a Apply transformations while offsetting focused rects
Change-Id: Id6ebf8d50bd74f52fb76cf12bf14ccc0dcf7e34b
2016-01-12 12:25:36 +01:00
Daichi Hirono
0ec4312475 Merge "Remove unused lines in MtpDocumentsProvider." 2016-01-12 04:23:07 +00:00
Tyler Gunn
f5afe6ab8d Merge "Add KEY_USE_RCS_PRESENCE_BOOL carrier config option." 2016-01-12 03:59:29 +00:00
Chris Craik
b250a834e4 Fix deep copy of entry queue
also fixes several 64 bit compilation issues

Change-Id: I1825f822d02be72c21bdcd07cefa68217856ddc2
2016-01-11 19:28:19 -08:00
Tyler Gunn
3e122f76f1 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
2016-01-11 19:25:00 -08:00
Daichi Hirono
d7c46bdec1 Merge "Reland "Add event parameters to MtpEvent."" 2016-01-12 03:20:45 +00:00
Jeff Sharkey
9229ee5959 Merge "Install non-EA providers once user is unlocked." 2016-01-12 03:16:22 +00:00
Daichi Hirono
2a9a43369b 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
2016-01-12 12:14:30 +09:00
Daichi Hirono
8f124a9a97 Merge "Revert "Add event parameters to MtpEvent."" 2016-01-12 02:34:03 +00:00
Tyler Gunn
794d9e88af Merge "Adding @IntDef checking for Video Quality and Video State values." 2016-01-12 02:32:19 +00:00
Daichi Hirono
497f806350 Revert "Add event parameters to MtpEvent."
This reverts commit 592356b63f7446eec2e521a5649e986582183c49.

Change-Id: I9d5eae69c20c914d7946d4e933ada905f428dcb6
2016-01-12 02:31:48 +00:00
Daichi Hirono
0c66554a9a Merge "Add event parameters to MtpEvent." 2016-01-12 02:27:46 +00:00
Takayuki Hoshi
bb0ec55545 Do not show volume expander when there is no touch feature
Bug: 26099430
Change-Id: Ieeeb896dae824681a9a655849c84200a9f25214d
(cherry picked from commit e49bc6ea98c2eafdcdaedc3f6c9ffbe02ee48628)
2016-01-12 02:23:22 +00:00
Chris Craik
ae10e1368c Merge "Fix clip serialization crash" 2016-01-12 02:14:29 +00:00
Chris Craik
15f046866c 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
2016-01-11 17:54:49 -08:00
Filip Gruszczynski
2e263c4a12 Merge "Deliver onNewIntent before onResume when launching recents." 2016-01-12 01:49:12 +00:00
Filip Gruszczynski
e826f327cf Deliver onNewIntent before onResume when launching recents.
Bug: 25837292
Change-Id: I9da5d2a87c0e33006ef1488dfab5389911955922
2016-01-11 17:47:58 -08:00