git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

Chris Tate [Tue, 20 Sep 2016 20:34:10 +0000 (20:34 +0000)]

Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev
am: e6fe1287c9

Change-Id: I89421602b290ba7f354cb7312fe971d1f3248889

commit | commitdiff | tree

Christopher Tate [Tue, 20 Sep 2016 20:34:07 +0000 (20:34 +0000)]

Always store wallpaper metadata to backup
am: a611fdc66b

Change-Id: I16566a7965beeb780367723e3572c32ce841db55

commit | commitdiff | tree

Jason Monk [Tue, 20 Sep 2016 20:19:32 +0000 (20:19 +0000)]

Merge "Fix data disabled icons in RTL" into nyc-mr1-dev
am: e4a53a3677

Change-Id: I24e64f102797a1c97da2bd340f16a4e193252c3c

commit | commitdiff | tree

Jason Monk [Tue, 20 Sep 2016 20:19:29 +0000 (20:19 +0000)]

Fix data disabled icons in RTL
am: a138395cc8

Change-Id: I95498824df46150e7bf6624712214253498ab959

commit | commitdiff | tree

Chris Tate [Tue, 20 Sep 2016 20:08:12 +0000 (20:08 +0000)]

Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Sep 2016 20:04:05 +0000 (20:04 +0000)]

Merge "Fix data disabled icons in RTL" into nyc-mr1-dev

commit | commitdiff | tree

Doris Ling [Tue, 20 Sep 2016 18:41:05 +0000 (18:41 +0000)]

Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev
am: b4b96040e0

Change-Id: Ib86d3ea45b69e1c36b36356817cc12803f950361

commit | commitdiff | tree

Doris Ling [Tue, 20 Sep 2016 18:41:03 +0000 (18:41 +0000)]

Add secure settings for Ambient Display pick up and double tap gestures.
am: 6403b4050f

Change-Id: I35832dc785c1570b5243910309d029ce3c8af2bc

commit | commitdiff | tree

Doris Ling [Tue, 20 Sep 2016 18:26:43 +0000 (18:26 +0000)]

Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev

commit | commitdiff | tree

Jason Monk [Tue, 20 Sep 2016 18:21:19 +0000 (14:21 -0400)]

Fix data disabled icons in RTL

Change-Id: Idfde6cbb3f1e19c44f33fda98c8c94d795a7763b
Fixes: 30130440

commit | commitdiff | tree

Yohei Yukawa [Tue, 20 Sep 2016 18:00:08 +0000 (18:00 +0000)]

Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev
am: 786cec2f00

Change-Id: I24286eb1f986b511824adae6cc87729cb0c391b4

commit | commitdiff | tree

Yohei Yukawa [Tue, 20 Sep 2016 18:00:05 +0000 (18:00 +0000)]

Fix another deadlock between IMMS and TSMS
am: e3e31a8801

Change-Id: I4c622e7e55eedb5667b5e89f6fea51b262c4ae75

commit | commitdiff | tree

Yohei Yukawa [Tue, 20 Sep 2016 17:53:26 +0000 (17:53 +0000)]

Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 17:26:49 +0000 (17:26 +0000)]

Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev am: 59266eec4e
am: 7b68411de0

Change-Id: Ic4a854139dfd7499909eb5ebea792d25da754e50

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 17:25:19 +0000 (17:25 +0000)]

Add debug output for bad wifi avoidance restrictions. am: 29bd384f2c
am: cac09035f2

Change-Id: Ic0c4ee26115fdcc6ab16567dfb57392f20374f26

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 17:22:51 +0000 (17:22 +0000)]

Support "don't ask again" in the avoid bad wifi dialog. am: 165c51c0eb
am: aab02df195

Change-Id: Id9c694b14085b1959348ddfa91127cbb33f5e785

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 17:16:19 +0000 (17:16 +0000)]

Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev
am: 59266eec4e

Change-Id: I3cd85b815b1202b9291eacc986b131a020fefcd3

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 17:15:50 +0000 (17:15 +0000)]

Add debug output for bad wifi avoidance restrictions.
am: 29bd384f2c

Change-Id: I17e42fb80763a9d48049db9d0785b54bd5005797

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 17:14:50 +0000 (17:14 +0000)]

Support "don't ask again" in the avoid bad wifi dialog.
am: 165c51c0eb

Change-Id: Ic6a1917a83e2d847bd673790e2c36f7316ca7acd

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 17:04:37 +0000 (17:04 +0000)]

Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev

* changes:
Add debug output for bad wifi avoidance restrictions.
Support "don't ask again" in the avoid bad wifi dialog.

commit | commitdiff | tree

Yohei Yukawa [Tue, 20 Sep 2016 13:43:03 +0000 (06:43 -0700)]

Fix another deadlock between IMMS and TSMS

Bug 31247871 and Bug 31273203 are the same in terms of that both can be
triggered by calling TSM##getCurrentSpellCheckerSubtype() but different
in terms of what lock objects are involved.

To summarize

Bug 31273203: between IMMS#mMethodMap and IMM#H
  A. OnClickListener.onClick() running in the IMMS locks IMMS#mMethodMap
     then does some View operations, which can be blocked until
     IMM#H is unlocked (e.g. IMM#onViewDetachedFromWindow()).
  B. TSMS#getCurrentSpellCheckerSubtype() internally calls
     IMM#getCurrentInputMethodSubtype(), which locks IMM#H then can be
     blocked until IMMS#mMethodMap is unlocked.
  The tricky point here is that IMMS and TSMS are running in the same
  process hence IMM#H are actually shared between them.

Bug 31247871: between IMMS#mMethodMap and TSMS#mSpellCheckerMap
  C. IMMS locks IMMS#mMethodMap then calls
     InputMethodUtils#setNonSelectedSystemImesDisabledUntilUsed(), which
     can be blocked until TSMS#mSpellCheckerMap is unlocked.
  D. TSMS#getCurrentSpellCheckerSubtype() locks TSMS#mSpellCheckerMap
     then may call IMM#getCurrentInputMethodSubtype(), which can be
     blocked until IMMS#mMethodMap is released.

This CL aims to remove the layered lock in D to close Bug 31247871,
while the previous CL [1] took care of B to close Bug 31273203.

Note that A and C are still concerning and should also be taken care of
as a part of Bug 31273203.

[1]: I20cf2c20f49b1b02c0f7a18257b49d4bcc081b5d
      fa1886feea55785f413f5efcd86bccca92f26759

Bug: 31247871
Bug: 31273203
Change-Id: I26479e7aa306e0df91d9911891d5625dd5f99678

commit | commitdiff | tree

Lorenzo Colitti [Tue, 20 Sep 2016 07:03:27 +0000 (16:03 +0900)]

Add debug output for bad wifi avoidance restrictions.

Bug: 31075769
Change-Id: Ibd97f40917c946aa164c13c7e06c4696d21dc203

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:47:01 +0000 (09:47 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours am: fba3187084 am: ad079c3349
am: bd3b1da646

Change-Id: I6a9d690d1efa6d563f933e146b1a317d86a29b27

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:34:10 +0000 (09:34 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours am: 4c77b60440 am: a5606274e6
am: 03d907911a

Change-Id: Iada670c09b6b8a70a5398a8ca97a02aaee5ffa1b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:29:59 +0000 (09:29 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours am: fba3187084
am: ad079c3349

Change-Id: Ibeca0e34b1587bb6c1b9a1af49ea6c91005f7f25

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:27:01 +0000 (09:27 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours am: 4c77b60440
am: a5606274e6

Change-Id: Ie0405ab51aaacbcae6363a1ede2ee7c635be867b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:25:37 +0000 (09:25 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours am: 7efc56cc65 am: 73d479afeb
am: 564fc8f833

Change-Id: Ia11611b3696c9e47ab1e0a94d0e0680344d3f48b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:07:46 +0000 (09:07 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03 am: 1c2e8848dc -s ours
am: fba3187084

Change-Id: I9a9e74a408eacfce930d34f49f0679d65ba887de

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:02:39 +0000 (09:02 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours am: 7efc56cc65
am: 73d479afeb

Change-Id: I52e8c249eb598dae1c76ad2034e532d57be030e2

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 09:01:29 +0000 (09:01 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0 am: 5753af889b -s ours
am: 4c77b60440

Change-Id: If4c85af955349593b5b6bf0ef680b6028abd5761

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:32:59 +0000 (08:32 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c am: badb5f2a03
am: 1c2e8848dc -s ours

Change-Id: I8ef9e22473b93cc298273be517be4623b9ab1c1f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:28:41 +0000 (08:28 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492 am: 8d302da986 -s ours
am: 7efc56cc65

Change-Id: Icaacbd574c72ecdb654dd6055a54032219292ab9

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 08:28:33 +0000 (08:28 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9 am: 62c6ce4ca0
am: 5753af889b -s ours

Change-Id: I29a75431dd445026efde90f13a6e55fa59ec574d

commit | commitdiff | tree

Lorenzo Colitti [Sun, 18 Sep 2016 16:00:19 +0000 (01:00 +0900)]

Support "don't ask again" in the avoid bad wifi dialog.

This contains the following changes:

1. Make NETWORK_AVOID_BAD_WIFI a tristate: 0 means never avoid
   bad wifi, unset means prompt the user, 1 means always avoid.
2. Look at NETWORK_AVOID_BAD_WIFI only if the carrier restricts
   avoiding bad wifi (previously, we relied on the setting being
   null and defaulting to the value of the config variable).
3. Add an avoidUnvalidated bit to NetworkAgentInfo to track
   whether the user has requested switching away from this
   unvalidated network even though avoiding bad wifi is generally
   disabled. This is set to true when the user selects "switch"
   in the dialog without setting the "Don't ask again" checkbox.
4. Add a hidden setAvoidUnvalidated API to ConnectivityManager to
   set the avoidUnvalidated bit.
5. Additional unit test coverage.

Bug: 31075769
Change-Id: I1be60c3016c8095df3c4752330149ce638bd0ce1

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 07:03:27 +0000 (07:03 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours am: eacf98bf52 am: 680b4dd14e
am: df54f99587

Change-Id: Ie16fc0fb6a86fc3119c4a7edc05b4b0aaf98a2cb

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:34:19 +0000 (06:34 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7 am: 7fd31ca09c
am: badb5f2a03

Change-Id: Ic4099ba4eaac6bb50afe5811eacf85dd7759819c

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:33:24 +0000 (06:33 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc am: 827f465492
am: 8d302da986 -s ours

Change-Id: I1c1edf783ae5c466ed8c89978de5d5dfd9adb643

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:32:55 +0000 (06:32 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours am: eacf98bf52
am: 680b4dd14e

Change-Id: Ibca806635a91bda6e7577de3dc1e9a71fa9c4dc6

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:32:39 +0000 (06:32 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea am: 71bb55afd9
am: 62c6ce4ca0

Change-Id: I1d0c04e3c4382f395d10034343240e1bf4bca68f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:23:22 +0000 (06:23 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours am: 3f8c97465d am: 2cc87e32c2
am: c8e6a93778

Change-Id: I4717da1d68911be32c389d30f5babb7f747d6313

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:17:54 +0000 (06:17 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01 -s ours am: 9d3efc7882 am: 1f9646c7ca
am: 6cf48dc940

Change-Id: Ic312a3cd5d33cc8356226fa646f121af1df206d0

commit | commitdiff | tree

Vadim Tryshev [Tue, 20 Sep 2016 06:11:14 +0000 (06:11 +0000)]

Merge "Eliminating the black hole effect with location/drop events." into nyc-mr1-dev
am: b1dd85c081

Change-Id: I10214ed206d31e1d780216f45e600ed7216752b1

commit | commitdiff | tree

Vadim Tryshev [Tue, 20 Sep 2016 06:11:12 +0000 (06:11 +0000)]

Eliminating the black hole effect with location/drop events.
am: 1edc6daf1d

Change-Id: Ib32d77e7c28867753827a5d8100e628d6d8ee963

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:05:16 +0000 (06:05 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours am: 011172a731 am: 647cd7545b
am: dad9b673c1

Change-Id: I92a99dbfef238cc09a578d49f032aa092b2bbf69

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 06:01:07 +0000 (06:01 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e am: 1701a25584
am: bac21c0a99

Change-Id: I13dd3f85735873d86b2c196d8280740c9289fc51

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:54:37 +0000 (05:54 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours am: 29e4cd66d7
am: 7fd31ca09c

Change-Id: I36eecf20e2fc862daba195738363761b27e9fe8f

commit | commitdiff | tree

Kevin Hufnagle [Tue, 20 Sep 2016 05:53:24 +0000 (05:53 +0000)]

Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am: c60146d808 am: 6b4e509c25
am: 5505296760

Change-Id: Id1b1f6f7365ae8fdf441876fc1df8d31df7a3c39

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:53:20 +0000 (05:53 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071 am: 3c7e989835 -s ours
am: eacf98bf52

Change-Id: I2a2e0f481a3a9947f6e5c3b11bf3c4624aca5404

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:53:17 +0000 (05:53 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09 am: 8fedc773fc
am: 827f465492

Change-Id: I6113993dcd1aed053e5755deca2b115f5df8c5bd

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:51:05 +0000 (05:51 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours am: 1310d53aea
am: 71bb55afd9

Change-Id: Id9ccdcb6bad4eddb355f2035049361c66a3a5f15

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:34:00 +0000 (05:34 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours am: b235bc6f09
am: 8fedc773fc

Change-Id: I389e25a4d5bc24761cc7c2c9e94e45e5e6158453

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:23:59 +0000 (05:23 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours am: af97c8805f am: 8074c533df am: 2f0228c153 -s ours
am: 29e4cd66d7

Change-Id: Ib64a0085bfdb4a8e0a4d8d4b69b7434a0f8fdd4e

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:15:00 +0000 (05:15 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours am: 3f8c97465d
am: 2cc87e32c2

Change-Id: I7fb85ca1dcb08e29d47086ccf35a04798b9a3ead

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:14:33 +0000 (05:14 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad am: c6d9bdded2 am: 1b0debac62 -s ours
am: 1310d53aea

Change-Id: If01f2017d66da002d7e01fb28ffd49f0e84319d1

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:06:39 +0000 (05:06 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01 -s ours am: 9d3efc7882
am: 1f9646c7ca

Change-Id: Id93e7f4089d3025702a4f27179eb1e8fbc7bcd36

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 05:06:22 +0000 (05:06 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8 am: fcc3d8fca2 -s ours
am: b235bc6f09

Change-Id: Id2d98d2f695f8884b5854e8fb1fbf406fda8fdb0

commit | commitdiff | tree

Adrian Roos [Tue, 20 Sep 2016 05:05:59 +0000 (05:05 +0000)]

Merge "Allow dismissing ImmersiveModeCling without touch" into nyc-mr1-dev
am: 0b85c6ee78

Change-Id: I49138edc5228e0e8cbde69922c3a209380293dd1

commit | commitdiff | tree

Adrian Roos [Tue, 20 Sep 2016 05:05:54 +0000 (05:05 +0000)]

Allow dismissing ImmersiveModeCling without touch
am: dab1516994

Change-Id: Ie563bac05bd2f3f6dacfc6083ba5c3cde176c973

commit | commitdiff | tree

Andreas Gampe [Tue, 20 Sep 2016 04:55:15 +0000 (04:55 +0000)]

Merge "OtaDexopt: Fix after-ota space measure" into nyc-mr1-dev
am: 99fcdd96da

Change-Id: Idb46f1f021486fe413c975e2595f82c73b586dd7

commit | commitdiff | tree

Andreas Gampe [Tue, 20 Sep 2016 04:55:12 +0000 (04:55 +0000)]

OtaDexopt: Fix after-ota space measure
am: 8d1d2ab5b9

Change-Id: I82df8c8a4e53a4448a5eac6392b1a5005af3d589

commit | commitdiff | tree

Kevin Hufnagle [Tue, 20 Sep 2016 04:48:37 +0000 (04:48 +0000)]

docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide am: 49ed3eb8bc am: cfd0951877
am: aadfcbb116

Change-Id: Ia2ac8507eea2b76cb83da099b727a8def719e772

commit | commitdiff | tree

Winson Chung [Tue, 20 Sep 2016 04:44:06 +0000 (04:44 +0000)]

Merge "Workaround for not showing previous tasks when time is set." into nyc-mr1-dev
am: 65383622b7

Change-Id: I5d12c52ddb2cea46834b432d2b4bc25ea2105fd9

commit | commitdiff | tree

Winson [Tue, 20 Sep 2016 04:44:02 +0000 (04:44 +0000)]

Workaround for not showing previous tasks when time is set.
am: a4fab41e8b

Change-Id: I6c9e293218f649dd4ab860b061af020d97b042d2

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 04:42:51 +0000 (04:42 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15 am: 042fb63071
am: 3c7e989835 -s ours

Change-Id: Ieb72c957f1d58cea635bcd7b9449b19b3341efc8

commit | commitdiff | tree

Adrian Roos [Tue, 20 Sep 2016 04:25:44 +0000 (04:25 +0000)]

Merge "Hold WakeLock while DreamService starts" into nyc-mr1-dev
am: f940aa3ea1

Change-Id: Id05685819dfa550431f25f65ba0bba030ff1f54f

commit | commitdiff | tree

Adrian Roos [Tue, 20 Sep 2016 04:25:38 +0000 (04:25 +0000)]

Hold WakeLock while DreamService starts
am: 7445c0bb86

Change-Id: Ifbb5a3d392bf7222718eab306dc435ec569a3ae9

commit | commitdiff | tree

Svetoslav Ganov [Tue, 20 Sep 2016 04:16:55 +0000 (04:16 +0000)]

Merge "Add access tracker to renamed accounts" into nyc-mr1-dev
am: 85a93a0cc9

Change-Id: I90fa6299f263edce8b94852bc58f6f48522c7f78

commit | commitdiff | tree

Svetoslav Ganov [Tue, 20 Sep 2016 04:16:52 +0000 (04:16 +0000)]

Add access tracker to renamed accounts
am: b9f84fb6f4

Change-Id: I3ab01b658a85fc828665abc56a5f10c0228de28e

commit | commitdiff | tree

Chao Chen [Tue, 20 Sep 2016 04:12:06 +0000 (04:12 +0000)]

Merge "In AccessibilityGestureDetector.clear(), dispatch a MotionEvent.ACTION_CLEAR event to mGestureDetector to cancel the ongoing gesture." into nyc-mr1-dev
am: 944dc5a40e

Change-Id: I58830897c49bfb11371390590fdd2b68fda69ecc

commit | commitdiff | tree

chchao [Tue, 20 Sep 2016 04:12:02 +0000 (04:12 +0000)]

In AccessibilityGestureDetector.clear(), dispatch a MotionEvent.ACTION_CLEAR event to mGestureDetector to cancel the ongoing gesture.
am: 37ee5c796e

Change-Id: I0f76484c70e08435494f9e9ff1223082c9a3ceac

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 04:11:52 +0000 (04:11 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d am: 923f622c15
am: 042fb63071

Change-Id: Ia7ea774c55524f67b9174bad90cb85bac034b246

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:27:48 +0000 (03:27 +0000)]

Merge "Fix deadlock in AcitivityManagerService." into nyc-dev am: e70ebd694b am: 91064a0ed3
am: 729759f8c9

Change-Id: Ib6e8748b5c55a2a4b13806cf8439789fa2744a90

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:26:27 +0000 (03:26 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547 am: 94b739d3a2 -s ours
am: 3f8c97465d

Change-Id: I76ee929d11873c4d2b9e55d0c9470b782f52c35d

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:20:20 +0000 (03:20 +0000)]

Merge "Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf" into nyc-mr1-dev
am: 8402a17417

Change-Id: Ia085a05cebbc91edb0467edef72afa08c83287c4

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:20:17 +0000 (03:20 +0000)]

Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf
am: b4ecfb9df1

Change-Id: I5f544bbba63ff7176db49b689cfa1794a512767b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:19:49 +0000 (03:19 +0000)]

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 03:19:01 +0000 (03:19 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6 am: 2a2c463a01 -s ours
am: 9d3efc7882

Change-Id: If479be63709943e4b8fb07390220b8b25d971469

commit | commitdiff | tree

TreeHugger Robot [Tue, 20 Sep 2016 02:52:21 +0000 (02:52 +0000)]

Merge "Eliminating the “black hole” effect with location/drop events." into nyc-mr1-dev

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:42:09 +0000 (02:42 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12 am: 21d4b84547
am: 94b739d3a2 -s ours

Change-Id: Ic622fadd075915e1ba78d6795bc9382d0c6bd131

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:42:00 +0000 (02:42 +0000)]

commit | commitdiff | tree

Amith Yamasani [Tue, 20 Sep 2016 02:23:37 +0000 (02:23 +0000)]

Merge "Fix reporting of network connectivity when parole changes" into nyc-mr1-dev
am: 4bbca649fc

Change-Id: Ide96bd6761c170e1b3c004fac92a11e932e70ff7

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:52 +0000 (02:21 +0000)]

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:48 +0000 (02:21 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours am: 011172a731
am: 647cd7545b

Change-Id: Iadb9309292857ad016a30c5b19c50114efe64890

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:46 +0000 (02:21 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b am: f428d49b12
am: 21d4b84547

Change-Id: I81c7ffac76c08c12dcefcc5977cc4f01b1dab606

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:42 +0000 (02:21 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6
am: 2a2c463a01 -s ours

Change-Id: Ib7fe0eba9cb3eeb4f42355dde3835753af1c2b5b

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:21:13 +0000 (02:21 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d
am: 923f622c15

Change-Id: I2962af1b07cd8102a471d3e0020e64dc50c94a04

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:20:58 +0000 (02:20 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8
am: fcc3d8fca2 -s ours

Change-Id: I1489cbfc74d97cb5e64cc712c480d556e227285e

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 02:00:05 +0000 (02:00 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55
am: 91ff18a1f6

Change-Id: I06ecd096731967b9ab0ad55ebb3fa12b3cea4247

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:44:57 +0000 (01:44 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e
am: 1701a25584

Change-Id: I9519be12a3e3a9d8742f9d1fa715fc1307dfd5cf

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:38:53 +0000 (01:38 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad
am: c6d9bdded2

Change-Id: I854127259e85afb06046253c2d767f12439ae819

commit | commitdiff | tree

Kevin Hufnagle [Tue, 20 Sep 2016 01:37:57 +0000 (01:37 +0000)]

Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am: c60146d808
am: 6b4e509c25

Change-Id: Id2792f58b62f8ca8dc03df550fbf8ffa2a3a5708

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:37:28 +0000 (01:37 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours
am: 20bafe850d

Change-Id: I58b5b4073af01991d5dc35b68807319a8e3749b1

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:36:48 +0000 (01:36 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours am: 1d053b3be8 -s ours
am: af97c8805f

Change-Id: I7e65b0aae28bf10f3c84882990f9c26132709420

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:17:14 +0000 (01:17 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc
am: ac143d2dfd -s ours

Change-Id: I360338620a6607d882ac8dd13ec9cfbfc8381762

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:16:20 +0000 (01:16 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b
am: f428d49b12

Change-Id: I268ea392d2ebabb0ed5d3d74c02c1340d6067531

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 01:07:14 +0000 (01:07 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours
am: 011172a731

Change-Id: Ieb8e50e27e5b7dc838b4bc567499d03b83ee8a7e

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:59:58 +0000 (00:59 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours
am: 7f99a18e0e

Change-Id: Ic6e91076e979291bfcbc87bc2e8d71ddd4c700de

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:59:15 +0000 (00:59 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours
am: 1781d2bd3b

Change-Id: I8a3eb8c29b34e74bad807485767bf4e2083c539d

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:33:59 +0000 (00:33 +0000)]

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4
am: 6b77a4ee55

Change-Id: I04fdab0c6677eb8c5d6ec50ab82a4e1f9da2180f

commit | commitdiff | tree

Sudheer Shanka [Tue, 20 Sep 2016 00:33:56 +0000 (00:33 +0000)]

Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e
am: fc2bef0139 -s ours

Change-Id: Ie957e5ca85ad212891574b0a5a932fde4c565ede

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help