OSDN Git Service
Philip P. Moltmann [Wed, 5 Oct 2016 15:41:36 +0000 (15:41 +0000)]
Merge "When selected printer can't print show error"
Robin Lee [Wed, 5 Oct 2016 14:59:28 +0000 (14:59 +0000)]
Merge "Redact work notifications separately from personal"
TreeHugger Robot [Wed, 5 Oct 2016 05:59:54 +0000 (05:59 +0000)]
Merge "Added trace on Data Saver-related methods."
Etan Cohen [Wed, 5 Oct 2016 05:30:07 +0000 (05:30 +0000)]
[NAN] Expose NAN characteristics as an API [DO NOT MERGE]
am:
3a9de10963 -s ours
Change-Id: If5e39c15a6f954c4157e572a00e8429ba1893a15
TreeHugger Robot [Wed, 5 Oct 2016 03:54:24 +0000 (03:54 +0000)]
Merge "SysUI Plugin ClassLoader work"
TreeHugger Robot [Wed, 5 Oct 2016 03:48:17 +0000 (03:48 +0000)]
Merge "AAPT2: Ensure PNG endianness in 9-patch serialization"
Etan Cohen [Wed, 5 Oct 2016 01:42:19 +0000 (01:42 +0000)]
[NAN] Use NAN capability information to validate configurations [DO NOT MERGE]
am:
65eaa6d821 -s ours
Change-Id: Ib264ec851e1746c99293e8c687f8e9020a02d242
Adam Lesinski [Wed, 5 Oct 2016 01:16:11 +0000 (01:16 +0000)]
Merge "AssetManager: Remove more methods, fix comments"
Adam Lesinski [Wed, 5 Oct 2016 00:33:04 +0000 (17:33 -0700)]
AAPT2: Ensure PNG endianness in 9-patch serialization
9-patch serialization requires PNG endianness
Bug:
31942900
Test: manual + added serialization test to libaapt2_tests
Change-Id: Iea521718f88e80d3fa7a8723a47584973738748a
Fan Zhang [Wed, 5 Oct 2016 00:08:34 +0000 (00:08 +0000)]
Merge "Do not clear category tile cache in every reload."
Fyodor Kupolov [Tue, 4 Oct 2016 23:23:34 +0000 (23:23 +0000)]
Merge "Tests for AccountsDb"
Fan Zhang [Tue, 4 Oct 2016 22:12:58 +0000 (15:12 -0700)]
Do not clear category tile cache in every reload.
Bug:
31781480
Test: manual
The cache is useful when setting summary text on tiles. If tile cache is
cleared and rebuilt, summaryloader won't find existing tile to update
summary.
The cache should only be cleared when entire resource config changes,
tracked by InterestingConfigChnages.
Change-Id: I3afcaba30b835f59ffaad9c27564f0345af00d66
Andrii Kulian [Tue, 4 Oct 2016 21:01:37 +0000 (21:01 +0000)]
Merge "Make WindowState use config from WindowContainer"
Adam Lesinski [Tue, 4 Oct 2016 20:31:31 +0000 (13:31 -0700)]
AssetManager: Remove more methods, fix comments
Remove a few vendor-related methods and fix comments
to no longer reference legacy concepts like vendor.
Change-Id: I61dbe53b6b305d8fb3468423462f5de2925b78bd
Test: dead-code removal, if builds, it works
Nate Fischer [Tue, 4 Oct 2016 20:31:37 +0000 (20:31 +0000)]
Merge "Add APIs to get WebViewClient and WebChromeClient"
Adam Lesinski [Tue, 4 Oct 2016 20:07:04 +0000 (20:07 +0000)]
Merge "Remove unused methods from AssetManager.cpp"
Fyodor Kupolov [Tue, 4 Oct 2016 19:09:05 +0000 (12:09 -0700)]
Tests for AccountsDb
Test: AccountsDbTest pass
Bug:
30639520
Change-Id: I410c19cbb5f6056179297ce57a7e286d04268304
Bill Yi [Tue, 4 Oct 2016 19:11:15 +0000 (19:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
8217bdab27 -s ours
am:
5df3738aed -s ours
Change-Id: Ib890caeb5fc5739313ba1e1e3d60165ad331c7b1
Bill Yi [Tue, 4 Oct 2016 19:10:26 +0000 (19:10 +0000)]
Import translations. DO NOT MERGE am:
f39d5807a6 -s ours
am:
67e8b7b5f0 -s ours
Change-Id: I79aa151841c51b43a7e8950fe97951b50366044d
Bill Yi [Tue, 4 Oct 2016 19:09:41 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fc65231a36 -s ours
am:
eb82f86f97 -s ours
Change-Id: Iabe27e06da90e5829f3fbb6d73932e47a60475e6
Bill Yi [Tue, 4 Oct 2016 19:08:51 +0000 (19:08 +0000)]
Import translations. DO NOT MERGE am:
0e03f95cda -s ours
am:
c923fb9dbd -s ours
Change-Id: I2ae91b57d136baabccc28d012f761fbf76a8c905
Jordan Liu [Tue, 4 Oct 2016 19:07:55 +0000 (19:07 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig" am:
25b64aad01 am:
2b7118fcbf am:
c44e7f3f76
am:
5ffaae6efe -s ours
Change-Id: Ic06f90ff7616abc7eb4e2b3a09de582c3a7eef3b
Evgenii Stepanov [Tue, 4 Oct 2016 19:00:17 +0000 (19:00 +0000)]
Merge "Fix stack-buffer-overflow detected by AddressSanitizer."
Bill Yi [Tue, 4 Oct 2016 18:50:19 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 4 Oct 2016 18:48:01 +0000 (18:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
8217bdab27 -s ours
Change-Id: I937e72cca24e443f08da117a01a91ca7e41a5ca2
Bill Yi [Tue, 4 Oct 2016 18:47:57 +0000 (18:47 +0000)]
Import translations. DO NOT MERGE
am:
f39d5807a6 -s ours
Change-Id: I676421cbace88ed9c62dc0b9cb3efa5f43bbd538
Bill Yi [Tue, 4 Oct 2016 18:46:23 +0000 (18:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 4 Oct 2016 18:45:56 +0000 (18:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 4 Oct 2016 18:45:34 +0000 (18:45 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 4 Oct 2016 18:45:18 +0000 (18:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Jordan Liu [Tue, 4 Oct 2016 18:41:29 +0000 (18:41 +0000)]
Merge "Remove config in frameworks/base" am:
529f8d7209 am:
32e1d7f6b4 am:
1c4c9c7690
am:
7a99ecfa17 -s ours
Change-Id: I963ac23ece588b2dfcc7d6096098339b8695a660
Bill Yi [Tue, 4 Oct 2016 18:38:32 +0000 (18:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fc65231a36 -s ours
Change-Id: Ifbc89fe764b8b4f3531d0b4d838bcb7e689e86d4
Bill Yi [Tue, 4 Oct 2016 18:38:26 +0000 (18:38 +0000)]
Import translations. DO NOT MERGE
am:
0e03f95cda -s ours
Change-Id: I614a053a441b850174dfad7d404b97859c64fc89
Bill Yi [Tue, 4 Oct 2016 18:35:09 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Jordan Liu [Tue, 4 Oct 2016 18:30:19 +0000 (18:30 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig" am:
25b64aad01 am:
2b7118fcbf
am:
c44e7f3f76
Change-Id: I208e7871029efc1ca331fac3b240d337d00d3189
Jordan Liu [Tue, 4 Oct 2016 18:29:30 +0000 (18:29 +0000)]
Merge "Remove config in frameworks/base" am:
529f8d7209 am:
32e1d7f6b4
am:
1c4c9c7690
Change-Id: I0c1436660146bcebc573671b4fbc0f95df25b4ab
Jordan Liu [Tue, 4 Oct 2016 18:23:25 +0000 (18:23 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig" am:
25b64aad01
am:
2b7118fcbf
Change-Id: I4ca39a58ed1d35eae4a0b8802c027cd0c4c271ee
Jordan Liu [Tue, 4 Oct 2016 18:22:27 +0000 (18:22 +0000)]
Merge "Remove config in frameworks/base" am:
529f8d7209
am:
32e1d7f6b4
Change-Id: I3016d18369640dfc7336106b2272f737113b133a
Jordan Liu [Tue, 4 Oct 2016 18:17:25 +0000 (18:17 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig"
am:
25b64aad01
Change-Id: If3ac600a1dbb0dc0aba65af49d271b333b7e6368
Jordan Liu [Tue, 4 Oct 2016 18:16:30 +0000 (18:16 +0000)]
Merge "Remove config in frameworks/base"
am:
529f8d7209
Change-Id: I20e8eef28b656fd60da84da00b9d9d566d3b340b
Nate Fischer [Fri, 30 Sep 2016 01:30:58 +0000 (18:30 -0700)]
Add APIs to get WebViewClient and WebChromeClient
Add getWebViewClient and getWebChromeClient to WebView and WebViewProvider.
These APIs both return null if the client is not yet set.
Change-Id: I22044713a43ab09a9a5a63138247bfecb60f2522
Test: N/A
Bug:
31843416
Jordan Liu [Tue, 4 Oct 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Add editable_voicemail_number key to CarrierConfig"
Jordan Liu [Tue, 4 Oct 2016 18:07:01 +0000 (18:07 +0000)]
Merge "Remove config in frameworks/base"
Derek Sollenberger [Tue, 4 Oct 2016 17:22:44 +0000 (17:22 +0000)]
Merge "Move Layer creation/deletion into the RenderPipeline."
Hangyu Kuang [Tue, 4 Oct 2016 17:10:20 +0000 (17:10 +0000)]
Merge "media: Unhide mpeg2ts format for streaming output format support."
Andrii Kulian [Fri, 30 Sep 2016 05:28:09 +0000 (22:28 -0700)]
Make WindowState use config from WindowContainer
Previously WindowState updated its config only when it was either
requested to relayout the window or to report resize to client.
This CL makes WindowState to use WindowContainer's configuration
handling model. Configuration can be updated any time by parent
window container or any other caller. Also we're saving last
reported to client config to be able to check if there is something
new since last report.
Test: Manual and existing tests still pass.
Change-Id: I832acdb950871b85b7c16becde16d58de392faf5
John Reck [Tue, 4 Oct 2016 15:58:46 +0000 (15:58 +0000)]
Merge "Drop fastjni from nSupportsOpenGL"
John Reck [Tue, 4 Oct 2016 15:58:02 +0000 (15:58 +0000)]
Merge "SystemClock JNI update"
John Reck [Tue, 4 Oct 2016 15:57:37 +0000 (15:57 +0000)]
Merge "DisplayEventReceiver -> @FastNative"
John Reck [Tue, 4 Oct 2016 15:57:31 +0000 (15:57 +0000)]
Merge "Trace @FastNative"
John Reck [Tue, 4 Oct 2016 15:56:18 +0000 (15:56 +0000)]
Merge "Update MotionEvent JNI"
Jorim Jaggi [Tue, 4 Oct 2016 11:56:28 +0000 (13:56 +0200)]
Remove some unused classes in policy
Test: Whether it still compiles.
Change-Id: I1489200f97db80d39d08dfd627bde366684ec215
Jakub Adamek [Tue, 4 Oct 2016 10:18:33 +0000 (10:18 +0000)]
Adding customizable background colour support. am:
eedebc4850
am:
278a3472dc
Change-Id: I8726e6f635b6204c8e019255255b2eb172cbda9d
Jakub Adamek [Tue, 4 Oct 2016 10:14:30 +0000 (10:14 +0000)]
Adding customizable background colour support.
am:
eedebc4850
Change-Id: I0accdfc75b295bed8e8779d85bb8c48f47595cee
Bill Yi [Tue, 4 Oct 2016 04:46:56 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I089b330598aea510c31a1bfa3da6b49cf27010db
Auto-generated-cl: translation import
Seigo Nonaka [Tue, 4 Oct 2016 02:50:36 +0000 (02:50 +0000)]
Merge "Introduce Typeface.createXX performance tests."
Bill Yi [Tue, 4 Oct 2016 02:07:07 +0000 (19:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6bcb6376c4399a9afcb232748f93f0c38fc3050a
Auto-generated-cl: translation import
Fan Zhang [Tue, 4 Oct 2016 01:41:01 +0000 (01:41 +0000)]
Merge "Refresh dashboard category data when package changes."
Bill Yi [Tue, 4 Oct 2016 01:33:35 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I47e511a867d00c2f40499a79961eb7dc6ba3cc45
Auto-generated-cl: translation import
Bill Yi [Tue, 4 Oct 2016 01:13:39 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I878549c41adbddb91d0daf9d21980ca9f3f45f61
Auto-generated-cl: translation import
Etan Cohen [Mon, 3 Oct 2016 22:14:51 +0000 (15:14 -0700)]
[NAN] Expose NAN characteristics as an API [DO NOT MERGE]
Expose NAN characteristics as an API.
Bug:
31912101
Test: build and validate API updates
Change-Id: Ie48af247383c9f0af8fd7a01c5f75544dc6c07bb
Etan Cohen [Mon, 3 Oct 2016 20:40:09 +0000 (13:40 -0700)]
[NAN] Use NAN capability information to validate configurations [DO NOT MERGE]
Validate publish and subscribe configurations and message length using
the NAN configuration retrieved from the firmware.
Bug:
31912101
Test: unit tests
Change-Id: I06e09a0a4459eadb700a688a8bbb5b63f4f85616
Wale Ogunwale [Mon, 3 Oct 2016 23:36:05 +0000 (23:36 +0000)]
Merge "Fixed flicker on activity transition in docked stack."
Wale Ogunwale [Mon, 3 Oct 2016 23:34:31 +0000 (23:34 +0000)]
Merge "Fix window animation flash issue" am:
1a02a26838 am:
bb5f6db56a am:
63993f20a4
am:
b3ec06630c
Change-Id: I4ce2edb5ad4154676adf58f13447ffd19159d67e
Adam Lesinski [Mon, 3 Oct 2016 23:26:28 +0000 (16:26 -0700)]
Remove unused methods from AssetManager.cpp
A lot of the vendor/locale specific code existed pre-1.0
and was reworked into the current system.
Test: refactoring CL, all code except setLocale() was not being executed.
Test: setLocale() change tested manually
Change-Id: Ifb098f9808763a6cf5fb4336e089430adc09e198
Wale Ogunwale [Mon, 3 Oct 2016 23:29:46 +0000 (23:29 +0000)]
Merge "Fix window animation flash issue" am:
1a02a26838 am:
bb5f6db56a
am:
63993f20a4
Change-Id: I4b9d03bd48c6fb4a676c8ef3746fd757eb1f3943
Wale Ogunwale [Mon, 3 Oct 2016 23:24:56 +0000 (23:24 +0000)]
Merge "Fix window animation flash issue" am:
1a02a26838
am:
bb5f6db56a
Change-Id: Iea47c85999a4584ba878761710a175d925d0809a
John Reck [Mon, 3 Oct 2016 23:21:30 +0000 (16:21 -0700)]
DisplayEventReceiver -> @FastNative
Test: make && boot
Change-Id: Id75648a2398a13c5af24eabc217bdef778618872
Wale Ogunwale [Mon, 3 Oct 2016 23:20:52 +0000 (23:20 +0000)]
Merge "Fix window animation flash issue"
am:
1a02a26838
Change-Id: Ib68ce77146e653b95cec215e4a80aaa0fb106ad2
Wale Ogunwale [Mon, 3 Oct 2016 23:14:34 +0000 (23:14 +0000)]
Merge "Fix window animation flash issue"
John Reck [Mon, 3 Oct 2016 21:55:00 +0000 (14:55 -0700)]
SystemClock JNI update
Switch to @CriticalNative
Test: make & boot
Change-Id: I5ead83f5c201bf9bb50a39b5c6dcd8b6ac6b5ba5
John Reck [Mon, 3 Oct 2016 22:51:08 +0000 (15:51 -0700)]
Drop fastjni from nSupportsOpenGL
This is run once per process at static-init time
it doesn't need to be fast-jni
Test: make & boot
Change-Id: Id5948fd447b352f5047af3ed94d41e9743030f48
John Reck [Mon, 3 Oct 2016 22:47:18 +0000 (15:47 -0700)]
Update MotionEvent JNI
Switch to @CriticalNative & @FastNative
Test: make & boot
Change-Id: I8962663348b354d30995b397619ee101e405e57c
Fan Zhang [Mon, 3 Oct 2016 22:05:53 +0000 (15:05 -0700)]
Refresh dashboard category data when package changes.
Category needs to refresh when package information changes. So
CategoryUpdateTask should not early exit by just checking config
changes.
This is needed to refresh UI when user enables activity such as
developement options.
Also made CategoryManager thread safe because it's called in both UI
thread and asynctasks
Bug:
31781480
Test: manual
Change-Id: Idcdcd39f727aba423350f3874af5612474e24e28
Evgenii Stepanov [Mon, 3 Oct 2016 21:44:35 +0000 (14:44 -0700)]
Fix stack-buffer-overflow detected by AddressSanitizer.
Bug:
31855186
Test: boot SANITIZE_TARGET=address build
Change-Id: I5c2c64564ccea28e416d66b27af9d86506d622ce
John Reck [Mon, 3 Oct 2016 21:38:06 +0000 (14:38 -0700)]
Trace @FastNative
Test: make & boot
Change-Id: Ibd0160bd98639961b07f430b3fdf210a5796234b
Bill Yi [Mon, 3 Oct 2016 21:27:54 +0000 (14:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I552e5efd2d7f2fd0324fc4d4693ee80847c43173
Auto-generated-cl: translation import
Bert McMeen [Mon, 3 Oct 2016 21:27:35 +0000 (21:27 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am:
70c6411a10 am:
e617192fff
am:
3264436d18
Change-Id: Ic0b0fb016924e61f6361160f620105c66be36d82
Wale Ogunwale [Mon, 3 Oct 2016 14:53:55 +0000 (07:53 -0700)]
Fixed flicker on activity transition in docked stack.
- If the app token isn't hidden then it is considered visible
and there is no need to check its children windows to see if
they are visible. The WindowState.isVisible() might say it isn't
visible due to hiddenRequested even though it is visible on-screen
since the app token isn't hidden.
- Comment out check for hiddenRequested flag when determining if a
window state is visible. The window can still be visible on screen
when the flag is true. We would like the isVisible() method to
return an answer closer to if the window is truly visible
(can't be an exact answer without checking the surface state), so
comment out the check for now so we can test to see what problem it
causes.
If it doesn't cause any issues, then we can remove just before we lock
down the current release (O) and also consolidate this method with
If it does cause problems, then we can look if there are other ways
to solve the problems. If there isn't then we uncomment and document why.
Bug:
31630397
Test: Manual testing and existing tests pass.
Change-Id: I230cf0ef5cf1012fb90d93857dd5feb2a330493b
Adam Lesinski [Mon, 3 Oct 2016 21:22:24 +0000 (21:22 +0000)]
Merge "AAPT2: Refactor PngCrunching"
Bert McMeen [Mon, 3 Oct 2016 21:22:07 +0000 (21:22 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am:
70c6411a10
am:
e617192fff
Change-Id: I08f517647976426a357a18e8f8ff44c52f1730ac
Bill Yi [Mon, 3 Oct 2016 21:19:58 +0000 (14:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0526005174bb93a8e6ea419f47ba8f22e48890cf
Auto-generated-cl: translation import
Bert McMeen [Mon, 3 Oct 2016 21:15:44 +0000 (21:15 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet
am:
70c6411a10
Change-Id: Ia167f04b40f1edf2cf4b95d2e1b56b3efa6b8a75
Sudheer Shanka [Mon, 3 Oct 2016 21:09:09 +0000 (21:09 +0000)]
Merge "Fix flaky test."
Bert McMeen [Mon, 3 Oct 2016 20:32:54 +0000 (13:32 -0700)]
Docs: Wear preview 3 - tweaks to gradle snippet
Bug:
31910705
Change-Id: Ia58ac7bec8e748a797c6213bbd31a05f876e2424
Jordan Liu [Mon, 3 Oct 2016 20:47:30 +0000 (20:47 +0000)]
Merge "Remove old configs for default_vm_number"
Colin Cross [Mon, 3 Oct 2016 20:35:12 +0000 (20:35 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8f1011d584 am:
6d0b466935 am:
95311818f0
am:
e9b5b70114
Change-Id: I80205377a19c45927a11fc14ab72c13a7479570b
Colin Cross [Mon, 3 Oct 2016 20:32:01 +0000 (20:32 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8f1011d584 am:
6d0b466935
am:
95311818f0
Change-Id: I45b57d37d08699afc070699d07485cb83c51850a
Adam Lesinski [Mon, 3 Oct 2016 20:31:15 +0000 (20:31 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue." am:
126e022095 am:
f48d0b8f19 am:
73b91c63ad
am:
224ffd3cb2
Change-Id: Id06724e9d44464d1599743741d73b5bd9c282ff2
Derek Sollenberger [Wed, 28 Sep 2016 17:39:55 +0000 (13:39 -0400)]
Move Layer creation/deletion into the RenderPipeline.
Test: refactoring. existing tests still pass.
Change-Id: I032c33896a0cb74c91e2a913a584373518466b88
Colin Cross [Mon, 3 Oct 2016 20:27:46 +0000 (20:27 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
8f1011d584
am:
6d0b466935
Change-Id: I9602684e0ac91f7c08dafe70309433bb233ceeaf
Adam Lesinski [Mon, 3 Oct 2016 20:26:41 +0000 (20:26 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue." am:
126e022095 am:
f48d0b8f19
am:
73b91c63ad
Change-Id: I27f5cc6106f0a8f0a58721e1e8ed836144347b6a
Colin Cross [Mon, 3 Oct 2016 20:23:40 +0000 (20:23 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
am:
8f1011d584
Change-Id: I259197408884f11e61f61e5241ee0012de28b54f
Adam Lesinski [Mon, 3 Oct 2016 20:21:46 +0000 (20:21 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue." am:
126e022095
am:
f48d0b8f19
Change-Id: Ia7da9ff37d813729a8c916a3b6e378110045aa17
Adam Lesinski [Mon, 3 Oct 2016 20:18:52 +0000 (20:18 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."
am:
126e022095
Change-Id: I9928064b4811579bd50d4eeaff98bd4200b8bc7b
Colin Cross [Mon, 3 Oct 2016 20:16:16 +0000 (20:16 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions"
Adam Lesinski [Mon, 3 Oct 2016 20:07:37 +0000 (20:07 +0000)]
Merge "[AssetManager]:Fix thread race caused double free issue."
TreeHugger Robot [Mon, 3 Oct 2016 20:03:36 +0000 (20:03 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 3 Oct 2016 18:34:50 +0000 (18:34 +0000)]
Merge "Paint conversion to @FastNative/@CriticalNative"
Sudheer Shanka [Mon, 3 Oct 2016 18:30:03 +0000 (11:30 -0700)]
Fix flaky test.
Change-Id: I657ed11acc0173768cebd293faad84ade1047668
Fixes:
31906795
Test: adb shell am instrument -e class com.android.server.retaildemo.RetailDemoModeServiceTest -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner