OSDN Git Service
Chris Craik [Tue, 17 Feb 2015 23:46:33 +0000 (23:46 +0000)]
Merge "Glop SkiaShader support"
Chris Craik [Sat, 14 Feb 2015 01:47:21 +0000 (17:47 -0800)]
Glop SkiaShader support
Change-Id: I894a0b62701bd02367ab970813e4c332147351a2
Rich Slogar [Tue, 17 Feb 2015 23:44:47 +0000 (23:44 +0000)]
am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545 automerge:
696ea51
automerge:
0a87137
* commit '
0a8713799cb6ebab4f40ef3313ea71df9c580146':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 23:43:03 +0000 (23:43 +0000)]
am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9 automerge:
4826bed
automerge:
7b3a118
* commit '
7b3a11802ad2c344577f651f1a0ef5083b4133eb':
docs: android plugin for gradle revisions page
David Friedman [Tue, 17 Feb 2015 23:41:29 +0000 (23:41 +0000)]
am
a6614a12: am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge:
efb69b0 automerge:
40191d8
automerge:
cdf0774
* commit '
cdf0774314842eb16f8db2b822a6d6538f17090e':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Deepanshu Gupta [Tue, 17 Feb 2015 23:40:11 +0000 (23:40 +0000)]
am
0a300b89: am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge:
0684991 automerge:
c2fa5e2
automerge:
7bf58d0
* commit '
7bf58d0c5523a9b76ab1d570acb92514e8fff8ba':
Add Asset management support for fonts.
Diego Perez [Tue, 17 Feb 2015 23:38:48 +0000 (23:38 +0000)]
am
a0fb87a3: am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge:
a912fed automerge:
d66f2eb
automerge:
412e643
* commit '
412e6439b2d372565f14cc1dce0ff25f106975af':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 23:37:13 +0000 (23:37 +0000)]
am
221d7320: am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge:
4e47416 automerge:
f12d023
automerge:
5cc0e76
* commit '
5cc0e76464f170d987370bb7bf9c04d746795f12':
Changes made by intelliJ 14.1
Ed Heyl [Tue, 17 Feb 2015 22:51:48 +0000 (14:51 -0800)]
Revert "Add BLAS intrinsic."
This reverts commit
25207df658d6a8a3e885c7017fcc25702363583c.
Rich Slogar [Tue, 17 Feb 2015 22:45:49 +0000 (22:45 +0000)]
am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545
automerge:
696ea51
* commit '
696ea51a1c7c01061daf8693101e48d5d0701293':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:43:17 +0000 (22:43 +0000)]
am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9
automerge:
4826bed
* commit '
4826bed5dbb07bc819db071b02de7c30925ff8a6':
docs: android plugin for gradle revisions page
David Friedman [Tue, 17 Feb 2015 22:41:10 +0000 (22:41 +0000)]
am
a6614a12: am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge:
efb69b0
automerge:
40191d8
* commit '
40191d8e780724107c87edc5b1cfcea68a1442ca':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Deepanshu Gupta [Tue, 17 Feb 2015 22:39:48 +0000 (22:39 +0000)]
am
0a300b89: am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge:
0684991
automerge:
c2fa5e2
* commit '
c2fa5e205e617df6b622cb54fac77738e82e6320':
Add Asset management support for fonts.
Diego Perez [Tue, 17 Feb 2015 22:38:37 +0000 (22:38 +0000)]
am
a0fb87a3: am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge:
a912fed
automerge:
d66f2eb
* commit '
d66f2eb241ba8676ef01f4efd23be5ae62d3a7aa':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 22:36:59 +0000 (22:36 +0000)]
am
221d7320: am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge:
4e47416
automerge:
f12d023
* commit '
f12d02339fefc4111b62715d5c0fb2e58570c34b':
Changes made by intelliJ 14.1
Rich Slogar [Tue, 17 Feb 2015 22:31:37 +0000 (22:31 +0000)]
am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545
* commit '
dbb32faf33c95b245d75c0dc8d4578a011378f78':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:31:33 +0000 (22:31 +0000)]
am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9
* commit '
2d43b7300dfad8bbf54d88e7b315d2ea38023131':
docs: android plugin for gradle revisions page
David Friedman [Tue, 17 Feb 2015 22:31:28 +0000 (22:31 +0000)]
am
a6614a12: am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge:
efb69b0
* commit '
a6614a12bbc6715af843d26f66fb32ae854323e6':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Rich Slogar [Tue, 17 Feb 2015 22:25:53 +0000 (22:25 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
automerge:
bff1545
* commit '
bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:24:38 +0000 (22:24 +0000)]
am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
automerge:
cb73fb9
* commit '
cb73fb90443a3a3fee645aa3f01d38b19f108377':
docs: android plugin for gradle revisions page
Deepanshu Gupta [Tue, 17 Feb 2015 22:24:17 +0000 (22:24 +0000)]
am
0a300b89: am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge:
0684991
* commit '
0a300b897711bfa39e0d30e2fa61664f01fb58d8':
Add Asset management support for fonts.
Diego Perez [Tue, 17 Feb 2015 22:24:14 +0000 (22:24 +0000)]
am
a0fb87a3: am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge:
a912fed
* commit '
a0fb87a3b831e8eb4e4f7e03fc170cf8f93a2161':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 22:24:09 +0000 (22:24 +0000)]
am
221d7320: am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev automerge:
4e47416
* commit '
221d732005b04b5f979d2e03e8ebe00160e52ca3':
Changes made by intelliJ 14.1
David Friedman [Tue, 17 Feb 2015 22:22:50 +0000 (22:22 +0000)]
am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
automerge:
efb69b0
* commit '
efb69b003e24757fbf04f219a61a4a71adada3a2':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Deepanshu Gupta [Tue, 17 Feb 2015 22:21:11 +0000 (22:21 +0000)]
am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
automerge:
0684991
* commit '
068499111c173fdd9869e7dbe5b9de857aca1c2d':
Add Asset management support for fonts.
Diego Perez [Tue, 17 Feb 2015 22:19:43 +0000 (22:19 +0000)]
am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
automerge:
a912fed
* commit '
a912fedbc5fba99fb75884a1941d58170822ceb4':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 22:18:35 +0000 (22:18 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
automerge:
4e47416
* commit '
4e47416012b8cb88d564a04a29c0b79a28b9e529':
Changes made by intelliJ 14.1
Tim Murray [Tue, 17 Feb 2015 22:13:06 +0000 (22:13 +0000)]
am
41c93ffe: Merge "Add BLAS intrinsic." automerge:
712572d
automerge:
27e554c
* commit '
27e554c78f36f3afeb8e64c6c57326dc887e91c7':
Add BLAS intrinsic.
Tim Murray [Tue, 17 Feb 2015 22:08:18 +0000 (22:08 +0000)]
am
41c93ffe: Merge "Add BLAS intrinsic."
automerge:
712572d
* commit '
712572d406b47b7f3d913bbac72f35fe9808a86f':
Add BLAS intrinsic.
Tim Murray [Tue, 17 Feb 2015 22:02:48 +0000 (22:02 +0000)]
am
41c93ffe: Merge "Add BLAS intrinsic."
* commit '
41c93ffee5bd271cabc4c111994c1d30970933b1':
Add BLAS intrinsic.
Tim Murray [Tue, 17 Feb 2015 21:57:23 +0000 (21:57 +0000)]
Merge "Add BLAS intrinsic."
Tim Murray [Tue, 13 Jan 2015 00:47:56 +0000 (16:47 -0800)]
Add BLAS intrinsic.
Change-Id: I95ddc46cb3f6217d2ead1091fd47450389544324
Craig Mautner [Tue, 17 Feb 2015 20:54:11 +0000 (20:54 +0000)]
Merge "Do not make ActivityContainer available to apps."
Rich Slogar [Tue, 17 Feb 2015 20:49:44 +0000 (20:49 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
8c124744b625f547a5ba15cbb442c605f109bae0':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 20:42:44 +0000 (20:42 +0000)]
am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 20:37:51 +0000 (20:37 +0000)]
Merge "docs: studio revision 1-1" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 20:26:46 +0000 (20:26 +0000)]
am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
* commit '
d285664399f8f68750e75707a35046e3c9592a2d':
docs: android plugin for gradle revisions page
Rich Slogar [Tue, 17 Feb 2015 20:19:59 +0000 (20:19 +0000)]
am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
* commit '
4abf87f134fa81460e018bb7130e88639281e1ce':
docs: android plugin for gradle revisions page
Rich Slogar [Tue, 17 Feb 2015 20:16:08 +0000 (20:16 +0000)]
Merge "docs: android plugin for gradle revisions page" into lmp-docs
Adrian Roos [Tue, 17 Feb 2015 19:26:27 +0000 (19:26 +0000)]
am
7131a7d6: am
d245ad24: am
024fd0c6: Disable color view animations when stable insets change
automerge:
018a3b6
* commit '
018a3b6d5b23f9c963d6e4a45ec4cb29abbb9155':
Disable color view animations when stable insets change
Adrian Roos [Tue, 17 Feb 2015 18:53:13 +0000 (18:53 +0000)]
am
7131a7d6: am
d245ad24: am
024fd0c6: Disable color view animations when stable insets change
* commit '
7131a7d64eab99bacf3e3caaa6494d31812b4162':
Disable color view animations when stable insets change
John Spurlock [Tue, 17 Feb 2015 18:51:53 +0000 (18:51 +0000)]
Merge "Use the unresolved stream type for mute checking."
Adrian Roos [Tue, 17 Feb 2015 18:46:40 +0000 (18:46 +0000)]
am
d245ad24: am
024fd0c6: Disable color view animations when stable insets change
* commit '
d245ad24f5e6e8c7b302689467b12718c94f4ced':
Disable color view animations when stable insets change
Adrian Roos [Tue, 17 Feb 2015 18:40:01 +0000 (18:40 +0000)]
am
024fd0c6: Disable color view animations when stable insets change
* commit '
024fd0c6051e01579018fad0c1a56e9e47b195df':
Disable color view animations when stable insets change
Craig Mautner [Tue, 17 Feb 2015 18:17:21 +0000 (10:17 -0800)]
Do not make ActivityContainer available to apps.
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug
19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
Adrian Roos [Tue, 17 Feb 2015 15:37:53 +0000 (16:37 +0100)]
Disable color view animations when stable insets change
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug:
19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
John Spurlock [Tue, 17 Feb 2015 18:20:45 +0000 (13:20 -0500)]
Use the unresolved stream type for mute checking.
Change-Id: I2eab68727f1d1e6846ad0536ee456daf26f6699e
Jorim Jaggi [Tue, 17 Feb 2015 17:16:12 +0000 (17:16 +0000)]
Merge "Keep light status bar flag when opening notification shade"
Wale Ogunwale [Tue, 17 Feb 2015 16:45:38 +0000 (16:45 +0000)]
Merge "Apply stack dim layer to entire screen for system windows."
Wale Ogunwale [Tue, 17 Feb 2015 16:45:13 +0000 (16:45 +0000)]
Merge "Don't move multi-window stacks on orientation change."
John Spurlock [Tue, 17 Feb 2015 16:36:41 +0000 (16:36 +0000)]
Merge "Volume: Allow dialog to query "muteable" streams."
Jorim Jaggi [Mon, 16 Feb 2015 16:32:28 +0000 (17:32 +0100)]
Keep light status bar flag when opening notification shade
Bug:
19233606
Change-Id: I20e50c7267b8c1cd035eafd54609537d493a5ea9
John Spurlock [Tue, 17 Feb 2015 16:01:51 +0000 (11:01 -0500)]
Volume: Allow dialog to query "muteable" streams.
Similar to the existing ability to query streams affected
by ringer mode.
Bug:
19260237
Change-Id: I76eb5ab6b7c7e3a4d73ac1909289c560194d4fe8
Adrian Roos [Tue, 17 Feb 2015 15:50:07 +0000 (15:50 +0000)]
Merge "Disable color view animations when stable insets change"
Adrian Roos [Tue, 17 Feb 2015 15:37:53 +0000 (16:37 +0100)]
Disable color view animations when stable insets change
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug:
19353466
Change-Id: Ibcf15ee4e0c9fba429745dde1b808ee41c7473cf
Jason Monk [Tue, 17 Feb 2015 15:25:34 +0000 (15:25 +0000)]
Merge "Up the history on SignalControllers"
Robin Lee [Tue, 17 Feb 2015 14:44:33 +0000 (14:44 +0000)]
Merge "DevicePolicy: Make uid parameter an int"
Robin Lee [Tue, 17 Feb 2015 14:12:48 +0000 (14:12 +0000)]
DevicePolicy: Make uid parameter an int
This should not have been a long to begin with.
Change-Id: Icbf6e2e97cb6301b968b3eb8b3f9a46331f7983e
Elliott Hughes [Tue, 17 Feb 2015 02:09:42 +0000 (02:09 +0000)]
am
b1ea8a53: am
2aa2672d: am
627396ac: Merge "Add missing <sys/file.h> include for flock."
* commit '
b1ea8a5316f9e439fd7608e1152c45aaf8f098ff':
Add missing <sys/file.h> include for flock.
Wale Ogunwale [Fri, 13 Feb 2015 17:42:46 +0000 (09:42 -0800)]
Apply stack dim layer to entire screen for system windows.
System windows like alert dialogs are attached to the currently
focused stack even when the stack isn't full screen. This causes
the dim not to apply to other visible stacks when a system
window is up. Change applies the dim to the entire screen for
system windows since they extend outside a resized stack.
Bug:
19332229
Change-Id: I94affa6a652326bf2cf14b1b8bf54862c111c540
Elliott Hughes [Tue, 17 Feb 2015 01:34:35 +0000 (01:34 +0000)]
am
2aa2672d: am
627396ac: Merge "Add missing <sys/file.h> include for flock."
* commit '
2aa2672dd8168ac2bbd9d01c31ff14fea226b089':
Add missing <sys/file.h> include for flock.
Elliott Hughes [Tue, 17 Feb 2015 01:28:34 +0000 (01:28 +0000)]
am
627396ac: Merge "Add missing <sys/file.h> include for flock."
* commit '
627396ac90dd4f8510e931bffb6705f41878c87a':
Add missing <sys/file.h> include for flock.
Wale Ogunwale [Fri, 13 Feb 2015 07:01:38 +0000 (23:01 -0800)]
Don't move multi-window stacks on orientation change.
Change allows resized stacks to remain in the same location
while their content change orientation.
Bug:
19358195
Change-Id: I5a9898c1cf85cb5c4c2eab0f4969b339defb199a
Elliott Hughes [Tue, 17 Feb 2015 01:22:19 +0000 (01:22 +0000)]
Merge "Add missing <sys/file.h> include for flock."
Craig Mautner [Mon, 16 Feb 2015 23:15:56 +0000 (23:15 +0000)]
am
c8036cdc: am
5d8f2491: am
2a005f6f: Merge "Prevent leaking surfaces from exiting windows"
* commit '
c8036cdc602a35a415fd66370c7621bb957f657e':
Prevent leaking surfaces from exiting windows
Craig Mautner [Mon, 16 Feb 2015 23:09:22 +0000 (23:09 +0000)]
am
5d8f2491: am
2a005f6f: Merge "Prevent leaking surfaces from exiting windows"
* commit '
5d8f249104a1798b6c55ae1de4e5ea36a4babd53':
Prevent leaking surfaces from exiting windows
Craig Mautner [Mon, 16 Feb 2015 23:04:08 +0000 (23:04 +0000)]
am
2a005f6f: Merge "Prevent leaking surfaces from exiting windows"
* commit '
2a005f6fe91eac2ac2646be17815756637ed610f':
Prevent leaking surfaces from exiting windows
Craig Mautner [Mon, 16 Feb 2015 22:59:20 +0000 (22:59 +0000)]
Merge "Prevent leaking surfaces from exiting windows"
Elliott Hughes [Mon, 16 Feb 2015 18:43:19 +0000 (10:43 -0800)]
Add missing <sys/file.h> include for flock.
Change-Id: I0c66c03aeb4df614f7880a830b95c40f43f804db
Geoff Mendal [Mon, 16 Feb 2015 17:16:52 +0000 (17:16 +0000)]
am
0bbacbdd: (-s ours) am
0a786f5f: (-s ours) am
f27b9850: (-s ours) Import translations. DO NOT MERGE
* commit '
0bbacbdd2f3d7711fb9bbcb2852ff62fd497d731':
Geoff Mendal [Mon, 16 Feb 2015 17:16:47 +0000 (17:16 +0000)]
am
9bf1c310: (-s ours) Import translations. DO NOT MERGE automerge:
f27b985 -s ours
* commit '
9bf1c310132b914dcd7bb760ac68a0833374e6cb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 17:12:23 +0000 (17:12 +0000)]
am
0a786f5f: (-s ours) am
f27b9850: (-s ours) Import translations. DO NOT MERGE
* commit '
0a786f5f227683f2d54145117b746629ddd2c32b':
Geoff Mendal [Mon, 16 Feb 2015 17:09:22 +0000 (17:09 +0000)]
Import translations. DO NOT MERGE
automerge:
f27b985 -s ours
* commit '
f27b98508492ebad1e183cb052df0327d47693b4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 17:07:07 +0000 (17:07 +0000)]
am
f27b9850: (-s ours) Import translations. DO NOT MERGE
* commit '
f27b98508492ebad1e183cb052df0327d47693b4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Feb 2015 16:56:21 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Feb 2015 16:08:12 +0000 (08:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ied71409f62ba67cdab855f04d60e154653822611
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Feb 2015 16:01:16 +0000 (08:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I212af90f3559189f927050e6f20fed845b37a66b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Feb 2015 15:08:01 +0000 (15:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Feb 2015 14:57:31 +0000 (06:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I93795f27d5f3a2152730e6c2399e30727936f6a3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Feb 2015 14:45:46 +0000 (14:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Feb 2015 14:43:49 +0000 (06:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I923776f2ceb27b39485ffc29fb8422bf85e48261
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Feb 2015 14:40:33 +0000 (06:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5d9f149a4f04fd8e89b73f9018fae1e5906ba572
Auto-generated-cl: translation import
Piotr Jastrzebski [Mon, 16 Feb 2015 13:06:08 +0000 (13:06 +0000)]
am
07aaff33: am
58524b2a: am
e7e92381: Merge "Register DDM handlers at the beginning of main method."
* commit '
07aaff33ef0e61dfbb15188c5aae0624dc9524a9':
Register DDM handlers at the beginning of main method.
Piotr Jastrzebski [Mon, 16 Feb 2015 12:59:37 +0000 (12:59 +0000)]
am
58524b2a: am
e7e92381: Merge "Register DDM handlers at the beginning of main method."
* commit '
58524b2aa620ae1ea709ae48b8b8598548cc7202':
Register DDM handlers at the beginning of main method.
Piotr Jastrzebski [Mon, 16 Feb 2015 12:52:59 +0000 (12:52 +0000)]
am
e7e92381: Merge "Register DDM handlers at the beginning of main method."
* commit '
e7e923818096a8a046ad183e932454428218c867':
Register DDM handlers at the beginning of main method.
Piotr Jastrzebski [Mon, 16 Feb 2015 12:47:07 +0000 (12:47 +0000)]
Merge "Register DDM handlers at the beginning of main method."
Robin Lee [Mon, 16 Feb 2015 10:47:49 +0000 (10:47 +0000)]
Merge "Device Policy API to choose a private key silently"
tiger_huang [Mon, 16 Feb 2015 08:14:47 +0000 (16:14 +0800)]
Prevent leaking surfaces from exiting windows
AM would set the exiting app to be invisible twice by calling
setAppVisibility(). If the screen is turned off during these calls,
the window surfaces of this exiting app won't be destroyed.
The flow:
1. Screen is on
2. App A is finished
3. AM calls setAppVisibility() token=App A, visible=false
4. WM sets a dummy animation to App A
5. WM marks App A's wtoken.inPendingTransaction=true
6. Screen is turned off
7. AM calls setAppVisibility() token=App A, visible=false
8. WM calls setTokenVisibilityLocked() directly (screen is off)
9. WM sends app visibility to App A's client (ViewRootImpl)
10. WM clears the dummy animation from App A
11. App A's client calls WMS.relayoutWindow() to be not visible
12. WM sets App A's window mExiting=true but not destroy its surface
13. App A's window surface leaks...
Note:
a. The call in 3. is from ActivityStack.finishActivityLocked
b. The call in 7. is from ActivityStack.resumeTopActivityInnerLocked
c. In 10., App A won't get the real animation while screen is off
d. In 12., App A's inPendingTransaction=true; WM takes it's animating
e. mExiting won't be cleared because App A has no animation to
trigger WindowStateAnimator.finishExit()
After applying this patch, WM would destroy the surface in 12. of the
above flow.
Change-Id: I18b79ba96695ec80d57a85dc15cf92a9e7d3a6ef
Wale Ogunwale [Sun, 15 Feb 2015 20:20:06 +0000 (20:20 +0000)]
Merge "Adjust activity display metrics based on stack configuration."
Jeff Sharkey [Sun, 15 Feb 2015 01:03:47 +0000 (17:03 -0800)]
Reference lint rule numbers, more rules.
When reporting lint errors/warnings, reference the relevant
underlying rule. Also adds a few more lint rules, and removes a few
aggressive checks.
Change-Id: I1bdadf5fd4df9cd28bb7dfe1c7bb1f9055398315
Yohei Yukawa [Sat, 14 Feb 2015 15:21:50 +0000 (15:21 +0000)]
am
83c804be: Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" automerge:
efd9abb
automerge:
32acf75
* commit '
32acf753e8989766f67fd5300d3eb467f707cc79':
Prevent duplicated registration of OnComputeInternalInsetsListener
Yohei Yukawa [Sat, 14 Feb 2015 15:17:17 +0000 (15:17 +0000)]
am
83c804be: Merge "Prevent duplicated registration of OnComputeInternalInsetsListener" automerge:
efd9abb
* commit '
83c804be9c1f33ff4bafbfd60218751a00c7d2b9':
Prevent duplicated registration of OnComputeInternalInsetsListener
Yohei Yukawa [Sat, 14 Feb 2015 15:11:37 +0000 (15:11 +0000)]
Merge "Prevent duplicated registration of OnComputeInternalInsetsListener"
automerge:
efd9abb
* commit '
efd9abb7dfd8d5015e73ab52b4f9b7854df4b02c':
Prevent duplicated registration of OnComputeInternalInsetsListener
Yohei Yukawa [Sat, 14 Feb 2015 15:08:04 +0000 (15:08 +0000)]
Merge "Prevent duplicated registration of OnComputeInternalInsetsListener"
Wale Ogunwale [Sat, 7 Feb 2015 01:34:28 +0000 (17:34 -0800)]
Adjust activity display metrics based on stack configuration.
Apps normally use context.getResources().getDisplayMetrics()
or getWindowManager().getDefaultDisplay() to get information
about the screen dimensions. Not all the screen space is available
for apps in a multi-window environment, so we limit the dimensions
of the display object exposed to the app to that of the containing
stack.
Bug:
19225079
Bug:
19354838
Change-Id: I8dc3a6c9b99ecedcca28fc4ddaba9f31feb4f871
David Friedman [Sat, 14 Feb 2015 02:50:49 +0000 (02:50 +0000)]
am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
* commit '
53ec037f9eb0e29f958faa334cf23c35f079eb85':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
David Friedman [Sat, 14 Feb 2015 02:42:44 +0000 (02:42 +0000)]
am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
* commit '
03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
David Friedman [Sat, 14 Feb 2015 02:36:33 +0000 (02:36 +0000)]
Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
Filip Gruszczynski [Sat, 14 Feb 2015 02:36:05 +0000 (02:36 +0000)]
am
f1df1970: am
88a9a2a4: Merge "Support for faster brightness response to light changes." into lmp-mr1-modular-dev
* commit '
f1df1970db523f60d6ac7850fba93ae98a46163b':
Support for faster brightness response to light changes.
Filip Gruszczynski [Sat, 14 Feb 2015 02:27:19 +0000 (02:27 +0000)]
am
88a9a2a4: Merge "Support for faster brightness response to light changes." into lmp-mr1-modular-dev
* commit '
88a9a2a46eb77ea340175f5d272433f4de1b6f93':
Support for faster brightness response to light changes.