OSDN Git Service
Adrian Roos [Wed, 21 Oct 2015 21:50:38 +0000 (14:50 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Pablo Ceballos [Mon, 19 Oct 2015 17:55:59 +0000 (17:55 +0000)]
Merge "Remove GLTrace support"
Jun Mukai [Mon, 19 Oct 2015 17:23:23 +0000 (17:23 +0000)]
Merge "Fix: input source comparison -> MotionEvent.isFromSource"
Jun Mukai [Mon, 19 Oct 2015 17:23:08 +0000 (17:23 +0000)]
Merge "Fix: input source comparison -> MotionEvent.isFromSource()"
Steve McKay [Mon, 19 Oct 2015 16:30:09 +0000 (16:30 +0000)]
Merge "Enable explicit package for quick view intent."
Geoff Mendal [Mon, 19 Oct 2015 16:11:50 +0000 (16:11 +0000)]
am
06efcdc6: (-s ours) am
e0f00d04: (-s ours) am
a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
7ba59c3559 -s ours
* commit '
06efcdc6bed934ac3c138a380728f6b11e051f28':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 16:08:22 +0000 (16:08 +0000)]
am
e0f00d04: (-s ours) am
a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
7ba59c3559 -s ours
* commit '
e0f00d04d4d68348a8baf03f3c51521389aff576':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 16:02:57 +0000 (16:02 +0000)]
am
a6e7b3ae: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
7ba59c3559 -s ours
* commit '
a6e7b3ae756946212937054bb079da1d472c0cda':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:59:20 +0000 (15:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am:
7ba59c3559 -s ours
* commit '
7ba59c35596bd53ebc9b5bed40b2d7bd2e5ac94d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 15:55:17 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Mon, 19 Oct 2015 15:46:17 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Stuart Scott [Mon, 19 Oct 2015 15:31:24 +0000 (15:31 +0000)]
Merge "Suppress testAndroidTestCaseSetupProperly"
Geoff Mendal [Mon, 19 Oct 2015 15:03:19 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76444ef3a3911763f41010e0cd0f5015a2f756e9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 14:58:48 +0000 (07:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9129bdea39d67b8129d3eaad816c654ddd0d227b
Auto-generated-cl: translation import
Julia Reynolds [Mon, 19 Oct 2015 14:38:40 +0000 (14:38 +0000)]
Merge "Add Notification topics."
Ian Pedowitz [Mon, 19 Oct 2015 14:32:57 +0000 (14:32 +0000)]
Merge "Removing period from No service string to be consistent with Airplane Mode"
Geoff Mendal [Mon, 19 Oct 2015 14:29:29 +0000 (14:29 +0000)]
am
69988b3c: (-s ours) am
ffdbfaaf: (-s ours) am
2a09706e: (-s ours) Import translations. DO NOT MERGE am:
5e4863205e -s ours
* commit '
69988b3cee1df8fd1fee9ae2041a0981cc491bd2':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:22:21 +0000 (14:22 +0000)]
am
ffdbfaaf: (-s ours) am
2a09706e: (-s ours) Import translations. DO NOT MERGE am:
5e4863205e -s ours
* commit '
ffdbfaaff2f5172fc0af8d5f13ec3fad0c53f826':
Import translations. DO NOT MERGE
Chris Wren [Mon, 19 Oct 2015 14:17:44 +0000 (14:17 +0000)]
Merge "update metrics enums"
Geoff Mendal [Mon, 19 Oct 2015 14:17:11 +0000 (14:17 +0000)]
am
2a09706e: (-s ours) Import translations. DO NOT MERGE am:
5e4863205e -s ours
* commit '
2a09706e86794f6482f005f5bcca2ee513a3b1d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:11:34 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
5e4863205e -s ours
* commit '
5e4863205ee459cd8813f45e91b2e67c603d38ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 19 Oct 2015 14:01:55 +0000 (07:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8f3e950a4c69ad49e6f370b97398b507d488111
Auto-generated-cl: translation import
Geoff Mendal [Mon, 19 Oct 2015 12:54:12 +0000 (05:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia03407a2565081fcb9f11b42648cc4441f682470
Auto-generated-cl: translation import
Seigo Nonaka [Mon, 19 Oct 2015 04:07:44 +0000 (04:07 +0000)]
Merge "Remove MinikinSkiaFont::GetGlyph."
Chris Wren [Sat, 17 Oct 2015 21:51:09 +0000 (21:51 +0000)]
am
fec413db: am
9c25e23c: am
3472f18e: am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
fec413dbeae1a5afef833ad883d36bdd2a6af105':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:46:00 +0000 (21:46 +0000)]
am
9c25e23c: am
3472f18e: am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
9c25e23c4b571f9c9ff3fd69408c4cfd03385e82':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:41:39 +0000 (21:41 +0000)]
am
3472f18e: am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
3472f18e0218c7d7a991da50db8251471fd8c25d':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:35:25 +0000 (21:35 +0000)]
am
c7f2058c: Merge "count notification peeks by window action" into mnc-dr-dev
* commit '
c7f2058cefd00bdce31a77646afa407bdf269809':
count notification peeks by window action
Chris Wren [Sat, 17 Oct 2015 21:30:37 +0000 (21:30 +0000)]
Merge "count notification peeks by window action" into mnc-dr-dev
Ian Pedowitz [Sat, 17 Oct 2015 21:08:13 +0000 (14:08 -0700)]
Removing period from No service string to be consistent with Airplane Mode
Bug:
25037917
Change-Id: Iaa1099fb06f724ebeb7d6302a78b8d010871668e
Ruben Brunk [Sat, 17 Oct 2015 07:19:43 +0000 (07:19 +0000)]
am
462b8b39: am
55dd957d: am
7a027807: am
c03443b2: Fix lens shading map origin calculation.
* commit '
462b8b3986fd194e08c78d66b6cc547af7388830':
Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:13:24 +0000 (07:13 +0000)]
am
55dd957d: am
7a027807: am
c03443b2: Fix lens shading map origin calculation.
* commit '
55dd957d87e847c1ae7d4ddeff68fdb0b18ee23b':
Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:07:32 +0000 (07:07 +0000)]
am
7a027807: am
c03443b2: Fix lens shading map origin calculation.
* commit '
7a027807a73aaa578d8f7a457438daac73158af0':
Fix lens shading map origin calculation.
Ruben Brunk [Sat, 17 Oct 2015 07:01:19 +0000 (07:01 +0000)]
am
c03443b2: Fix lens shading map origin calculation.
* commit '
c03443b23de0b474080168d892cd685283c3285b':
Fix lens shading map origin calculation.
Ruben Brunk [Thu, 15 Oct 2015 00:46:52 +0000 (17:46 -0700)]
Fix lens shading map origin calculation.
Bug:
24816235
Change-Id: Id4609f3349f86c811cbc3d5e1839f880da926486
Toni Barzic [Sat, 17 Oct 2015 01:33:58 +0000 (01:33 +0000)]
Merge "Reset lock pattern stealth mode when keygueard pattern view is reset"
Selim Cinek [Fri, 16 Oct 2015 23:49:13 +0000 (23:49 +0000)]
am
4d655e7b: am
4135092c: am
303e5c41: am
b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
* commit '
4d655e7b98eebba4e3b4912f508f789719e5e7b1':
Stopping chronometers now when the shade is closed
Selim Cinek [Fri, 16 Oct 2015 23:44:59 +0000 (23:44 +0000)]
am
4135092c: am
303e5c41: am
b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
* commit '
4135092ce9381d5545f6ef1625a348c969614b33':
Stopping chronometers now when the shade is closed
Selim Cinek [Fri, 16 Oct 2015 23:40:12 +0000 (23:40 +0000)]
am
303e5c41: am
b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
* commit '
303e5c410c17b2be84051b3692635e6e24e37530':
Stopping chronometers now when the shade is closed
Selim Cinek [Fri, 16 Oct 2015 23:34:43 +0000 (23:34 +0000)]
am
b9a73d2c: Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
* commit '
b9a73d2ce34b35684a282c8521d65f52fea1197a':
Stopping chronometers now when the shade is closed
Steve McKay [Thu, 15 Oct 2015 22:27:30 +0000 (15:27 -0700)]
Enable explicit package for quick view intent.
Define the package in config...suitable for setup via overlay.
Undefined by default makes the feature disabled on phones...n stuff.
Fall back to single-file QUICK_VIEW.
Work around
24963914 (for now).
Bug:
24963914
Change-Id: Ia9c5a606d294ae053fd5e60d015f0aa0010eba4f
Selim Cinek [Fri, 16 Oct 2015 23:33:22 +0000 (23:33 +0000)]
Merge "Fixes in FalsingManager Classifiers and Evaluators and in DragDownHelper"
Selim Cinek [Fri, 16 Oct 2015 23:28:46 +0000 (23:28 +0000)]
Merge "Stopping chronometers now when the shade is closed" into mnc-dr-dev
Selim Cinek [Mon, 21 Sep 2015 13:47:20 +0000 (15:47 +0200)]
Stopping chronometers now when the shade is closed
Bug:
23978877
Change-Id: I01a9e756d7eeef7aa239ca0c67d4084624aaed12
Ben Kwa [Fri, 16 Oct 2015 22:44:04 +0000 (22:44 +0000)]
Merge "Add shift-selection to DocumentsUI."
Bryce Lee [Fri, 16 Oct 2015 22:42:43 +0000 (22:42 +0000)]
am
adf38ccb: am
b70426b1: am
4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev
* commit '
adf38ccb6ea0a3b406273061d1fc01f61bc6abb6':
Add capability to identify phone accounts that are emergency only.
Matthew Williams [Fri, 16 Oct 2015 22:42:31 +0000 (22:42 +0000)]
am
4b4ac110: (-s ours) am
c85315ac: am
9a365194: am
1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
* commit '
4b4ac1103e0fb54956425f81fda8c6b2893a6c59':
DO NOT MERGE Sanity check loaded periodics and cap runtime.
Ben Kwa [Wed, 7 Oct 2015 21:15:12 +0000 (14:15 -0700)]
Add shift-selection to DocumentsUI.
- Move the key listener from BaseActivity into DirectoryFragment, where it
belongs.
- Add code to detect the shift key during keyboard navigation, and
extend the selection in that case.
BUG=
20859059
Change-Id: Ia7d3c7d4343f0185873deeaf1a35028a716b6e19
Wale Ogunwale [Fri, 16 Oct 2015 22:38:13 +0000 (22:38 +0000)]
Merge "Revert "Dont update thumbnails of freeform windows on focus change""
Bryce Lee [Fri, 16 Oct 2015 22:33:23 +0000 (22:33 +0000)]
am
b70426b1: am
4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev
* commit '
b70426b197c373ccd8ab46c080fedf66e43d52e3':
Add capability to identify phone accounts that are emergency only.
Matthew Williams [Fri, 16 Oct 2015 22:33:17 +0000 (22:33 +0000)]
am
c85315ac: am
9a365194: am
1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
* commit '
c85315acdf028d09b178e2c9a6ec66374652894a':
DO NOT MERGE Sanity check loaded periodics and cap runtime.
Bryce Lee [Fri, 16 Oct 2015 22:29:32 +0000 (22:29 +0000)]
am
4c9fcd54: Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev
* commit '
4c9fcd5412a190c6e73f25346cf13c67286fa01e':
Add capability to identify phone accounts that are emergency only.
Matthew Williams [Fri, 16 Oct 2015 22:29:26 +0000 (22:29 +0000)]
am
9a365194: am
1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
* commit '
9a365194861e78dd5edbebf292aaa7e48804ab46':
DO NOT MERGE Sanity check loaded periodics and cap runtime.
George Mount [Fri, 16 Oct 2015 22:27:48 +0000 (22:27 +0000)]
Merge "Change wrong doc about using linear interpolator."
Bryce Lee [Fri, 16 Oct 2015 22:26:48 +0000 (22:26 +0000)]
Merge "Add capability to identify phone accounts that are emergency only." into cw-e-dev
Matthew Williams [Fri, 16 Oct 2015 22:25:12 +0000 (22:25 +0000)]
am
1f0ec16b: DO NOT MERGE Sanity check loaded periodics and cap runtime.
* commit '
1f0ec16b6d5f20ed8b6156eb1b5abf4c73548645':
DO NOT MERGE Sanity check loaded periodics and cap runtime.
Roozbeh Pournader [Fri, 16 Oct 2015 22:20:01 +0000 (22:20 +0000)]
am
ebdf60e7: am
0221328c: am
b3538082: am
5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '
ebdf60e7c800b2ccda01887a304ddc0edce0361d':
Fix line height problem with inline images in StaticLayout.
Roozbeh Pournader [Fri, 16 Oct 2015 22:12:46 +0000 (22:12 +0000)]
am
0221328c: am
b3538082: am
5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '
0221328c3381680631d783c2b9733430f8b0555d':
Fix line height problem with inline images in StaticLayout.
Roozbeh Pournader [Fri, 16 Oct 2015 22:06:21 +0000 (22:06 +0000)]
am
b3538082: am
5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '
b3538082d78284165ff0dbe5a04992afe2018d0b':
Fix line height problem with inline images in StaticLayout.
Roozbeh Pournader [Fri, 16 Oct 2015 22:01:49 +0000 (22:01 +0000)]
am
5362f273: Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
* commit '
5362f273e91885041b7cb246667cff3ceca74703':
Fix line height problem with inline images in StaticLayout.
Matthew Williams [Thu, 15 Oct 2015 22:59:12 +0000 (15:59 -0700)]
DO NOT MERGE Sanity check loaded periodics and cap runtime.
BUG:
24900376
We've seen an issue where periodic run times can be massively
inflated after loading from disk.
As a safeguard, cap the period's loaded runtime to be [p, 2p]
from the time of loading.
Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6
(cherry picked from commit
fa8e5084eed63ab8d92c71fcff656690a30293c3)
Matthew Williams [Fri, 16 Oct 2015 21:56:10 +0000 (21:56 +0000)]
Merge "Sanity check loaded periodics and cap runtime."
Roozbeh Pournader [Fri, 16 Oct 2015 21:54:12 +0000 (21:54 +0000)]
Merge "Fix line height problem with inline images in StaticLayout." into mnc-dr-dev
Chris Wren [Fri, 16 Oct 2015 21:41:13 +0000 (17:41 -0400)]
update metrics enums
Change-Id: I5c4b20dc514889493e3049b4242876633ebebcde
Adrian Roos [Fri, 16 Oct 2015 21:19:03 +0000 (21:19 +0000)]
am
2de89ae8: am
3c439c72: am
85fae34e: am
70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '
2de89ae843a0a6b492eaa55f96a641df16b718a8':
Fix wrongly laid out navigation color view
Wale Ogunwale [Fri, 16 Oct 2015 21:14:06 +0000 (21:14 +0000)]
Merge "Added support for resizing background color for an app window"
Adrian Roos [Fri, 16 Oct 2015 21:12:06 +0000 (21:12 +0000)]
am
3c439c72: am
85fae34e: am
70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '
3c439c720d460266358c10d8d2eea9ef9e79beb0':
Fix wrongly laid out navigation color view
Adrian Roos [Fri, 16 Oct 2015 20:54:40 +0000 (20:54 +0000)]
am
85fae34e: am
70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '
85fae34e8146eaa25aea7f1d9a68effa0db3ce8e':
Fix wrongly laid out navigation color view
Adrian Roos [Fri, 16 Oct 2015 20:49:59 +0000 (20:49 +0000)]
am
70ea8578: Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
* commit '
70ea857859b78a708fb99ac708ead7bdaddf79a7':
Fix wrongly laid out navigation color view
Adrian Roos [Fri, 16 Oct 2015 20:43:32 +0000 (20:43 +0000)]
Merge "Fix wrongly laid out navigation color view" into mnc-dr-dev
Julia Reynolds [Fri, 16 Oct 2015 15:37:55 +0000 (11:37 -0400)]
Add Notification topics.
Topics are tags that developers can add to group notifications
by theme. Users will be able to block notifications by topic.
Bug:
22451710
Change-Id: I5b4677da66b21933f479f5e56c18ca563810b43b
Toni Barzic [Fri, 16 Oct 2015 20:38:11 +0000 (13:38 -0700)]
Reset lock pattern stealth mode when keygueard pattern view is reset
Stealth mode is not guaranteed to remain constant through keyguard pattern
view lifetime (it's user specific, and user context may be switched), so
update it when keyguard pattern is reset.
BUG=
25017442
Change-Id: I798fe685cfaadd35462f54ab7e4fa9e6f6276436
Julia Reynolds [Fri, 16 Oct 2015 20:37:46 +0000 (20:37 +0000)]
Merge "resolved conflicts for
429e7dcd to master"
George Mount [Fri, 16 Oct 2015 20:34:22 +0000 (20:34 +0000)]
Merge "Fix documentation for setTransition to include fade."
Chris Wren [Fri, 16 Oct 2015 20:24:20 +0000 (16:24 -0400)]
count notification peeks by window action
Bug:
20751989
Change-Id: I9b1093b98f303656a299c18b503c1d8c9f032335
Julia Reynolds [Fri, 16 Oct 2015 20:25:40 +0000 (16:25 -0400)]
resolved conflicts for
429e7dcd to master
Change-Id: Id0aca75915a054253d032d333defba1a38b80abe
Matthew Williams [Fri, 16 Oct 2015 20:19:42 +0000 (20:19 +0000)]
am
333d7e0b: (-s ours) am
6331753e: am
b01a963a: am
68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
* commit '
333d7e0bce5bb34de0fe9060290891d7d99b7f38':
DO NOT MERGE Change scheduling logic to run network jobs sooner
Matthew Williams [Thu, 15 Oct 2015 22:59:12 +0000 (15:59 -0700)]
Sanity check loaded periodics and cap runtime.
BUG:
24900376
We've seen an issue where periodic run times can be massively
inflated after loading from disk.
As a safeguard, cap the period's loaded runtime to be [p, 2p]
from the time of loading.
Change-Id: Ie4464490c8d6702fee8efe9190c3da5dc5f013f6
Alexander Levitskiy [Fri, 16 Oct 2015 20:04:49 +0000 (20:04 +0000)]
Merge "meminfo: Change size suffix to comply with iec, make it parseable with numfmt."
Julia Reynolds [Fri, 16 Oct 2015 19:55:25 +0000 (19:55 +0000)]
am
542052dd: am
96faf5c8: am
a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit '
542052dd83e89f7cebc07aa0004a8592efc12364':
Add 'until next alarm' option to QS zen panel.
Wale Ogunwale [Thu, 15 Oct 2015 00:07:29 +0000 (17:07 -0700)]
Added support for resizing background color for an app window
R.styleable.Window_windowResizingBackground allows an activity to
specify the background drawable that should be used when it is being
resized in multi-window mode. If unset, the system will try to use
R.styleable.Window_windowBackground if set, then
R.styleable.Window_windowBackgroundFallback if set. Otherwise, the
system default resizing background color set by
R.integer.config_windowResizingBackgroundColorARGB.
Also, use decor title color as caption background color when resizing
instead of black.
Bug:
24534744
Change-Id: I83313865b4044b976ebc78d598e14e17e0f37212
Julia Reynolds [Fri, 16 Oct 2015 19:48:47 +0000 (19:48 +0000)]
am
96faf5c8: am
a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit '
96faf5c8fad5114dda807eee1c94a1c0dc021fe8':
Add 'until next alarm' option to QS zen panel.
Julia Reynolds [Fri, 16 Oct 2015 19:41:54 +0000 (19:41 +0000)]
am
a762c210: Merge "Add \'until next alarm\' option to QS zen panel." into mnc-dr-dev
* commit '
a762c210d2901bedce5b7972eb139c4d5e59dcd1':
Add 'until next alarm' option to QS zen panel.
Matthew Williams [Fri, 16 Oct 2015 19:39:23 +0000 (19:39 +0000)]
am
6331753e: am
b01a963a: am
68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
* commit '
6331753e3ba9d6c66c562836f28f3b6e1e178ecd':
DO NOT MERGE Change scheduling logic to run network jobs sooner
Julia Reynolds [Fri, 16 Oct 2015 19:38:22 +0000 (19:38 +0000)]
Merge "Add 'until next alarm' option to QS zen panel." into mnc-dr-dev
George Mount [Fri, 16 Oct 2015 19:36:58 +0000 (12:36 -0700)]
Fix documentation for setTransition to include fade.
Bug
25016696
Also add annotations for FragmentTransaction methods.
Change-Id: If3d1427d83dd7c399609bf8fd9a54467224d3a35
Adam Lesinski [Fri, 16 Oct 2015 19:16:32 +0000 (19:16 +0000)]
Merge "AAPT2: Separate out the various steps"
Adam Lesinski [Fri, 14 Aug 2015 21:26:04 +0000 (14:26 -0700)]
AAPT2: Separate out the various steps
An early refactor. Some ideas became clearer as
development continued. Now the various phases are much
clearer and more easily reusable.
Also added a ton of tests!
Change-Id: Ic8f0a70c8222370352e63533b329c40457c0903e
Erik Kline [Fri, 16 Oct 2015 19:02:00 +0000 (19:02 +0000)]
Merge "Incorrect time used in some NTP server responses"
Matthew Williams [Fri, 16 Oct 2015 19:01:55 +0000 (19:01 +0000)]
am
b01a963a: am
68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
* commit '
b01a963a2dd3e4e84eee18f691efdc7856d16ff0':
DO NOT MERGE Change scheduling logic to run network jobs sooner
Matthew Williams [Fri, 16 Oct 2015 18:55:33 +0000 (18:55 +0000)]
am
68750116: Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
* commit '
6875011626e5815473b5d19ddc92d4888bad29f4':
DO NOT MERGE Change scheduling logic to run network jobs sooner
Matthew Williams [Fri, 16 Oct 2015 18:51:48 +0000 (18:51 +0000)]
Merge "DO NOT MERGE Change scheduling logic to run network jobs sooner" into mnc-dr-dev
Chris Craik [Fri, 16 Oct 2015 18:41:04 +0000 (18:41 +0000)]
Merge "Use FastJNI for trivial MotionEvent native methods"
Chris Craik [Fri, 16 Oct 2015 18:39:50 +0000 (11:39 -0700)]
Use FastJNI for trivial MotionEvent native methods
Change-Id: I97d0643a6e34cb66ca5b5948ed47ebfee14fc038
Jerry Wong [Wed, 7 Oct 2015 05:18:11 +0000 (22:18 -0700)]
Incorrect time used in some NTP server responses
Per RFC 4330, a NTP server response should be discarded when:
- the stratum is 0 (unspecified), or
- the leap indicator is 3 (unsync'ed), or
- the mode is not 4 (server) / 5 (broadcast), or
- the transmitted time is 0.
Update SntpClient so that such responses would be discarded.
Additionally:
- make some variables suitably "final"
- enable logging
- add alternate requestTime() for testing
- add some miniscule test coverage
Cherry-picked from Jerry Wong's
https://partner-android-review.googlesource.com/#/c/460074
Bug:
24719581
Change-Id: Id11a79a6e53ce95500ed4b4d691a29c260666f6c
Chris Craik [Fri, 16 Oct 2015 18:36:01 +0000 (18:36 +0000)]
Merge "Rename DisplayListData to DisplayList"
Adam Powell [Fri, 16 Oct 2015 18:32:13 +0000 (18:32 +0000)]
am
4c0011e9: am
824347dd: am
d08f339b: am
749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
* commit '
4c0011e98212cf2b2a9e0aa2bab32c069de3b253':
Fix ChooserTarget app scoring
Adam Powell [Fri, 16 Oct 2015 18:27:05 +0000 (18:27 +0000)]
am
824347dd: am
d08f339b: am
749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
* commit '
824347dd8afc3b8b40e28e4b5d0743b56e341b98':
Fix ChooserTarget app scoring
Adam Powell [Fri, 16 Oct 2015 18:21:58 +0000 (18:21 +0000)]
am
d08f339b: am
749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
* commit '
d08f339bcc80bbf368bb7c7b9ddb77d6a9d613fd':
Fix ChooserTarget app scoring
Adam Powell [Fri, 16 Oct 2015 18:13:19 +0000 (18:13 +0000)]
am
749334bf: Merge "Fix ChooserTarget app scoring" into mnc-dr-dev
* commit '
749334bffbc92aeaef27c274a1586fa7365cbfdc':
Fix ChooserTarget app scoring