Sudheer Shanka
b7fb715a80
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
2016-09-20 03:26:43 +00:00
Sudheer Shanka
2cc87e32c2
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
2016-09-20 03:26:27 +00:00
Sudheer Shanka
be9002a86d
Merge "Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf" into nyc-mr1-dev
...
am: 8402a17417
2016-09-20 03:20:20 +00:00
Sudheer Shanka
911f86e817
Fix deadlock in AcitivityManagerService. am: 67e05b4d28 am: 44c9e2f4bf
...
am: b4ecfb9df1
2016-09-20 03:20:17 +00:00
Sudheer Shanka
29e4cd66d7
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
2016-09-20 03:19:49 +00:00
Sudheer Shanka
1f9646c7ca
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:19:01 +00:00
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
TreeHugger Robot
b1dd85c081
Merge "Eliminating the “black hole” effect with location/drop events." into nyc-mr1-dev
2016-09-20 02:52:24 +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
Amith Yamasani
d7b86496c6
Merge "Fix reporting of network connectivity when parole changes" into nyc-mr1-dev am: 4bbca649fc
...
am: 2e70f62f0a
2016-09-20 02:41:41 +00:00
Amith Yamasani
620d47560b
Fix reporting of network connectivity when parole changes am: 0938f2fa98
...
am: 94a3a21bf7
2016-09-20 02:26:01 +00:00
Amith Yamasani
2e70f62f0a
Merge "Fix reporting of network connectivity when parole changes" into nyc-mr1-dev
...
am: 4bbca649fc
2016-09-20 02:23:37 +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
dad9b673c1
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
2016-09-20 02:21:48 +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
1c44b6dce7
Merge "DO NOT MERGE: Fix deadlock in AcitivityManagerService." into mnc-dev am: 38077274d0 am: 96d70301e6 am: 018d1e7e1e am: fc2bef0139 -s ours am: 011172a731
...
am: 543828d06f
2016-09-20 02:00:07 +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
bac21c0a99
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e
...
am: 1701a25584
2016-09-20 01:44:57 +00:00
Winson
ab216609f1
Removing private system ui flags from status bar flags logic.
...
- Prevent third party apps from inadvertently changing internal SystemUI
flags through a call to setSystemUiVisibility(). These flags are only
set in the individual SystemUI components and can be updated in WMS
directly.
Bug: 29875297
Change-Id: I5ea238c8fb16a0eccd6e993d95a912acb359cee6
2016-09-19 18:39:25 -07: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
Kevin Hufnagle
5505296760
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am: c60146d808
...
am: 6b4e509c25
2016-09-20 01:37:57 +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
songjinshi
49921f2c05
[AssetManager]:Fix thread race caused double free issue.
...
The SharedZip's Asset is not thread-safety,the getResourceTableAsset()
and setResourceTableAsset(Asset* asset) function of the SharedZip is
not sync with a same lock.
Consider the following sequence of events:
Thread A calls setResourceTableAsset(Asset* asset),it will set
mResourceTableAsset = asset; then to calls getBuffer() of the asset.
Thread B calls getResourceTableAsset(),which return mResourceTableAsset,
then to calls getBuffer() of the mResourceTableAsset,the asset and
mResourceTableAsset is same one object.
Thread A to delete mZipInflater in getBuffer().
Thread B to delete mZipInflater in getBuffer().
It will cause crash becuase double delete mZipInflater in getBuffer().
https://code.google.com/p/android/issues/detail?id=211941
Change-Id: I5a7d67fdf64c4aa03f505b37a2fa840f4443d158
Signed-off-by: songjinshi <songjinshi@xiaomi.com >
2016-09-20 01:31:19 +00:00
Android Build Merger (Role)
dbcacf1313
Merge "Merge "docs: Fixed language directory issue localization" into nyc-dev am: 52fd8f88e1 am: 357b9d9816 am: 3652ae7d6d am: 849d4b2464" into nyc-mr1-dev-plus-aosp
2016-09-20 01:19:16 +00:00
Eric Schmidt
8d43c79119
Merge "docs: Fixed language directory issue localization" into nyc-dev am: 52fd8f88e1 am: 357b9d9816 am: 3652ae7d6d
...
am: 849d4b2464
2016-09-20 01:18:39 +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
1d014e9a5c
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours am: 7f99a18e0e
...
am: f2bb102df4
2016-09-20 01:16:42 +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
647cd7545b
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:07:14 +00:00
Wei Liu
4d2d2609cd
Merge "Make VrManager service optional." into cw-f-dev
...
am: 728ebf1ad8
2016-09-20 01:01:27 +00:00
Wei Liu
82d5fc17b5
Make VrManager service optional.
...
am: ef89d21a1b
2016-09-20 01:01:18 +00:00
Sudheer Shanka
1701a25584
DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: b59e73613b am: 2f44f906a6 am: f4844b3416 am: 6f170618ff -s ours
...
am: 7f99a18e0e
2016-09-20 00:59:58 +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
Kevin Hufnagle
d727144813
Merge "docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide" into nyc-dev am: c60146d808
...
am: 706a62fe58
2016-09-20 00:48:54 +00:00
Kevin Hufnagle
68aebb5b60
docs: Added descriptions of "Pricing Template ID" column to in-app products CSV guide am: 49ed3eb8bc
...
am: f75816f3bd
2016-09-20 00:42:07 +00:00
Etan Cohen
1173c27fdf
Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 am: c074f1bb7f
...
am: 82842e8223
2016-09-20 00:34:30 +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
TreeHugger Robot
0b85c6ee78
Merge "Allow dismissing ImmersiveModeCling without touch" into nyc-mr1-dev
2016-09-20 00:23:43 +00:00
TreeHugger Robot
99fcdd96da
Merge "OtaDexopt: Fix after-ota space measure" into nyc-mr1-dev
2016-09-20 00:22:42 +00:00
Amith Yamasani
94a3a21bf7
Fix reporting of network connectivity when parole changes
...
am: 0938f2fa98
2016-09-20 00:14:04 +00:00
Android Build Merger (Role)
ec86e6249d
Merge "Merge "Null check action cloning." into nyc-mr1-dev am: d0f20c2bbd am: f1476d9189" into nyc-mr1-dev-plus-aosp
2016-09-20 00:13:35 +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
