OSDN Git Service
Sudheer Shanka [Thu, 7 Jan 2016 18:43:40 +0000 (18:43 +0000)]
Merge "Add an intent for ShowAdminSupportDetailsDialog in settings."
Jeff Sharkey [Thu, 7 Jan 2016 18:31:53 +0000 (18:31 +0000)]
Merge "Add flags to requests for package UID/GIDs."
Matt Sarett [Thu, 7 Jan 2016 18:31:18 +0000 (18:31 +0000)]
Merge "Allow ninepatches to be encoded using non-RGBA modes"
Daniel Sandler [Thu, 7 Jan 2016 18:21:04 +0000 (18:21 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev am:
c2ec3f1bbe am:
f61708617c
am:
2c8f42d730 -s ours
* commit '
2c8f42d73005507bcd4d169fc42e844ee0a16521':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Felipe Leme [Thu, 7 Jan 2016 18:17:39 +0000 (18:17 +0000)]
Merge "Include title and description on bugreport.zip"
Matt Sarett [Mon, 14 Dec 2015 18:08:33 +0000 (13:08 -0500)]
Allow ninepatches to be encoded using non-RGBA modes
The original intention for forcing ninepatches to be encoded as
RGBA (with alpha) was to avoid the possibility of the decoder
producing 565 output.
565 output is bad for ninepatches because dithering tiny images
that we intend to scale later leads to bad results. I would
argue that, since the new BitmapFactory does not dither, we might
now be ok to allow 565 decodes for ninepatches. However, we
will maintain the old behavior by disabling 565 decodes for
ninepatch.
There are two changes to PNG encodings:
(1) Allows ninepatch images to be encoded in any mode. Forcing
them to RGBA makes things awkward for the decoder. Currently,
BitmapFactory's png decoder checks every pixel for alpha.
That way, RGBA images that are actually opaque can be marked
as opaque, in order to optimize drawing. We want to remove
this complexity from the decoder.
(2) Make sure ninepatch chunks are stored in the png header. That
way we know immediately that the png is a ninepatch, and can
refuse to decode to 565 (if we feel this is best).
Change-Id: I724f5dbefb1be7b412f9b362dff83cbc0603f0bf
Daniel Sandler [Thu, 7 Jan 2016 18:17:10 +0000 (18:17 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev am:
c2ec3f1bbe
am:
f61708617c
* commit '
f61708617ca7eb85b81f479fedf7364fff0395d5':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Andrei Stingaceanu [Thu, 7 Jan 2016 17:55:57 +0000 (17:55 +0000)]
Lock screen customization message: documentation note
Specify in the javadocs the behavior when the message is formed
from whitespaces only. It is not obvious.
Bug:
26313904
Change-Id: I51d5722f090a0780a65f20395bee4fc40f9eb446
Daniel Sandler [Thu, 7 Jan 2016 18:13:07 +0000 (18:13 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev
am:
c2ec3f1bbe
* commit '
c2ec3f1bbe7271be2126b48fc94acc42a37f43f2':
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Daniel Sandler [Thu, 7 Jan 2016 18:09:29 +0000 (18:09 +0000)]
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev
Dan Sandler [Tue, 29 Dec 2015 20:45:39 +0000 (15:45 -0500)]
DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Never attribute to malice that which is adequately explained
by a bug, particularly one involving date math.
Bug:
26326394
Change-Id: I3483ac102c678a8852565c8ea94c06e19b3f26d8
Rakesh Iyer [Thu, 7 Jan 2016 18:07:04 +0000 (18:07 +0000)]
Merge "System UI for auto."
Hall Liu [Thu, 7 Jan 2016 17:50:08 +0000 (17:50 +0000)]
Merge "Don't call pre- and post-handlers for state machine initialization"
Philip P. Moltmann [Thu, 7 Jan 2016 17:42:57 +0000 (17:42 +0000)]
Merge "Store which print services are disabled instead of which are enabled"
Xiaohui Chen [Thu, 7 Jan 2016 17:35:56 +0000 (17:35 +0000)]
Merge "sysui: remove some dead code"
Jeff Sharkey [Wed, 6 Jan 2016 23:47:42 +0000 (16:47 -0700)]
Add flags to requests for package UID/GIDs.
This gives callers the ability to request details for missing
packages. Also add annotations for userId and appId variables and
start tagging their usage.
Change-Id: I63d5d7f870ac4b7ebae501e0ba4f40e08b14f3f6
Xiaohui Chen [Wed, 6 Jan 2016 19:26:53 +0000 (11:26 -0800)]
sysui: remove some dead code
Change-Id: I77f16798971e1984fc4be058f626a1730b8c0c89
Philip P. Moltmann [Tue, 22 Dec 2015 01:03:05 +0000 (17:03 -0800)]
Store which print services are disabled instead of which are enabled
This make services that appreared while the print manager was not active
by default enabled.
In the case we upgrade from pre-N we convert the enabled-list into a
disabled-list.
Bug:
26249649
Change-Id: Iae783a8dd19f1a9d75d675710ea4348fdfbd34f3
Philip P. Moltmann [Thu, 7 Jan 2016 17:25:49 +0000 (09:25 -0800)]
Remove debugging from print notification code.
Change-Id: I3f0fb6c68de0b3f4cd0fa67ddf8c405199d6498e
Philip P. Moltmann [Thu, 7 Jan 2016 17:21:03 +0000 (17:21 +0000)]
Merge "Use notification grouping for print notification."
Philip P. Moltmann [Wed, 6 Jan 2016 21:26:02 +0000 (13:26 -0800)]
Use notification grouping for print notification.
Change-Id: Ifb5bc0f233611a056db511b15379165ac6fe0edf
Filip Gruszczynski [Thu, 7 Jan 2016 17:08:56 +0000 (17:08 +0000)]
Merge "Use activity dimensions instead of display to calculate dialog size."
Jeff Sharkey [Thu, 7 Jan 2016 17:01:36 +0000 (17:01 +0000)]
Merge "Internal components still need filename access."
Jeff Sharkey [Thu, 7 Jan 2016 16:58:40 +0000 (09:58 -0700)]
Internal components still need filename access.
Give them a way to force-enable filename access, bypassing the
recently added deprecated check.
Bug:
26438975
Change-Id: Ifd1e3debf7c7b3113907a5f2815c29ddb7db581f
Baligh Uddin [Thu, 7 Jan 2016 16:55:04 +0000 (16:55 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251 am:
ee895112b3 am:
9530b07c4e am:
4329dd6a62
am:
5ce01af8a3
* commit '
5ce01af8a31eec16f1c41c5adf27a41a692b3864':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:51:10 +0000 (16:51 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251 am:
ee895112b3 am:
9530b07c4e
am:
4329dd6a62
* commit '
4329dd6a625e829f0395889586d98bf1523f72ef':
Fix plurals variable to unblock Translations Pipeline.
Jeff Sharkey [Thu, 7 Jan 2016 16:49:02 +0000 (16:49 +0000)]
Merge "GmsCore is casting to a concrete subclass, sigh."
Jeff Sharkey [Thu, 7 Jan 2016 16:47:20 +0000 (09:47 -0700)]
GmsCore is casting to a concrete subclass, sigh.
Since this technically wasn't an API change, there isn't a good
reason to protect with target API. So change the behavior based on
the caller for now.
Bug:
26438049
Change-Id: I65aa1fc9af1f935544f8e191444440af4f98f26f
Baligh Uddin [Thu, 7 Jan 2016 16:47:19 +0000 (16:47 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251 am:
ee895112b3
am:
9530b07c4e
* commit '
9530b07c4e56819e2b5a9ddc7a60feb44e9406c8':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:43:22 +0000 (16:43 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827 am:
212fe88251
am:
ee895112b3
* commit '
ee895112b3b221062c7093582c9ad98b3bf0bf58':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:43:19 +0000 (16:43 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931 am:
a9850abb82 am:
9c43094473 am:
fd023a630a
am:
edb0e3bea8
* commit '
edb0e3bea800fa92ba2b0c8135f0d1c2c6b49d95':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:39:15 +0000 (16:39 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931 am:
a9850abb82 am:
9c43094473
am:
fd023a630a
* commit '
fd023a630af22b60297d36893dff6d5b218a163b':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:39:15 +0000 (16:39 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05 am:
8d85292827
am:
212fe88251
* commit '
212fe88251a6c769ba71f562fd2f51c30926ccc1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:35:00 +0000 (16:35 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1 am:
78f672ef05
am:
8d85292827
* commit '
8d8529282719f035d0ce7460ffd640f94d6c6eb8':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:34:59 +0000 (16:34 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931 am:
a9850abb82
am:
9c43094473
* commit '
9c430944737a5b73218e4162e81aaada2257603d':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:31:02 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b am:
aa2210c5c1
am:
78f672ef05
* commit '
78f672ef05d9dbfbd0abf1b29b76f8cb22d84979':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:31:01 +0000 (16:31 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c am:
6980f76931
am:
a9850abb82
* commit '
a9850abb82b0ce7b4319a9b8deb0926f40ab1e70':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:49 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468 am:
4340e0677b
am:
aa2210c5c1
* commit '
aa2210c5c174fd681fd52fd43e55de6c018a93ad':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:26:48 +0000 (16:26 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
71921cb23c
am:
6980f76931
* commit '
6980f76931d3a52a2c071b10a5736afe8de0fdf4':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:22:23 +0000 (16:22 +0000)]
Fix plurals variable to unblock Translations Pipeline. am:
61f9f31468
am:
4340e0677b
* commit '
4340e0677b691f2ab12549556c23b88e599cf8c1':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:11 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
61f9f31468
* commit '
61f9f31468c5fc4dd2605c9ab8cb6a54cc58d6f9':
Fix plurals variable to unblock Translations Pipeline.
Baligh Uddin [Thu, 7 Jan 2016 16:18:10 +0000 (16:18 +0000)]
Fix plurals variable to unblock Translations Pipeline.
am:
71921cb23c
* commit '
71921cb23c7493ae6c7186d5554233540c9bcc9c':
Fix plurals variable to unblock Translations Pipeline.
Adrian Roos [Thu, 7 Jan 2016 16:10:53 +0000 (16:10 +0000)]
Merge "Show back button while RemoteInput is active on keyguard"
Glenn Kasten [Thu, 7 Jan 2016 15:54:45 +0000 (15:54 +0000)]
Merge "Use FCC_2 and FCC_8 to highlight channel count assumptions"
Alan Viverette [Thu, 7 Jan 2016 15:54:36 +0000 (15:54 +0000)]
Merge "Avoid drawable invalidation during draw()"
Alan Viverette [Thu, 7 Jan 2016 15:48:40 +0000 (15:48 +0000)]
Merge "Avoid NPE when ActionMenuPresenter is intialized with null MenuBuilder"
Andrei Stingaceanu [Thu, 7 Jan 2016 15:30:15 +0000 (15:30 +0000)]
Merge "Keyboard shortcuts: minor naming refactor"
Winson [Wed, 6 Jan 2016 23:21:29 +0000 (15:21 -0800)]
Removing workaround causing full view inflation.
Bug:
26420766
Change-Id: I0bb0eeada5002460de47fe4b3e23bc8a8d6e751d
Andrei Stingaceanu [Thu, 7 Jan 2016 12:39:38 +0000 (12:39 +0000)]
Keyboard shortcuts: minor naming refactor
Replace all occurrences of showKeyboardShortcuts* with
toggleKeyboardShortcuts* in order to be inline with
the current/desired behavior.
Change-Id: Ia076952ec40963b2727fd1f855b64859b94b1643
Calin Juravle [Thu, 7 Jan 2016 12:15:36 +0000 (12:15 +0000)]
resolve merge conflicts of
435ad029a3 to master.
Change-Id: I87202d69a772c593b691de8ce2faeaac9b7d1f58
Calin Juravle [Thu, 7 Jan 2016 11:52:50 +0000 (11:52 +0000)]
Merge "Create jit profile file during the app startup flow."
am:
5fac913d98
* commit '
5fac913d98eb44269b53cd9cc6a011a4eef3c98d':
Create jit profile file during the app startup flow.
Calin Juravle [Thu, 7 Jan 2016 11:44:55 +0000 (11:44 +0000)]
Merge "Create jit profile file during the app startup flow."
Calin Juravle [Thu, 17 Dec 2015 15:06:49 +0000 (17:06 +0200)]
Create jit profile file during the app startup flow.
ActivityThread has already all the needed information
(userId,sharedAppId) to create the profile file and set the correct
permissions on it. This avoids passing uids to the runtime which now
expects the profile file to be already created.
As part of this change:
- move the registration with the runtim in handleBindApplication
- register only if needed: we could properly setup a profile file and we
have at least one code path. Note that registration with the runtime is
done solely for profiling reasons.
Bug:
26080105
Change-Id: I72657e9ea0a0449a09734456b5f8b5da844cee62
Clara Bayarri [Thu, 7 Jan 2016 11:12:09 +0000 (11:12 +0000)]
Merge "Create parent APIs in DevicePolicyManager"
Clara Bayarri [Mon, 14 Dec 2015 17:51:22 +0000 (17:51 +0000)]
Create parent APIs in DevicePolicyManager
This change creates the infrastructure for a parent
DPM and implements the actual parent APIs for
- set/getPasswordQuality
- isActivePasswordSufficient
This is part of the Separate Work Challenge
Change-Id: I0477051b3162cbb26aac79467da08932f22fd1b7
Andrei Stingaceanu [Mon, 24 Aug 2015 16:19:06 +0000 (17:19 +0100)]
Keyboard shortcuts: initial view.
Initial view and functionality for showing/hiding it.
Change-Id: I0e365ecc3ba19110b87b020ff53a6318a7304ce8
Tomasz Mikolajewski [Thu, 7 Jan 2016 07:27:13 +0000 (07:27 +0000)]
Merge "Revert "Revert "Update APIs for the flag changes in SAF."""
Tomasz Mikolajewski [Thu, 7 Jan 2016 07:26:51 +0000 (07:26 +0000)]
Revert "Revert "Update APIs for the flag changes in SAF.""
This reverts commit
475c19532d1f06185b63a0708cf0164a0d6f3feb.
Change-Id: Idb9a91eaab36d28e6ed3f3b4c55f1e7d44f1d3ad
Tomasz Mikolajewski [Thu, 7 Jan 2016 07:19:56 +0000 (07:19 +0000)]
Merge "Revert "Revert "Remove the flag and make openTypedDocument throw FileNotFoundException."""
Tomasz Mikolajewski [Thu, 7 Jan 2016 07:19:22 +0000 (07:19 +0000)]
Revert "Revert "Remove the flag and make openTypedDocument throw FileNotFoundException.""
This reverts commit
2b931719783cda11c3bbac9928c603d0a0a06d43.
Change-Id: Ic61b874012daeada02b73643f5c58f9ec840b3e5
Sungsoo Lim [Thu, 7 Jan 2016 07:11:51 +0000 (07:11 +0000)]
Merge "Use mCurrentUserId instead of ActivityManager.getCurrentUser()"
Keisuke Kuroyanagi [Thu, 7 Jan 2016 06:59:03 +0000 (06:59 +0000)]
Merge "Fix: TextView cannot be scrolled."
Sungsoo Lim [Thu, 7 Jan 2016 05:40:59 +0000 (14:40 +0900)]
Use mCurrentUserId instead of ActivityManager.getCurrentUser()
Change-Id: I5b6887d320a03eb548ae04f15841d7f6f5bd9da4
Sungsoo Lim [Thu, 7 Jan 2016 05:33:49 +0000 (05:33 +0000)]
Merge "MediaSession: Use Handler for sending a pending intent"
riddle_hsu [Tue, 20 Oct 2015 08:00:15 +0000 (16:00 +0800)]
MediaSession: Use Handler for sending a pending intent
When PendingIntent.send() is called with a null handler,
onSendFinished() will be called inside of the send() method.
Therefore in this case, if a thread holds a lock before
calling send(), and onSendFinished() also requires the lock,
a deadlock could happen.
Bug:
25653801
Change-Id: I71d9f708fc3d52b7b5713426ad6140cbf6e336ef
Andreas Gampe [Thu, 7 Jan 2016 05:15:09 +0000 (21:15 -0800)]
Media: Fix MtpDevice call
The signature was changed last minute. Update the media side.
Bug:
26284424
Change-Id: Ia8fb665221f60d3eadd2c32831a12aa21c6c5e9c
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:47:42 +0000 (04:47 +0000)]
Merge "Revert "Remove the flag and make openTypedDocument throw FileNotFoundException.""
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:47:03 +0000 (04:47 +0000)]
Revert "Remove the flag and make openTypedDocument throw FileNotFoundException."
This reverts commit
95149ab6a5442a05f05f448854b6ab386c87f717.
Change-Id: I218aa8059ef674400dac8531a86cd326748c26d5
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:44:19 +0000 (04:44 +0000)]
Revert "Update APIs for the flag changes in SAF."
This reverts commit
e7decfb815342dbea00b305a52b1178e2d646df1.
Change-Id: I023989381ffa7296db7a21ec01327a32b3f16c4f
Tomasz Mikolajewski [Thu, 7 Jan 2016 04:36:12 +0000 (15:36 +1100)]
Update APIs for the flag changes in SAF.
Bug:
26222645
Change-Id: I7189b7867ad31dbd7e3f768387e2f570a41527b1
Daichi Hirono [Thu, 7 Jan 2016 04:11:00 +0000 (04:11 +0000)]
Merge "Add missing style change to android_mtp_MtpDevice.cpp."
Daichi Hirono [Thu, 7 Jan 2016 04:06:11 +0000 (13:06 +0900)]
Add missing style change to android_mtp_MtpDevice.cpp.
BUG=
26284424
Change-Id: I0e288712a8fccfb3dd21fa927388bacf5ce155d0
Tomasz Mikolajewski [Thu, 7 Jan 2016 03:52:01 +0000 (03:52 +0000)]
Merge "Remove the flag and make openTypedDocument throw FileNotFoundException."
Tomasz Mikolajewski [Thu, 24 Dec 2015 04:24:00 +0000 (13:24 +0900)]
Remove the flag and make openTypedDocument throw FileNotFoundException.
To be compatible with ContentProvider, DocumentsProvider should not
require checking for a flag before calling openTypedAssetFile.
This CL removes the flag, and makes the default implementation throw
FileNotFoundException instead.
Bug:
26222645
Change-Id: I3492f05804e39583ebb8584109c7017b3082846e
Daichi Hirono [Thu, 7 Jan 2016 03:49:02 +0000 (03:49 +0000)]
Merge "Add getPartialObject to Java MtpDevice class."
Daichi Hirono [Thu, 24 Dec 2015 08:52:10 +0000 (17:52 +0900)]
Add getPartialObject to Java MtpDevice class.
BUG=
26284424
Change-Id: Id05dc6297a1682999eee4e72972fb883fa49a5d1
Svetoslav Ganov [Thu, 7 Jan 2016 03:37:21 +0000 (03:37 +0000)]
Merge "Grant location to SetupWizard by default - framework"
Filip Gruszczynski [Tue, 22 Dec 2015 16:29:07 +0000 (08:29 -0800)]
Use activity dimensions instead of display to calculate dialog size.
This adjusts the code for measuring and laying out dialog windows, which
used display dimensions as a basis for calculating the dialog
dimensions. Because of this dialogs would be too large in multi window
mode, where the parent bounds are far smaller than full display. This
switches to using dimensions for configuration received from activity
manager.
Mind, this is still not working as needed, because the resources return
minimal size of the dialog as if it was displayed on a full display,
rather than within activity bounds.
The CL also introduces better logging tags in ViewRootImpl and
DecorView. These normal approach works reasonably well when there is a
single activity on the display. However, when multiple windows are
displayed, it becomes impossible to determine which view root/decor view
logged what. This adds a suffix, that allows to identify the owner.
Bug:
26251921
Change-Id: I515a1ff9a81ee5ad086773196db71915e88a25eb
Yohei Yukawa [Thu, 7 Jan 2016 01:29:05 +0000 (01:29 +0000)]
Merge "Fix IMM#showInputMethodAndSubtypeEnabler()."
Daichi Hirono [Thu, 7 Jan 2016 01:21:07 +0000 (01:21 +0000)]
Merge "Implement FUSE operations in AppFuse JNI."
Daichi Hirono [Thu, 7 Jan 2016 01:18:34 +0000 (01:18 +0000)]
Merge "Leave from the current root when the root is removed."
Jeff Sharkey [Thu, 7 Jan 2016 00:41:45 +0000 (00:41 +0000)]
Merge "Add some TestApis to fix build."
Filip Gruszczynski [Thu, 7 Jan 2016 00:40:55 +0000 (00:40 +0000)]
Merge "Don't depend on mContentParent to determine if content was set."
Adam Lesinski [Thu, 7 Jan 2016 00:40:36 +0000 (00:40 +0000)]
Merge "AAPT2: Fix product support"
Jeff Sharkey [Thu, 7 Jan 2016 00:02:08 +0000 (17:02 -0700)]
Add some TestApis to fix build.
Change-Id: Icf0d8d63f3a41d99e46ebe96003863bae637bd9d
Wale Ogunwale [Thu, 7 Jan 2016 00:32:40 +0000 (00:32 +0000)]
Merge "Improved output for 'dumpsys window displays'"
Adam Lesinski [Wed, 6 Jan 2016 23:45:28 +0000 (15:45 -0800)]
AAPT2: Fix product support
Previously the default product wasn't tried if 'default' wasn't specified on the command line.
Also adds support for multiple products.
Change-Id: I1e4872b34bb8d609b6444841a4e7e4dbb3bbb76b
Siyamed Sinir [Thu, 7 Jan 2016 00:14:26 +0000 (00:14 +0000)]
Merge "New regular expression to autolink URLs"
Adam Lesinski [Wed, 6 Jan 2016 23:55:06 +0000 (23:55 +0000)]
Merge "AAPT2: Port AAPT pseudolocalization to AAPT2"
Adam Lesinski [Wed, 6 Jan 2016 23:50:50 +0000 (23:50 +0000)]
Merge "AAPT2: Fix references to private parent"
Adam Lesinski [Wed, 6 Jan 2016 23:50:10 +0000 (23:50 +0000)]
Merge "AAPT2: Respect format attribute of <item> tag"
Felipe Leme [Wed, 6 Jan 2016 19:38:53 +0000 (11:38 -0800)]
Include title and description on bugreport.zip
Prior to this change, the user-provide title and description were only
used in the ACTION_SEND_MULTIPLE intent, which was fine for the cases
where the user share the bug report with an app that used intent
extras (like an email app).
But if the app did not use the extras, or if
the user did not share the bug report right away, the info supplied by
the user would be lost.
With this change, such info will be saved into 2 new zip entries,
title.txt and description.txt
BUG:
26403310
Change-Id: I888364d14d67fb4e2f2c26cb66b21576d7ce13b4
Chris Craik [Wed, 6 Jan 2016 22:42:31 +0000 (22:42 +0000)]
Merge "Rework op macros"
Philip P. Moltmann [Wed, 6 Jan 2016 22:35:35 +0000 (22:35 +0000)]
Merge "Fix wrong annotation for PrintInfo.Builder.setStatus"
Filip Gruszczynski [Wed, 6 Jan 2016 22:34:00 +0000 (14:34 -0800)]
Don't depend on mContentParent to determine if content was set.
mContentParent might be set due to window preservation, rather than due
to client setting the content view. We should mark the content view as
set only when it's explicitly done.
Bug:
26345798
Change-Id: I749de9def8ff708592fa20abdb7da366ec52f24d
Jeff Sharkey [Wed, 6 Jan 2016 22:26:16 +0000 (22:26 +0000)]
Merge "Consistent naming for PackageManager methods."
Jeff Sharkey [Wed, 6 Jan 2016 21:51:50 +0000 (14:51 -0700)]
Consistent naming for PackageManager methods.
When hidden PackageManager methods take a userId argument, they
should be named explicitly with the "AsUser" suffix. This fixes
several lagging examples so that we can pave the way to safely
start passing flags to new methods without scary overloading.
Also fix spacing issues in various logging statements.
Change-Id: I1e42f7f66427410275df713bea04f6e0445fba28
Chris Craik [Wed, 6 Jan 2016 21:46:52 +0000 (13:46 -0800)]
Rework op macros
Makes it simpler to add defer-only or render-only opps.
Change-Id: I6c8ec64e76d419635429055cff6d96360d21706d
Wale Ogunwale [Wed, 6 Jan 2016 22:02:24 +0000 (22:02 +0000)]
Merge "[WindowManagerService] fix starting window issue"
Hall Liu [Mon, 4 Jan 2016 23:17:53 +0000 (15:17 -0800)]
Don't call pre- and post-handlers for state machine initialization
Add check to onPreHandleMessage and onPostHandleMessage so that they
don't process the SM_INIT_CMD messages that are used internally by the
state machine.
Change-Id: I4061ed098d5c394d311714bbe13b738cb7209317