Sudheer Shanka
5c53e1b8bb
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
...
am: e8340a9ed5
2016-09-19 20:47:35 +00:00
Sudheer Shanka
91064a0ed3
Merge "Fix deadlock in AcitivityManagerService." into nyc-dev
...
am: e70ebd694b
2016-09-19 20:45:54 +00:00
Sudheer Shanka
44c9e2f4bf
Fix deadlock in AcitivityManagerService.
...
am: 67e05b4d28
2016-09-19 20:45:49 +00:00
Julia Reynolds
d0f20c2bbd
Merge "Null check action cloning." into nyc-mr1-dev
2016-09-19 20:35:34 +00:00
Sudheer Shanka
a4c9bbefdf
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev
...
am: d1e3e53d79
2016-09-19 20:16:17 +00:00
Sudheer Shanka
a437e7f3f1
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
...
am: dce4be63bb
2016-09-19 20:16:13 +00:00
Sudheer Shanka
96d70301e6
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev
...
am: 38077274d0
2016-09-19 20:16:00 +00:00
Sudheer Shanka
2f44f906a6
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
...
am: b59e73613b
2016-09-19 20:15:56 +00:00
Sudheer Shanka
43a1f74d7f
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
...
am: b358ee3558
2016-09-19 20:14:20 +00:00
Sudheer Shanka
bab9c1006a
DO NOT MERGE: Fix deadlock in AcitivityManagerService.
...
am: 2d608378f4
2016-09-19 20:14:16 +00:00
Dianne Hackborn
da6be5b871
A little more on issue #30766518 : Document what targeting N does
...
(cherry picked from commit 5f1649e852
2016-09-19 20:05:07 +00:00
Eric Schmidt
4b7c8d0c6b
docs: Fixed language directory issue localization am: 8350cbf824
...
am: 6be384bcf3
2016-09-19 20:03:17 +00:00
Sudheer Shanka
b358ee3558
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev
2016-09-19 20:01:51 +00:00
Sudheer Shanka
d1e3e53d79
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev
2016-09-19 19:59:22 +00:00
Sudheer Shanka
900550de49
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev
2016-09-19 19:59:18 +00:00
Sudheer Shanka
38077274d0
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev
2016-09-19 19:59:13 +00:00
Sudheer Shanka
e70ebd694b
Merge "Fix deadlock in AcitivityManagerService." into nyc-dev
2016-09-19 19:59:09 +00:00
Eric Schmidt
357b9d9816
Merge "docs: Fixed language directory issue localization" into nyc-dev
...
am: 52fd8f88e1
2016-09-19 19:51:52 +00:00
Eric Schmidt
6be384bcf3
docs: Fixed language directory issue localization
...
am: 8350cbf824
2016-09-19 19:51:48 +00:00
Eric Schmidt
52fd8f88e1
Merge "docs: Fixed language directory issue localization" into nyc-dev
2016-09-19 19:47:22 +00:00
Kevin Hufnagle
bd66ef7f2f
docs: Revised "activity launched with NFC intent" code sample to
...
demonstrate using onNewIntent() in these situations
Bug: 17129447
Change-Id: I6e60b273f8138be918708f59402866ae617af0cb
2016-09-19 12:45:31 -07:00
Dianne Hackborn
491bc2b8d6
Cherrypick so we can publish N version code description ASAP
...
Fix issue #30766518 : Document what targeting N does
Also small documentation cleanup in a few other places.
(cherry picked from commit b34cbedb4e
2016-09-19 19:31:19 +00:00
Eino-Ville Talvala
4188477b2f
Merge "DngCreator: Fix calculation of date/time stamps" into nyc-mr1-dev
2016-09-19 19:27:34 +00:00
Kevin Hufnagle
5232329b4e
docs: Added note in LayoutTransition class reference that APPEARING
...
and DISAPPEARING animation timelines cannot overlap
Bug: 16808571
Change-Id: I8cbac11da4f866f2d3bcde45996b039e9bdfb801
2016-09-19 12:02:33 -07:00
Amith Yamasani
0938f2fa98
Fix reporting of network connectivity when parole changes
...
When parole state changes, compute the uids that have been
impacted by the change of idle state and inform listeners.
Bug: 31399882
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleNonMetered_whenCharging
Test: cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testAppIdleMetered_whenCharging
Change-Id: I5cc49464a2d359890b5c48033149e569a5b021ca
2016-09-19 11:49:52 -07:00
Kevin Hufnagle
c0c4ac5e35
docs: Fixed broken link to Android KeyStore facility
...
Bug: 13663279
Change-Id: I859b3c9a35f9e6c63cb0c29260f4aa1aa33ab15c
2016-09-19 11:31:08 -07:00
Kevin Hufnagle
b248b1f689
docs: Clarified definition of KeyEvent.Callback.onKeyMultiple()
...
The onKeyMultiple() event captures simulated, not actual, presses of
the same key in rapid succession. Adjusted the method definition to
include this clarification.
Bug: 2335983
Change-Id: Id01182d81dafe98df9e559ff24f9e1d5a1f949c3
2016-09-19 11:22:31 -07:00
Tyler Gunn
65ed8f9512
Change data usage alert/disabled messages.
...
Bug: 31551177
Change-Id: I936645ab5f6ffde9245c8e234ffa01935530431c
2016-09-19 11:20:53 -07:00
smain@google.com
d031d57c9e
update DAC landings for Studio 2.2 am: f032cbfafc
...
am: a880476595
2016-09-19 18:18:44 +00:00
Vadim Tryshev
ef12811560
For pre-N apps, keep entered all parents of an drag-entered child.
...
The bug complains that parents of a view under the drag location
don’t get drag events.
This is first of a 2 CLs that will restore the old functionality
(modulus fixing bugs) for pre-N apps.
This CL restores pre-N "nested" model of the entered state for
pre-N apps. It also makes possible restoring "nested" model for
LOCATION and DROP (implemented in a follow-up CL)
The CL replaces (for pre-N) generation of ENTER/EXIT events that
happens at the moment of changing the drag focus with generation
folowing the recursive delivery of coordinate-bearing events.
Bug: 31559942
Change-Id: Iead6bde9c1f88819b30afc78c1f424f7c1b64d51
2016-09-19 11:14:19 -07:00
smain@google.com
a880476595
update DAC landings for Studio 2.2
...
am: f032cbfafc
2016-09-19 18:12:04 +00:00
Kevin Hufnagle
49ed3eb8bc
docs: Added descriptions of "Pricing Template ID" column to in-app
...
products CSV guide
Bug: 31507720
Change-Id: Ic95bd1dab5d1fb75a6dbab9dba5f0f8195f4090e
2016-09-19 10:48:31 -07:00
smain@google.com
f032cbfafc
update DAC landings for Studio 2.2
...
Change-Id: I5ab5cb935ca058b543bd5751c3cdcc7cbf92a1dd
2016-09-19 10:42:34 -07:00
TreeHugger Robot
3dfd09e860
Merge "Added new config to indicate read-only apn types." into nyc-mr1-dev
2016-09-19 16:30:21 +00:00
Paul Jensen
eb7e711571
Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 am: cc3287ef42 am: f8d3ded044 am: 8279621b82
...
am: 57f76df8d7
2016-09-19 15:28:35 +00:00
Paul Jensen
57f76df8d7
Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 am: cc3287ef42 am: f8d3ded044
...
am: 8279621b82
2016-09-19 15:21:41 +00:00
Paul Jensen
8279621b82
Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1 am: cc3287ef42
...
am: f8d3ded044
2016-09-19 15:15:52 +00:00
Paul Jensen
f8d3ded044
Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3 am: ad004292e1
...
am: cc3287ef42
2016-09-19 15:08:59 +00:00
Paul Jensen
cc3287ef42
Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52 am: a81dd677d3
...
am: ad004292e1
2016-09-19 15:02:28 +00:00
Paul Jensen
ad004292e1
Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f am: d6a5f68f52
...
am: a81dd677d3
2016-09-19 14:55:54 +00:00
Paul Jensen
a81dd677d3
Fix build break due to automerge of 7d2198b5 am: baae57ab24 am: 009e08116f
...
am: d6a5f68f52
2016-09-19 14:50:48 +00:00
Paul Jensen
d6a5f68f52
Fix build break due to automerge of 7d2198b5 am: baae57ab24
...
am: 009e08116f
2016-09-19 14:43:28 +00:00
Paul Jensen
009e08116f
Fix build break due to automerge of 7d2198b5
...
am: baae57ab24
2016-09-19 14:37:29 +00:00
Paul Jensen
baae57ab24
Fix build break due to automerge of 7d2198b5
...
Bug: 30100884
Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f
2016-09-19 13:27:41 +00:00
Paul Jensen
8587d11e9e
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d am: c875015cc5 am: 66482b555a am: bedb94754b am: a728ecff98 am: 410b6d68e2
...
am: 917584cfa7
2016-09-19 12:48:56 +00:00
Paul Jensen
cb35cae3cb
Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 am: 2855de1e7c am: 53a9c65c8d am: 34e77bb699 am: d3a9c09052 am: c20692329e
...
am: 38963f7927
2016-09-19 12:46:43 +00:00
Paul Jensen
917584cfa7
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d am: c875015cc5 am: 66482b555a am: bedb94754b am: a728ecff98
...
am: 410b6d68e2
2016-09-19 12:42:28 +00:00
Paul Jensen
38963f7927
Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 am: 2855de1e7c am: 53a9c65c8d am: 34e77bb699 am: d3a9c09052
...
am: c20692329e
2016-09-19 12:38:01 +00:00
Paul Jensen
410b6d68e2
Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b am: 7c08c4d5cc am: 963ca6f947 am: 3532f10fcb am: 849f1ba2d9 am: b7ba9fd70f am: 4121b70a7d am: c875015cc5 am: 66482b555a am: bedb94754b
...
am: a728ecff98
2016-09-19 12:33:43 +00:00
Paul Jensen
c20692329e
Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 am: d37eb76465 am: ddce8664bd am: 4fd2cc7277 am: 2855de1e7c am: 53a9c65c8d am: 34e77bb699
...
am: d3a9c09052
2016-09-19 12:21:41 +00:00
