Bert McMeen
19404c6f93
Docs: Wear preview 3 - tweaks to gradle snippet
...
am: 70c6411a10
2016-10-03 21:15:42 +00:00
Chris Tate
ee28c8c22c
Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev
2016-10-03 21:06:22 +00:00
Bert McMeen
70c6411a10
Docs: Wear preview 3 - tweaks to gradle snippet
...
Bug: 31910705
Change-Id: Ia58ac7bec8e748a797c6213bbd31a05f876e2424
2016-10-03 13:50:14 -07:00
Colin Cross
e9b5b70114
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935
...
am: 95311818f0
2016-10-03 20:32:01 +00:00
Phil Weaver
8051c9222e
Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev
2016-10-03 20:31:23 +00:00
Colin Cross
95311818f0
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584
...
am: 6d0b466935
2016-10-03 20:27:46 +00:00
Adam Lesinski
224ffd3cb2
Merge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095 am: f48d0b8f19
...
am: 73b91c63ad
2016-10-03 20:26:41 +00:00
Colin Cross
6d0b466935
Merge "Fix struct vs. class mismatch in forward definitions"
...
am: 8f1011d584
2016-10-03 20:23:40 +00:00
Dianne Hackborn
c26c98cd4a
Merge "Fix issue #31403654 : Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev
2016-10-03 20:21:51 +00:00
Adam Lesinski
73b91c63ad
Merge "[AssetManager]:Fix thread race caused double free issue." am: 126e022095
...
am: f48d0b8f19
2016-10-03 20:21:46 +00:00
Adam Lesinski
f48d0b8f19
Merge "[AssetManager]:Fix thread race caused double free issue."
...
am: 126e022095
2016-10-03 20:18:52 +00:00
Colin Cross
8f1011d584
Merge "Fix struct vs. class mismatch in forward definitions"
2016-10-03 20:16:17 +00:00
songjinshi
5754b41c20
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
Bug:31734545
Change-Id: I5a7d67fdf64c4aa03f505b37a2fa840f4443d158
Signed-off-by: songjinshi <songjinshi@xiaomi.com >
2016-10-03 20:13:12 +00:00
Adam Lesinski
126e022095
Merge "[AssetManager]:Fix thread race caused double free issue."
2016-10-03 20:07:37 +00:00
TreeHugger Robot
bf79852ae4
Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev
2016-10-03 18:49:40 +00:00
Igor Murashkin
4f66cb3f53
app_process: Forward -cp/-classpath to ART.
...
* No new functionality was added, this was already possible via
-Djava.class.path=classpath
* However, this makes it a bit more compatible with other tools
that use -cp to invoke the main class.
* Also update the benchmarks README for correct up-to-date vogar
instructions.
Test: vogar --mode app_process --benchmark frameworks/base/core/tests/benchmarks/src/android/os/ParcelBenchmark.java
Bug: 31807538
Change-Id: Idb04600fed3dd955437ccac832617dcfd1b52b63
2016-10-03 11:08:42 -07:00
Jakub Adamek
eedebc4850
Adding customizable background colour support.
...
Also changes how sub-styles are created: copies the modified properties
like e.g. fullscreen from Material. Previously most sub-styles
inherited from their material counterparts and updated just some colors.
The new approach should be more stable wrt changes in device default
theme. It would need updating when Material is updated but these kind
of properties does not look like it would be updated often.
Bug: 31459804
Change-Id: I78862bf33ca3dac586ad0a25f17bf8c0008a1dd0
2016-10-03 18:45:01 +01:00
Adarsh Fernando
b2361007e9
Docs: Redirect for Android Studio IR Flight Recorder am: 1face37061
...
am: 164c750f8d
2016-10-03 16:02:19 +00:00
Adarsh Fernando
bce10d350d
Docs: Redirect for Android Studio IR Flight Recorder am: 1face37061
...
am: 5fe735fe2c
2016-10-03 15:57:55 +00:00
Adarsh Fernando
164c750f8d
Docs: Redirect for Android Studio IR Flight Recorder
...
am: 1face37061
2016-10-03 15:53:57 +00:00
Adarsh Fernando
5fe735fe2c
Docs: Redirect for Android Studio IR Flight Recorder
...
am: 1face37061
2016-10-03 15:53:55 +00:00
Tobias Thierer
041bb95132
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f am: abc432fd09
...
am: 19e46f91fa
2016-10-03 14:05:33 +00:00
Tobias Thierer
19e46f91fa
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)" am: 01614e4e7f
...
am: abc432fd09
2016-10-03 13:57:22 +00:00
Tobias Thierer
abc432fd09
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
...
am: 01614e4e7f
2016-10-03 13:50:39 +00:00
Tobias Thierer
01614e4e7f
Merge "API changes for Locale to OpenJDK8u60 (part 1/2)"
2016-10-03 13:41:48 +00:00
Jorim Jaggi
dadafd4109
Reload state when user unlocks
...
Test: Unlock freshly booted non-FBE device, make sure the transition
is fast as well as the icons have the correct state
Change-Id: I6427427d16edeceb0f410be0b88de601a3dffdb4
Fixes: 31203310
2016-10-03 05:56:47 -07:00
Jakub Adamek
e60842aba3
Change name of overlay subdir property to sku.
...
am: c03d9483f0
2016-10-03 10:30:14 +00:00
Jakub Adamek
c03d9483f0
Change name of overlay subdir property to sku.
...
Also move the SKU subdirectories directly under /vendor/overlay.
Bug: 31692079
Change-Id: I68c712b13918cc99629534580ee4f77d9e5b3823
2016-10-03 10:14:12 +01:00
Adarsh Fernando
1face37061
Docs: Redirect for Android Studio IR Flight Recorder
...
Bug:31631770
Change-Id: Id3c4b8d141242521bef6364af2bbd47b950258c2
2016-10-01 12:23:49 -07:00
Qiushi Han
32fed96632
Fix window animation flash issue
...
The original logic cuts down the mShownPosition, causing 1 pixel offset,
sometimes this will cause flash.
To fix this, Use Math.round() instead.
google issue:
https://code.google.com/p/android/issues/detail?id=224185
Change-Id: I8a2fe55a2df6eaa9eda4ba78966a74ea492ab8ea
2016-10-01 17:32:28 +08:00
Bill Yi
d9c364a654
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: c350547dcf
2016-10-01 09:02:40 +00:00
Bill Yi
949c4b8db8
Import translations. DO NOT MERGE
...
am: 69fa3bcb6c
2016-10-01 09:02:26 +00:00
Bill Yi
32414cd240
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 4408ea334a
2016-10-01 09:00:44 +00:00
Bill Yi
315c1338a9
Import translations. DO NOT MERGE
...
am: 28f02b2e72
2016-10-01 09:00:37 +00:00
TreeHugger Robot
b8e046a8a2
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-01 08:55:17 +00:00
TreeHugger Robot
c350547dcf
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-01 08:54:49 +00:00
TreeHugger Robot
4408ea334a
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-01 08:54:15 +00:00
TreeHugger Robot
a381e699e0
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-01 08:51:46 +00:00
TreeHugger Robot
8990b8c29c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-01 08:51:07 +00:00
Bill Yi
d2671e488d
Import translations. DO NOT MERGE
...
Change-Id: Ie8517dd138d533fdfc983725187ffe9f10b4dc2c
Auto-generated-cl: translation import
2016-10-01 00:19:43 -07:00
Bill Yi
453f915f94
Import translations. DO NOT MERGE
...
Change-Id: I8dfdc1a55bbaa0b8f2104959871f9f9f342cdc99
Auto-generated-cl: translation import
2016-10-01 00:06:44 -07:00
Colin Cross
08f5f1f03a
Fix struct vs. class mismatch in forward definitions
...
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug: 31752268
Test: m -j
Change-Id: Ib7227295e7b94c79cdc52e19c71be4066a11cedc
2016-09-30 21:07:26 -07:00
Bill Yi
28f02b2e72
Import translations. DO NOT MERGE
...
Change-Id: I6958c00c5473a46a9dcfeb60b6ce5f8159d11f1d
Auto-generated-cl: translation import
2016-09-30 19:00:29 -07:00
Hemal Patel
d7ef4228e2
Merge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3
...
am: 14557acbfc
2016-10-01 01:55:48 +00:00
Hemal Patel
622e4e3d42
Merge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3
...
am: f9fd4c01f3
2016-10-01 01:54:54 +00:00
Hemal Patel
63b5e3ddd1
Docs: Fixed the Service link am: 1918214589
...
am: eb21088b67
2016-10-01 01:54:45 +00:00
Hemal Patel
417e4e4609
Docs: Fixed the Service link am: 1918214589
...
am: e361f735d4
2016-10-01 01:53:53 +00:00
Bill Yi
69fa3bcb6c
Import translations. DO NOT MERGE
...
Change-Id: Ia7e6389c2b54eb7e81af07a6d96a815f1cbbc8bd
Auto-generated-cl: translation import
2016-09-30 18:52:22 -07:00
Hemal Patel
f9fd4c01f3
Merge "Docs: Fixed the Service link" into nyc-dev
...
am: b4be5089f3
2016-10-01 01:46:05 +00:00
Hemal Patel
14557acbfc
Merge "Docs: Fixed the Service link" into nyc-dev
...
am: b4be5089f3
2016-10-01 01:46:01 +00:00
