Commit Graph

4656 Commits

Author SHA1 Message Date
Raph Levien
2ec19e2c2d Update lint check to accommodate new emoji sequences am: 0790ac68bc
am: b1581dbbfd

Change-Id: I17b2989e1ee0477991705d15e0324a449da69c1a
2016-08-23 14:53:06 +00:00
Raph Levien
0790ac68bc Update lint check to accommodate new emoji sequences
These are not yet ready for updating in the unicode data, so we patch
them in code until they are.

Bug: 30594617
Change-Id: Ib4c8568aa4840341474eb0c0c95674d640473f4d
(cherry picked from commit 2b8b819fee)
2016-08-22 16:26:24 +00:00
Roozbeh Pournader
f238f6a186 Re-enable disabled emoji tests [DO NOT MERGE] am: 8cd1b1ba80
am: 1062853800

Change-Id: Ie4c1a28f0a37af3fbbce3a8611c1ab5eec79d556
2016-08-19 22:48:15 +00:00
Roozbeh Pournader
f24170aae4 Check defaults for Android default-emoji characters [DO NOT MERGE] am: 84b1746130
am: 21e026bb7e

Change-Id: Ia77312e78e70bd17147d0ef841b6ea551a12ae82
2016-08-19 22:46:54 +00:00
Roozbeh Pournader
1062853800 Re-enable disabled emoji tests [DO NOT MERGE]
am: 8cd1b1ba80

Change-Id: I0cc4e1b30d8df95efea682d0b2ae4dc96822689b
2016-08-19 22:27:50 +00:00
Roozbeh Pournader
21e026bb7e Check defaults for Android default-emoji characters [DO NOT MERGE]
am: 84b1746130

Change-Id: Icadd25ab3dc99a2ce00220900a6b37cf0144d7d4
2016-08-19 22:26:11 +00:00
Roozbeh Pournader
eab8a12845 Merge "Re-enable disabled emoji tests [DO NOT MERGE]" into nyc-mr1-dev 2016-08-19 21:43:06 +00:00
Roozbeh Pournader
01bb406426 Merge "Check defaults for Android default-emoji characters [DO NOT MERGE]" into nyc-mr1-dev 2016-08-19 21:43:06 +00:00
Adam Lesinski
05e31f1837 AAPT: Handle gaps in resources when building splits am: 26ae640c34
am: 2c8aa38e7a

Change-Id: I475c971fabb2b4bf5acb4f0e9a86d95d79a650ed
2016-08-17 21:56:34 +00:00
Adam Lesinski
26ae640c34 AAPT: Handle gaps in resources when building splits
Due to public ID assignment, gaps in resource type and entry
IDs can occur. This can lead to null pointer dereferencing
if not careful. This happened in ResourceTable::getDensityVaryingResources()
which is called when building Splits.

Bug:30879690
Change-Id: I588e4dcd2e042fccfcb2e87967b5cbd0d23b4497
(cherry picked from commit 081d1b4cf6)
2016-08-17 19:53:01 +00:00
Chih-Hung Hsieh
bd070b7792 Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3 am: 9c0b881c9d
am: 1ab51f3769

Change-Id: Ide274953e85d1ba9e0e978a531d69c3543e7923a
2016-08-16 02:39:40 +00:00
Chih-Hung Hsieh
1ab51f3769 Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3
am: 9c0b881c9d

Change-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c
2016-08-16 02:31:42 +00:00
Chih-Hung Hsieh
9c0b881c9d Merge "Fix google-explicit-constructor warnings."
am: ea537bf5b3

Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4
2016-08-16 02:23:48 +00:00
Treehugger Robot
ea537bf5b3 Merge "Fix google-explicit-constructor warnings." 2016-08-16 02:12:39 +00:00
Adam Lesinski
9e8da4a476 AAPT: Fix use-after-free error am: 193ed74c2d
am: 646f2d9c33

Change-Id: If9fe7a52e62ae6b2900aa187996b4b785894ab03
2016-08-15 23:22:04 +00:00
Chih-Hung Hsieh
21c0f29597 Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
2016-08-15 14:45:02 -07:00
Adam Lesinski
193ed74c2d AAPT: Fix use-after-free error
Re-order deletion of ResXMLTree and the Asset object
it iterates over.

Bug:30844391
Change-Id: Ied033d0a8f93343006228a2054c6d0f42bb4717a
2016-08-15 14:22:36 -07:00
Chih-Hung Hsieh
84717d4118 resolve merge conflicts of 17bd236 to stage-aosp-master am: b3d46b44a3
am: c76aa69207

Change-Id: I6bb066d131dde297612c5dcbf5051f4964e62a8b
2016-08-12 19:35:08 +00:00
Chih-Hung Hsieh
c76aa69207 resolve merge conflicts of 17bd236 to stage-aosp-master
am: b3d46b44a3

Change-Id: I5123493e165c4d2ab74cf045e5fb8181886dce62
2016-08-12 19:30:02 +00:00
Chih-Hung Hsieh
b3d46b44a3 resolve merge conflicts of 17bd236 to stage-aosp-master
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
2016-08-12 11:44:16 -07:00
Chih-Hung Hsieh
56996ff61e resolve merge conflicts of 76ce8e5 to stage-aosp-master am: ed935c32f4
am: ef57a0d629

Change-Id: Ifcc24ad835f2e74a25954bf3fd7090c75abdc084
2016-08-12 00:40:25 +00:00
Chih-Hung Hsieh
ef57a0d629 resolve merge conflicts of 76ce8e5 to stage-aosp-master
am: ed935c32f4

Change-Id: Ibb7415686469d7b15e8dbe0cd04226c4e0cd7d76
2016-08-12 00:31:29 +00:00
Chih-Hung Hsieh
ed935c32f4 resolve merge conflicts of 76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242 Merge "Fix clang-tidy warnings in libs/hwui." 2016-08-11 23:20:47 +00:00
Chih-Hung Hsieh
8bd37ba458 Fix clang-tidy warnings in aapt and aapt2.
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
2016-08-11 15:20:10 -07:00
Hans Boehm
53511e1196 Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340 am: c97c9dbd96
am: a33407d2f8

Change-Id: If98f629f0675a01e0c9f12eb0cd1b48f497357ce
2016-08-11 17:39:16 +00:00
Hans Boehm
a33407d2f8 Merge "Do not stack allocate RefBase object in AaptAssets::filter" am: d0197ac340
am: c97c9dbd96

Change-Id: I9ceb9f35c22e84a57e2c38f9e6fd562827ae7e0d
2016-08-11 17:32:34 +00:00
Hans Boehm
c97c9dbd96 Merge "Do not stack allocate RefBase object in AaptAssets::filter"
am: d0197ac340

Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
2016-08-11 17:28:07 +00:00
Hans Boehm
25dfa75ee3 Do not stack allocate RefBase object in AaptAssets::filter
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.

Bug: 30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
2016-08-10 19:56:50 -07:00
Chih-Hung Hsieh
f35c939cd7 Fix clang-tidy warnings in libs/hwui.
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1

Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
2016-08-10 23:26:59 +00:00
Adam Lesinski
84877752ee AAPT: Fix feature split generation of ID resources am: 4d219da3c4
am: e69f9ca938

Change-Id: I2021dbffcd9e6fb8bca79c181d2bf8e8524ee5d2
2016-08-04 02:00:28 +00:00
Adam Lesinski
e69f9ca938 AAPT: Fix feature split generation of ID resources
am: 4d219da3c4

Change-Id: I0cc7e1174020e4bd813b4442e2c35fdc2f9513fd
2016-08-04 01:46:43 +00:00
TreeHugger Robot
59a91c04cc Merge "AAPT: Fix feature split generation of ID resources" into nyc-mr1-dev 2016-08-04 01:27:34 +00:00
Adam Lesinski
4d219da3c4 AAPT: Fix feature split generation of ID resources
ID resources that get generated on demand with the
notation @+id/name were previously not given the
appropriate type ID offset when being built as feature
splits.

This change declares an ID type ahead of time so that
the type ID offset is applied before IDs can be generated.

Bug:30607637
Change-Id: I122a9133cb01b35e9892103ec52fc228dc65bf1a
2016-08-03 16:54:15 -07:00
Adam Lesinski
12e5b87771 AAPT: faketouch feature implied if no touchscreen feature requested. am: ca955a4c3a
am: 76cbcd495e

Change-Id: I29700574c70f35695ccbdd60c570bb222e1aa0eb
2016-08-02 02:01:37 +00:00
Adam Lesinski
ca955a4c3a AAPT: faketouch feature implied if no touchscreen feature requested.
This changes the default implied feature of 'android.hardware.touchscreen'
to 'android.hardware.faketouch' if no 'android.hardware.touchscreen'
feature is requested, required or otherwise.

Bug:30571641
Change-Id: I1e41242d4b1dc549cf69741d2a309baf476d084e
2016-08-01 17:20:28 -07:00
Dan Willemsen
77508b9c19 Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite am: 2005edf642
am: 4ee22dd083

Change-Id: I5a9006361b3ded4eaf03b1362a0dfa2aa36fdb2e
2016-08-01 23:46:15 +00:00
Dan Willemsen
4ee22dd083 Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
am: 2005edf642

Change-Id: I48dfa98a54a8680d091cbc403feb30bba35f2efd
2016-08-01 23:39:34 +00:00
Dan Willemsen
2005edf642 Rename libprotobuf-cpp-lite_static to libprotobuf-cpp-lite
Use the same name for the static and shared libraries so that the module
definitions can be shared.

Change-Id: I1578ee7044689194ae1baea4d71f1b0e8737505f
2016-07-31 22:48:28 -07:00
Roozbeh Pournader
84b1746130 Check defaults for Android default-emoji characters [DO NOT MERGE]
There are 12 characters that Android is defaulting to emoji,
differing from UTR #51 recommendation. This tests for their proper
support.

Bug: 30379358
Change-Id: Icd570510090ef29b3b7a3520bc368c5f77f99fa4
(cherry picked from commit 10ea8f7431)
2016-07-27 18:10:38 +00:00
Roozbeh Pournader
8cd1b1ba80 Re-enable disabled emoji tests [DO NOT MERGE]
Since I2e508ced90515409ff6882b3c98d8911094b9b86 updates the emoji
data to version 4.0 beta, we can now re-enable the disabled emoji
tests.

Also fix some style issues, update data file parsing method to handle
the new emoji format, add UN to unsupported flags, and do a little
refactoring.

Bug: 30379358
Bug: 26187231
Change-Id: I441fdfed68381d08e5e0b3af91e94bfae742eef6
2016-07-26 18:32:57 -07:00
Chong Zhang
b76adc5117 Clean up surfaces when app is resumed without being stopped.
am: 45e6d2dc8b

Change-Id: I9ae5c2a9c6a93246338221252cf943db6763e1c4
2016-07-22 17:17:26 +00:00
Chong Zhang
45e6d2dc8b Clean up surfaces when app is resumed without being stopped.
When quickly toggling between two apps, app could be resumed while
it's stopping but not yet stopped. Upon resuming, it could have
surfaces that's marked mDestroying and waiting for the stopped
to be destroyed.

We need to dispose these surfaces properly. If the window is already
removed, we destroy them. Otherwise, clear mDestroying flag so that
the window is ready to be used again. Leaving mDestroying=true makes
the window ineligible for certain things such as receiving wallpaper.

bug: 30255354
Change-Id: Id881653550595ab8e702d6950949bf202ac5a0d9
2016-07-21 10:17:39 -07:00
Adam Lesinski
28250b6009 Merge \"AAPT: Don\'t keep processing files that failed to be added\" into nyc-mr1-dev
am: d94f55552f

Change-Id: I9f91b3b8a66a2bd0d1fc27ddcdea2f72f0a54b58
2016-07-19 01:41:14 +00:00
Adam Lesinski
526d73be4a AAPT: Don't keep processing files that failed to be added
AAPT will continue ahead without reporting an error if a file
failed to be added to the ResourceTable. This would cause crashes
later when the file was assumed to be present.

Bug:30200166
Change-Id: Ieb2daf97ccf0345153b6f4598d130a38d108c937
2016-07-18 17:07:41 -07:00
Doug Felt
a77343f873 Merge \"Patch out part of the emoji tests.\" into nyc-mr1-dev
am: 2f39bc777c

Change-Id: I90c3528cf6d85929114af94feb0ef2f36954ca9f
2016-07-14 22:30:09 +00:00
Sergio Giro
6feeeabd20 Add bound checks to utf16_to_utf8
am: 1deedbacc3

Change-Id: I05847ae2c26a266b3c05324230062757e6978fd2
2016-07-14 18:07:33 +00:00
Sergio Giro
1deedbacc3 Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug: 29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit 4781057e78)
2016-07-14 13:27:53 +00:00
Doug Felt
4970cdac7e Patch out part of the emoji tests.
This is temporary, until we have proper attribution for additional
emoji data.

Bug: 29939737
Change-Id: I5b97c8e055fa2ccf44b13bf801f681b860d47286
(cherry picked from commit f874a1949a)
2016-07-13 18:44:45 +00:00
Zak Cohen
ee2f46485e Merge \"Adds a screenshot wallpaper method to WallpaperManagerService.\" into nyc-mr1-dev
am: b4d4ce31ab

Change-Id: I4737e4d758335240614d2d2b51c11b8c739160fc
2016-07-13 10:22:02 +00:00