Sudheer Shanka
573c6a4c8d
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
2016-09-20 03:18:56 +00:00
Sudheer Shanka
3f8c97465d
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
2016-09-20 02:42:09 +00:00
Sudheer Shanka
1310d53aea
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
2016-09-20 02:42:00 +00:00
Sudheer Shanka
2f0228c153
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
2016-09-20 02:21:52 +00:00
Sudheer Shanka
94b739d3a2
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
2016-09-20 02:21:46 +00:00
Sudheer Shanka
9d3efc7882
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55 am: 91ff18a1f6
...
am: 2a2c463a01
2016-09-20 02:21:42 +00:00
Sudheer Shanka
042fb63071
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours am: 20bafe850d
...
am: 923f622c15
2016-09-20 02:21:13 +00:00
Sudheer Shanka
b235bc6f09
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f am: e8e30122e8
...
am: fcc3d8fca2
2016-09-20 02:20:58 +00:00
Sudheer Shanka
2a2c463a01
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4 am: 6b77a4ee55
...
am: 91ff18a1f6
2016-09-20 02:00:05 +00:00
Sudheer Shanka
1b0debac62
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours am: 51bcb058ad
...
am: c6d9bdded2
2016-09-20 01:38:53 +00:00
Sudheer Shanka
923f622c15
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc am: ac143d2dfd -s ours
...
am: 20bafe850d
2016-09-20 01:37:28 +00:00
Sudheer Shanka
8074c533df
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
2016-09-20 01:36:48 +00:00
Sudheer Shanka
20bafe850d
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a am: e85152c2fc
...
am: ac143d2dfd
2016-09-20 01:17:14 +00:00
Sudheer Shanka
21d4b84547
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours am: 1781d2bd3b
...
am: f428d49b12
2016-09-20 01:16:20 +00:00
Sudheer Shanka
543828d06f
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours
...
am: 011172a731
2016-09-20 01:15:36 +00:00
Sudheer Shanka
f2bb102df4
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours
...
am: 7f99a18e0e
2016-09-20 00:59:50 +00:00
Sudheer Shanka
f428d49b12
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5 am: 426ba52b42 -s ours
...
am: 1781d2bd3b
2016-09-20 00:59:15 +00:00
Sudheer Shanka
91ff18a1f6
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours am: e44f8fcca4
...
am: 6b77a4ee55
2016-09-20 00:33:59 +00:00
Sudheer Shanka
011172a731
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e
...
am: fc2bef0139
2016-09-20 00:33:56 +00:00
Sudheer Shanka
fcc3d8fca2
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours am: 43a1f74d7f
...
am: e8e30122e8
2016-09-20 00:13:24 +00:00
Sudheer Shanka
7f99a18e0e
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416
...
am: 6f170618ff
2016-09-20 00:13:19 +00:00
Sudheer Shanka
fc2bef0139
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6
...
am: 018d1e7e1e
2016-09-20 00:13:13 +00:00
Sudheer Shanka
c6d9bdded2
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours am: ff9a8d74c7 -s ours
...
am: 51bcb058ad
2016-09-20 00:13:07 +00:00
Kevin Hufnagle
706a62fe58
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
...
am: c60146d808
2016-09-20 00:12:52 +00:00
Sudheer Shanka
af97c8805f
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf am: 3fca892d3e -s ours
...
am: 1d053b3be8
2016-09-20 00:12:50 +00:00
Kevin Hufnagle
f75816f3bd
docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide
...
am: 49ed3eb8bc
2016-09-20 00:12:18 +00:00
Sudheer Shanka
1781d2bd3b
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49 am: 94da8023d5
...
am: 426ba52b42
2016-09-20 00:11:54 +00:00
Kevin Hufnagle
d00481bef2
docs: Fixed constants in manifest sample related to battery level.
...
Bug: 31064851
Change-Id: Ia4b07172984773dc8a0cac8fbe85e412f3381886
2016-09-19 16:53:52 -07:00
Sudheer Shanka
6b77a4ee55
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb am: 271aa24036 -s ours
...
am: e44f8fcca4
2016-09-19 23:25:14 +00:00
Sudheer Shanka
1d053b3be8
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79 am: a4c9bbefdf
...
am: 3fca892d3e
2016-09-19 23:24:48 +00:00
Sudheer Shanka
6f170618ff
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6
...
am: f4844b3416
2016-09-19 23:23:01 +00:00
Sudheer Shanka
ac143d2dfd
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours am: bab9c1006a
...
am: e85152c2fc
2016-09-19 23:22:39 +00:00
Sudheer Shanka
018d1e7e1e
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0
...
am: 96d70301e6
2016-09-19 23:22:33 +00:00
Etan Cohen
82842e8223
Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990
...
am: c074f1bb7f
2016-09-19 23:06:44 +00:00
Sudheer Shanka
e44f8fcca4
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5 am: 5c53e1b8bb
...
am: 271aa24036
2016-09-19 23:04:23 +00:00
Sudheer Shanka
51bcb058ad
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1 am: c1b2e6db98 -s ours
...
am: ff9a8d74c7
2016-09-19 23:02:54 +00:00
Sudheer Shanka
426ba52b42
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-mr1-dev am: 900550de49
...
am: 94da8023d5
2016-09-19 22:45:40 +00:00
Kevin Hufnagle
c60146d808
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev
2016-09-19 22:40:18 +00:00
Mary Yanchar
acb3eb39da
Small change for new sample test code
...
Making a very small change to mention the example instrumented tests,
since the new code now matches the setup described in this tutorial.
Bug: 28932254
Change-Id: I1bcaa858a1e51609f0ab2863e2738f7aed96c01a
2016-09-19 22:38:15 +00:00
Sudheer Shanka
271aa24036
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: e8340a9ed5
...
am: 5c53e1b8bb
2016-09-19 22:35:55 +00:00
Etan Cohen
c074f1bb7f
Merge "[NAN] Update API: replace looper with handler"
...
am: 0027ddf990
2016-09-19 22:28:57 +00:00
Etan Cohen
3855370c24
[NAN] Rename to make discovery explicit
...
Pure rename operation - no other functional changes.
(cherry-pick of commit ddb5f646562f31d7e78778a978e546f85312b009)
Bug: 31470256
Test: unit tests, integrated (sl4a) tests.
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a
2016-09-19 21:52:14 +00:00
Sudheer Shanka
ff9a8d74c7
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb am: a437e7f3f1
...
am: c1b2e6db98
2016-09-19 21:50:49 +00:00
Sudheer Shanka
3fca892d3e
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into klp-dev am: d1e3e53d79
...
am: a4c9bbefdf
2016-09-19 21:50:47 +00:00
Sudheer Shanka
e8e30122e8
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into lmp-dev am: b358ee3558 -s ours
...
am: 43a1f74d7f
2016-09-19 21:49:26 +00:00
Christopher Wiley
ce5d913387
Allow WiFi components to manage interface up state
...
Setting the WiFi network interface up or down is racy because it
is not synchronized with the WiFi components managing the interface.
This causes a problem for hostapd when the interface is marked down
before hostapd starts because it causes the driver to enter the
de-initialization process. hostapd does not know how to react to this
change of events.
Bug: 31205821
Test: bug no longer reproduces on upcoming devices, unit tests pass
Change-Id: I96938e2aef89b400593d42ce1b0a6ccc2d2e5754
2016-09-19 14:12:38 -07:00
Andreas Huber
74c3b8edfe
Removed legacy code used to read/write java arrays from HwBinder parcels.
...
More generalized functionality is now available through HwBlob.
Change-Id: Id6c713fb01af7593ea3ff8405f3a9e5325877412
Bug: 31438033
Test: run updated "hidl_test" and "hidl_test_java"
2016-09-19 14:09:14 -07:00
Sudheer Shanka
f4844b3416
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b
...
am: 2f44f906a6
2016-09-19 21:03:16 +00:00
Sudheer Shanka
c1b2e6db98
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb
...
am: a437e7f3f1
2016-09-19 21:02:53 +00:00
Sudheer Shanka
e85152c2fc
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: 2d608378f4 -s ours
...
am: bab9c1006a
2016-09-19 20:58:08 +00:00
