OSDN Git Service
Android Build Merger (Role) [Wed, 15 Jun 2016 01:26:43 +0000 (01:26 +0000)]
Merge "Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am:
6ba96df815 am:
f9eed3bf86" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 15 Jun 2016 01:26:33 +0000 (01:26 +0000)]
Merge "Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am:
159c13801b am:
5df969f778" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 15 Jun 2016 01:26:25 +0000 (01:26 +0000)]
Merge "Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am:
ea1f3cb5c3 am:
f93ef9d4bc" into nyc-mr1-dev-plus-aosp
Winson [Wed, 15 Jun 2016 01:25:56 +0000 (01:25 +0000)]
Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am:
6ba96df815
am:
f9eed3bf86
Change-Id: I1ff302336f1ddd2178e71de126441f08bb13ffa9
Sudheer Shanka [Wed, 15 Jun 2016 01:25:54 +0000 (01:25 +0000)]
Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am:
159c13801b
am:
5df969f778
Change-Id: I0ddce3fb5087a2deae54dd676313a9b77156e397
David Friedman [Wed, 15 Jun 2016 01:25:51 +0000 (01:25 +0000)]
Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am:
ea1f3cb5c3
am:
f93ef9d4bc
Change-Id: Ifcc0fba668ca8a8fd4bf77bb4c525fcc4e2ea07e
Winson [Wed, 15 Jun 2016 01:24:59 +0000 (01:24 +0000)]
Merge \\"Only skip trimming task if the stacks are not null.\\" into nyc-dev am:
6ba96df815
am:
f654d3e081
Change-Id: I08322a664374d16829f87391c913e0aba44f3cfb
Sudheer Shanka [Wed, 15 Jun 2016 01:20:30 +0000 (01:20 +0000)]
Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am:
159c13801b
am:
1f096663e8
Change-Id: I10f0d321d246ec70fc55b38c9f6a43dcf3280f0e
David Friedman [Wed, 15 Jun 2016 01:20:27 +0000 (01:20 +0000)]
Merge \\"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\\" into nyc-dev am:
ea1f3cb5c3
am:
ee13234773
Change-Id: I21ee8eb3586e8c085c6d0d048233a4383f889072
Robert Carr [Wed, 15 Jun 2016 01:20:20 +0000 (01:20 +0000)]
Merge \\"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\\" into nyc-dev am:
3e5df9fb50
am:
5077dd948f
Change-Id: Iebfc46bb349456e11937fdfa82a8fe6a5a15d950
Winson [Wed, 15 Jun 2016 01:16:03 +0000 (01:16 +0000)]
Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
am:
6ba96df815
Change-Id: I6551328b80a849013ea121ded03333e2a9475145
Winson [Wed, 15 Jun 2016 01:16:02 +0000 (01:16 +0000)]
Merge \"Only skip trimming task if the stacks are not null.\" into nyc-dev
am:
6ba96df815
Change-Id: I58b230bb33330fbb130094cc937c4aeaf5976baa
Shawn Willden [Wed, 15 Jun 2016 01:15:44 +0000 (01:15 +0000)]
Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am:
2c2f8acdab
am:
31eece5af9
Change-Id: Ib802115dde54f3fdaee73e42b0376318f944cc1e
Sudheer Shanka [Wed, 15 Jun 2016 01:12:21 +0000 (01:12 +0000)]
Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
am:
159c13801b
Change-Id: Ic83a0ae31afac6b94fcfba8ceee986326fb300ab
David Friedman [Wed, 15 Jun 2016 01:12:19 +0000 (01:12 +0000)]
Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am:
ea1f3cb5c3
Change-Id: Ib6e5fd941a3b091274fc5af2428f4a567abb5b69
Android Build Merger (Role) [Wed, 15 Jun 2016 01:12:18 +0000 (01:12 +0000)]
Merge "Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am:
2c2f8acdab am:
2da8166a68" into nyc-mr1-dev-plus-aosp
Robert Carr [Wed, 15 Jun 2016 01:12:17 +0000 (01:12 +0000)]
Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am:
3e5df9fb50
Change-Id: I59d035329b3e6acbc929564ba7ce1107943c6587
Sudheer Shanka [Wed, 15 Jun 2016 01:12:11 +0000 (01:12 +0000)]
Merge \"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\" into nyc-dev
am:
159c13801b
Change-Id: Ic4d94327a21f2a8b8ae175e057039eafb9c2d698
David Friedman [Wed, 15 Jun 2016 01:12:07 +0000 (01:12 +0000)]
Merge \"Docs: Adds SurfaceView to API Overview page for Android-N DP4.\" into nyc-dev
am:
ea1f3cb5c3
Change-Id: Ia61b3fd592e19c7fb021b0f22e3eeb8bbc6b5b4f
Robert Carr [Wed, 15 Jun 2016 01:12:03 +0000 (01:12 +0000)]
Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am:
3e5df9fb50
Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3
Shawn Willden [Wed, 15 Jun 2016 01:11:57 +0000 (01:11 +0000)]
Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am:
2c2f8acdab
am:
2da8166a68
Change-Id: I14d955073b1093199d05ea7f4f431bc1b74f81f7
Shawn Willden [Wed, 15 Jun 2016 01:11:44 +0000 (01:11 +0000)]
Merge \\"Unbreak Javadoc on getAttestationChallenge()\\" into nyc-dev am:
2c2f8acdab
am:
6bc69459ed
Change-Id: I9fdafe59c549cd8a9cf15e7f05d0aad446954bab
TreeHugger Robot [Wed, 15 Jun 2016 01:08:57 +0000 (01:08 +0000)]
Merge "Only skip trimming task if the stacks are not null." into nyc-dev
Shawn Willden [Wed, 15 Jun 2016 01:05:26 +0000 (01:05 +0000)]
Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am:
2c2f8acdab
Change-Id: I89b9c88159f99681049ce401f22ca9ea8578b27c
Shawn Willden [Wed, 15 Jun 2016 01:04:48 +0000 (01:04 +0000)]
Merge \"Unbreak Javadoc on getAttestationChallenge()\" into nyc-dev
am:
2c2f8acdab
Change-Id: Id639d2ce9ac95fc1a0a87048e5b3f8b8137c5fdd
TreeHugger Robot [Wed, 15 Jun 2016 01:02:32 +0000 (01:02 +0000)]
Merge "Allow apps with CREATE_USERS permission to call UM.getUserInfo." into nyc-dev
Chris Thornton [Wed, 15 Jun 2016 01:00:29 +0000 (01:00 +0000)]
Merge \"Prevent NPE when updating models without a vendor UUID\" into nyc-mr1-dev
am:
ad5c30bdb2
Change-Id: I11f22f6f265564184cd22fd3286ebcf6b9e488e5
David Friedman [Wed, 15 Jun 2016 00:59:52 +0000 (00:59 +0000)]
Merge "Docs: Adds SurfaceView to API Overview page for Android-N DP4." into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:59:19 +0000 (00:59 +0000)]
Merge "Toast timeout: Just strip FLAG_KEEP_SCREEN_ON" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:56:45 +0000 (00:56 +0000)]
Merge "Unbreak Javadoc on getAttestationChallenge()" into nyc-dev
TreeHugger Robot [Wed, 15 Jun 2016 00:56:29 +0000 (00:56 +0000)]
Merge "Prevent NPE when updating models without a vendor UUID" into nyc-mr1-dev
David Friedman [Tue, 14 Jun 2016 22:37:16 +0000 (15:37 -0700)]
Docs: Adds SurfaceView to API Overview page for Android-N DP4.
Change-Id: I29854c82ef788b00c1ebc305bc5faf463c2d8dc8
Dirk Dougherty [Wed, 15 Jun 2016 00:44:09 +0000 (00:44 +0000)]
Merge \\"Add API 24 to reference selector.\\" into nyc-dev am:
398d088871
am:
8d129efa23
Change-Id: If1d947f8bebf5ddf5f65d518d2db34c1549656a9
Dirk Dougherty [Wed, 15 Jun 2016 00:34:01 +0000 (00:34 +0000)]
Merge \\"Add API 24 to reference selector.\\" into nyc-dev am:
398d088871
am:
f44feb36b0
Change-Id: Iff60df549779cd1155a7bfeeb74aca5e546a31ad
Dirk Dougherty [Wed, 15 Jun 2016 00:28:07 +0000 (00:28 +0000)]
Merge \"Add API 24 to reference selector.\" into nyc-dev
am:
398d088871
Change-Id: I922cb82b69a13913d83280d1003e292528bdfd88
Dirk Dougherty [Wed, 15 Jun 2016 00:28:03 +0000 (00:28 +0000)]
Merge \"Add API 24 to reference selector.\" into nyc-dev
am:
398d088871
Change-Id: I51a61188186026eac5c12f3b0d0ec52eebf60f38
Dirk Dougherty [Wed, 15 Jun 2016 00:20:26 +0000 (00:20 +0000)]
Merge "Add API 24 to reference selector." into nyc-dev
Todd Kennedy [Wed, 15 Jun 2016 00:03:12 +0000 (00:03 +0000)]
Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
am:
d07b87cb1c
Change-Id: I3296ac4343cfedb5b88470963cb4671e9e3427f6
Dirk Dougherty [Tue, 14 Jun 2016 23:57:49 +0000 (23:57 +0000)]
Merge \\"Doc change: add diffs for 23->24.\\" into nyc-dev am:
70e358b017
am:
c3c0e94e59
Change-Id: I775a41ef489097ec836f8dcbcf7b51bd6224da81
Todd Kennedy [Tue, 14 Jun 2016 23:57:17 +0000 (23:57 +0000)]
Merge "New API w/ multiple prefixes" into nyc-mr1-dev
Dirk Dougherty [Tue, 14 Jun 2016 23:55:13 +0000 (23:55 +0000)]
Merge \\"Doc change: add diffs for 23->24.\\" into nyc-dev am:
70e358b017
am:
a581e78678
Change-Id: I9abf820074d7a1a1abb04351ebfb25a74a9fc50f
Dirk Dougherty [Tue, 14 Jun 2016 23:52:03 +0000 (23:52 +0000)]
Merge \"Doc change: add diffs for 23->24.\" into nyc-dev
am:
70e358b017
Change-Id: I54efbc44f2cea31f575c89a3543f571540653a15
Dirk Dougherty [Tue, 14 Jun 2016 23:51:55 +0000 (23:51 +0000)]
Merge \"Doc change: add diffs for 23->24.\" into nyc-dev
am:
70e358b017
Change-Id: I51b151fce31f891d6ab61f48d094ea56fa0da817
Dirk Dougherty [Tue, 14 Jun 2016 23:44:23 +0000 (23:44 +0000)]
Merge "Doc change: add diffs for 23->24." into nyc-dev
Winson [Tue, 14 Jun 2016 22:39:27 +0000 (15:39 -0700)]
Only skip trimming task if the stacks are not null.
Bug:
29121819,
29359871
Change-Id: I8f8602796e316ed5b36a033e4eaa020650064f74
Dirk Dougherty [Tue, 14 Jun 2016 23:26:28 +0000 (16:26 -0700)]
Add API 24 to reference selector.
Change-Id: I153245ef814e27bf50f9d972ad1aa34fd92e6b8a
Sudheer Shanka [Tue, 14 Jun 2016 23:22:57 +0000 (16:22 -0700)]
Allow apps with CREATE_USERS permission to call UM.getUserInfo.
Bug:
29355382
Change-Id: Iaf73c453156e3a989660d05124b0c0938619abd7
Android Build Merger (Role) [Tue, 14 Jun 2016 23:22:14 +0000 (23:22 +0000)]
Merge "Merge \\"Make sure task exists in WM before trying to set the resizing state\\" into nyc-dev am:
39647560d1 am:
a75c0709db" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 14 Jun 2016 23:22:01 +0000 (23:22 +0000)]
Merge "Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am:
02ab2f52bf am:
24edc3934d" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Tue, 14 Jun 2016 23:19:53 +0000 (23:19 +0000)]
Merge \\"Make sure task exists in WM before trying to set the resizing state\\" into nyc-dev am:
39647560d1
am:
d0e51b0e89
Change-Id: Ib24af6b71579b0ffb0db275dda7598233b6ede1e
Selim Cinek [Tue, 14 Jun 2016 23:19:50 +0000 (23:19 +0000)]
Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am:
02ab2f52bf
am:
91965ce2e9
Change-Id: Ia6dfb5ba27696eb4938f528a57374ae8ef0be16c
Wale Ogunwale [Tue, 14 Jun 2016 23:16:55 +0000 (23:16 +0000)]
Merge \\"Make sure task exists in WM before trying to set the resizing state\\" into nyc-dev am:
39647560d1
am:
a75c0709db
Change-Id: Ibc7f9407773ba2a7f3995028561e58fc5b5bb52b
Selim Cinek [Tue, 14 Jun 2016 23:16:53 +0000 (23:16 +0000)]
Merge \\"Fixed another case where the systemUI could crashloop\\" into nyc-dev am:
02ab2f52bf
am:
24edc3934d
Change-Id: I4e1acdf080622aeb71f3401e34b64fa5ea192722
Wale Ogunwale [Tue, 14 Jun 2016 23:12:14 +0000 (23:12 +0000)]
Merge \"Make sure task exists in WM before trying to set the resizing state\" into nyc-dev
am:
39647560d1
Change-Id: Id9f331026d9bc76a0764685c03b0366e821cebc5
Selim Cinek [Tue, 14 Jun 2016 23:12:12 +0000 (23:12 +0000)]
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
am:
02ab2f52bf
Change-Id: I3ca5e31a3571398d1eb00cf0c7f40d1bb007055f
Android Build Merger (Role) [Tue, 14 Jun 2016 23:11:46 +0000 (23:11 +0000)]
Merge "Merge \\"docs: Noted \\"Crypto\\" removal\\" into nyc-dev am:
8d7b4a4945 am:
f0dcd27ca6" into nyc-mr1-dev-plus-aosp
Wale Ogunwale [Tue, 14 Jun 2016 23:11:29 +0000 (23:11 +0000)]
Merge \"Make sure task exists in WM before trying to set the resizing state\" into nyc-dev
am:
39647560d1
Change-Id: I077e2d9432cdcb4f4e796df158c9fdb701e2a5f6
Selim Cinek [Tue, 14 Jun 2016 23:11:25 +0000 (23:11 +0000)]
Merge \"Fixed another case where the systemUI could crashloop\" into nyc-dev
am:
02ab2f52bf
Change-Id: If26ae07e20433213334233bea1231440fae817e1
Andrew Solovay [Tue, 14 Jun 2016 23:11:21 +0000 (23:11 +0000)]
Merge \\"docs: Noted \\"Crypto\\" removal\\" into nyc-dev am:
8d7b4a4945
am:
f0dcd27ca6
Change-Id: I5bac345ad36f06b033d26f7911d73e3f80ef1d6e
Andrew Solovay [Tue, 14 Jun 2016 23:10:49 +0000 (23:10 +0000)]
Merge \\"docs: Noted \\"Crypto\\" removal\\" into nyc-dev am:
8d7b4a4945
am:
8c59ca6902
Change-Id: Ief92ee6d42efaed06c0d74b234d96bfa6adf44a1
TreeHugger Robot [Tue, 14 Jun 2016 23:05:49 +0000 (23:05 +0000)]
Merge "Make sure task exists in WM before trying to set the resizing state" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 23:04:30 +0000 (23:04 +0000)]
Merge "Fixed another case where the systemUI could crashloop" into nyc-dev
Andrew Solovay [Tue, 14 Jun 2016 23:02:30 +0000 (23:02 +0000)]
Merge \"docs: Noted \"Crypto\" removal\" into nyc-dev
am:
8d7b4a4945
Change-Id: I52083f2f0e7ebf90fe01b25f5f081e5477f1da91
Andrew Solovay [Tue, 14 Jun 2016 23:01:33 +0000 (23:01 +0000)]
Merge \"docs: Noted \"Crypto\" removal\" into nyc-dev
am:
8d7b4a4945
Change-Id: I9bc56a5c233f7c6ab02f65098ad7c9a40729cb72
Todd Kennedy [Fri, 10 Jun 2016 23:42:00 +0000 (16:42 -0700)]
New API w/ multiple prefixes
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation
Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
Shawn Willden [Tue, 14 Jun 2016 22:59:14 +0000 (16:59 -0600)]
Unbreak Javadoc on getAttestationChallenge()
Bug:
28844154
Change-Id: I8402a39f366291cd2b5d646536cd2c2bab8556d2
Yohei Yukawa [Tue, 14 Jun 2016 22:55:55 +0000 (22:55 +0000)]
Merge \\"Quick workaround for a performance regression in IME APIs.\\" into nyc-dev am:
6fe4865e85
am:
cb2c497230
Change-Id: I682870edc734bba31c887fce49dce54b1e5cb47c
TreeHugger Robot [Tue, 14 Jun 2016 22:54:46 +0000 (22:54 +0000)]
Merge "docs: Noted "Crypto" removal" into nyc-dev
Yohei Yukawa [Tue, 14 Jun 2016 22:53:27 +0000 (22:53 +0000)]
Merge \\"Quick workaround for a performance regression in IME APIs.\\" into nyc-dev am:
6fe4865e85
am:
bb587122c6
Change-Id: I678349a113f27a1aa41a404ca97411f2c524a511
Chris Thornton [Tue, 14 Jun 2016 22:53:14 +0000 (15:53 -0700)]
Prevent NPE when updating models without a vendor UUID
Change-Id: If58cd3ddb0a2afd601af3e3868ab4ff500be53a9
Yohei Yukawa [Tue, 14 Jun 2016 22:48:35 +0000 (22:48 +0000)]
Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
am:
6fe4865e85
Change-Id: I96bef7f47729282a57b6acc11c8bf4ada42c6a06
Yohei Yukawa [Tue, 14 Jun 2016 22:47:28 +0000 (22:47 +0000)]
Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
am:
6fe4865e85
Change-Id: Id039d1dd681483c1d86349ee7e765b2f1f4fa95f
Robert Carr [Sat, 11 Jun 2016 01:44:24 +0000 (18:44 -0700)]
Toast timeout: Just strip FLAG_KEEP_SCREEN_ON
We added the toast timeout to fix b/
21693547. Where the client
leaks non visible toasts which end up keeping the screen on.
Simply removing the toast windows as we were doing previously,
isn't very good though. If the timeout fires when an app could
still use the toast (e.g. due to long pause under debugger),
the app could crash. It's not obvious how (if even possible
without API semantic/guarantee change) to prevent this issue
from the client side. Furthermore, #33 at b/
21693457 implies that
we need to respect FLAG_KEEP_SCREEN_ON even for windows that
never submitted a buffer. With time constraints as they are,
the only solution I can think of that solves both without
chance of regression is just stripping FLAG_KEEP_SCREEN_ON when the
timeout fires.
Bug:
29105388
Change-Id: Ic2df897f86acf814ea3d4f911a0532d65af0c19f
Yohei Yukawa [Tue, 14 Jun 2016 22:43:18 +0000 (22:43 +0000)]
Merge "Quick workaround for a performance regression in IME APIs." into nyc-dev
Doris Ling [Tue, 14 Jun 2016 22:39:50 +0000 (22:39 +0000)]
Merge \"Added config system navigation keys.\" into nyc-mr1-dev
am:
32300db186
Change-Id: I9de582c7ae95aa36fbae75be6b72b4ffc01ae695
Doris Ling [Tue, 14 Jun 2016 22:35:18 +0000 (22:35 +0000)]
Merge "Added config system navigation keys." into nyc-mr1-dev
Android Build Merger (Role) [Tue, 14 Jun 2016 22:25:46 +0000 (22:25 +0000)]
Merge "Merge \\"Version PrintRecommendationService.\\" into nyc-dev am:
8e3a16ad91 am:
2e6fde579d" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Tue, 14 Jun 2016 22:25:24 +0000 (22:25 +0000)]
Merge \\"Version PrintRecommendationService.\\" into nyc-dev am:
8e3a16ad91
am:
2e6fde579d
Change-Id: Ifba59226f9cfe87a4c3465d6da88d20399a5d90a
Philip P. Moltmann [Tue, 14 Jun 2016 22:24:18 +0000 (22:24 +0000)]
Merge \\"Version PrintRecommendationService.\\" into nyc-dev am:
8e3a16ad91
am:
c6ded5559c
Change-Id: Ide47bb18bb992f8aa499fcb57f0cb33126107d4f
Philip P. Moltmann [Tue, 14 Jun 2016 22:20:30 +0000 (22:20 +0000)]
Merge \"Version PrintRecommendationService.\" into nyc-dev
am:
8e3a16ad91
Change-Id: Ifd37bc80af0fe759a5e6673245ace2eebd82e513
Philip P. Moltmann [Tue, 14 Jun 2016 22:19:45 +0000 (22:19 +0000)]
Merge \"Version PrintRecommendationService.\" into nyc-dev
am:
8e3a16ad91
Change-Id: Ic4d75b1549d314e46db032f3e3506e2cd4776308
Android Build Merger (Role) [Tue, 14 Jun 2016 22:15:56 +0000 (22:15 +0000)]
Merge "Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am:
5c176ff133 am:
1315d0cb9f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 14 Jun 2016 22:15:42 +0000 (22:15 +0000)]
Merge "Docs: Added overview of Custom Pointer API am:
37663db137 am:
96344aafc2" into nyc-mr1-dev-plus-aosp
Andrii Kulian [Tue, 14 Jun 2016 22:15:13 +0000 (22:15 +0000)]
Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am:
5c176ff133
am:
1315d0cb9f
Change-Id: I5c38b2288407f9b34c7f5863d3e3246c925c67a6
Hemal Patel [Tue, 14 Jun 2016 22:15:09 +0000 (22:15 +0000)]
Docs: Added overview of Custom Pointer API am:
37663db137
am:
96344aafc2
Change-Id: Ie9cd2573a1ce95b104fb47da2714a1b69fa8f681
Andrii Kulian [Tue, 14 Jun 2016 22:14:50 +0000 (22:14 +0000)]
Merge \\"Revert \\"Don\\'t update task to return to type for last task over home\\"\\" into nyc-dev am:
5c176ff133
am:
01cc848c6d
Change-Id: I09b4e5e9083362b4cf0aeac1adc934514ce9b31a
Hemal Patel [Tue, 14 Jun 2016 22:14:42 +0000 (22:14 +0000)]
Docs: Added overview of Custom Pointer API am:
37663db137
am:
892d5ccdc5
Change-Id: I924d29ba5561bc2d55df7057e4ca204cd3ea924d
Andrii Kulian [Tue, 14 Jun 2016 22:08:50 +0000 (22:08 +0000)]
Merge \"Revert \"Don\'t update task to return to type for last task over home\"\" into nyc-dev
am:
5c176ff133
Change-Id: I7a901be3116ee6ee8005ee7d6e41c1781ad02718
Andrii Kulian [Tue, 14 Jun 2016 22:08:46 +0000 (22:08 +0000)]
Merge \"Revert \"Don\'t update task to return to type for last task over home\"\" into nyc-dev
am:
5c176ff133
Change-Id: Ibd14c8a53b8d675298d4e13fc064281813881137
Hemal Patel [Tue, 14 Jun 2016 22:08:46 +0000 (22:08 +0000)]
Docs: Added overview of Custom Pointer API
am:
37663db137
Change-Id: I8e1824c392fda188fa276a5d2da7ec990a17030b
Hemal Patel [Tue, 14 Jun 2016 22:08:44 +0000 (22:08 +0000)]
Docs: Added overview of Custom Pointer API
am:
37663db137
Change-Id: I1bf94ef4e1c86dcd14bcf956d35e890ed3a1ad23
TreeHugger Robot [Tue, 14 Jun 2016 22:08:41 +0000 (22:08 +0000)]
Merge "Version PrintRecommendationService." into nyc-dev
Mark Renouf [Tue, 14 Jun 2016 21:57:35 +0000 (21:57 +0000)]
Merge changes I3352e1fc,I52ac4dda,Ie9d51041,Id643a27e into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Set hintTextColor and composingSpan style for EditText and extract view\" into nyc-mr1-dev am:
a884aacb47
Merge \\"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\\" into nyc-dev am:
da66010cd8 am:
ab45c9df1f
Merge \\"Fix QS edit view accessibility classes\\" into nyc-dev am:
0809964452 am:
a78fd8a31b
Merge \\"Delete simple reduction implementation.\\" into nyc-dev am:
d749245b88 am:
9a53329b0a
TreeHugger Robot [Tue, 14 Jun 2016 21:55:53 +0000 (21:55 +0000)]
Merge "Revert "Don't update task to return to type for last task over home"" into nyc-dev
Wale Ogunwale [Tue, 14 Jun 2016 20:10:09 +0000 (13:10 -0700)]
Make sure task exists in WM before trying to set the resizing state
It is possible for a task to be removed from the WM and stack in AM
while resizing (e.g. app crashes). In this case we want to make sure
the task exist in WM before we try to set the dock resizing state vs.
depending on the fact that the task is in recent list in AM.
Bug:
29325623
Change-Id: Ib89a7bfe12fe1f2c4c6c56ac9e13b0052ea2b4ec
Hemal Patel [Mon, 13 Jun 2016 21:37:36 +0000 (14:37 -0700)]
Docs: Added overview of Custom Pointer API
Bug:
28241984
Change-Id: Iffa2a0cc46f71377b79f4ac792d2f469353cc395
Julia Reynolds [Tue, 14 Jun 2016 21:06:08 +0000 (21:06 +0000)]
Only reload callback on configuration change. am:
8d0a400119
am:
2045488afd
Change-Id: Ic420fcfe1b289a66f9f1b9f72ff00f7dd166a3b0
Winson Chung [Tue, 14 Jun 2016 21:06:05 +0000 (21:06 +0000)]
Merge \\"Fixing several issues with accessibility\\" into nyc-dev am:
987cd20acf
am:
55e93a0594
Change-Id: I8de1b1bf792f72c86c74c6e1b10771d5dccb836f
Julia Reynolds [Tue, 14 Jun 2016 21:06:02 +0000 (21:06 +0000)]
Merge \\"Revert \\"Announce access point changes.\\"\\" into nyc-dev am:
a64e3a0844
am:
b269cfe9e1
Change-Id: If9bb3fb9aab16d5d4b4701ea85d8114c36e2b00b
Chris Tate [Tue, 14 Jun 2016 21:05:58 +0000 (21:05 +0000)]
Merge \\"Note null alarm worksource names under the alarm\\'s package\\" into nyc-dev am:
2f4636a333
am:
ab367d1d64
Change-Id: I02c82570521b9f26d1ae99ed54cc8c09a7437d87
OSDN Git Service
