Fyodor Kupolov
4921986db7
Use concrete CREATOR instance for parceling lists
...
Replaced readTypedArrayList/writeTypedArrayList with
writeTypedList/createTypedArrayList(CREATOR)
Bug: 71508348
Test: CtsAutoFillServiceTestCases pass
Merged-In: I2a8321023b40cc74b7026eb0fb32a9cc5f5543a9
Change-Id: Id17d02e40a4ae567bf2d74d2ea8ba4d8a943bdb7
2018-03-16 23:37:13 +00:00
Marco Nelissen
338438b389
Rework thumbnail cleanup -- DO NOT MERGE
...
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
2018-03-10 04:13:09 +00:00
Adam Vartanian
36c202ed80
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev
...
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e797668ae137fddbf1b6b2d3c0db66b9373cfa75c0bdff04aba37341805cac885a2ecf9654f1b302ab6b1b3c9bdcfa3afbd0e797668ae137fddbf1b6b2d3c0db66b9373cfa75c0bdff04aba37341805cac885a2ecf9654f1b302abfa3afbd0e797668ae137fddbf1b6b2d3c0db66b9373cfa75c0bdff04aba37341805cac885a2ecf96fa3afbd0e797668ae137fddbf1b6b2d3c0db66b9373cfa75c0bdff04aba37341805cacfa3afbd0e797668ae137fddbf1b6b2d3c0db66b9373cfa75c0bdff04aba3fa3afbd0e797668ae137fddbf1b6b2d3c0db66b9373cfa75c0fa3afbd0e797668ae137fddbf1b6b2d3c0db66b9fa3afbd0e797668ae137fddbf1b6b2fa3afbd0e797668ae137fa3afbd0e7
2018-02-01 10:02:42 +00:00
TreeHugger Robot
5f7cdba8ab
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
2018-01-31 21:11:32 +00:00
Android Build Merger (Role)
4f46378ab7
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96 am: 54f1b302ab am: 6b1b3c9bdc
...
Change-Id: Iceaaaec271c590da862e65002396222aab9219e8
2018-01-31 11:21:07 +00:00
Android Build Merger (Role)
6b1b3c9bdc
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96 am: 54f1b302ab
...
Change-Id: I09260b353e45dac4c59b920b0166d40b3eb810aa
2018-01-31 11:21:02 +00:00
Android Build Merger (Role)
54f1b302ab
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac am: 885a2ecf96
...
Change-Id: Ie23e4a58c906b1afe4e47e915251d44c628c9a72
2018-01-31 11:20:55 +00:00
Android Build Merger (Role)
885a2ecf96
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3 am: 7341805cac
...
Change-Id: Ib4cb67450dcb8e35693030d77e2ec815d23275d1
2018-01-31 11:20:48 +00:00
Android Build Merger (Role)
7341805cac
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0 am: bdff04aba3
...
Change-Id: Ieddabe1b12f34bd7632ce893ef4e0c298f5c44df
2018-01-31 11:20:41 +00:00
Android Build Merger (Role)
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9 am: 373cfa75c0
...
Change-Id: Ia7b1157fb7f2066e26dc82ec703f39cd9fa69fd7
2018-01-31 11:20:28 +00:00
Android Build Merger (Role)
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
...
Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9
2018-01-31 11:20:21 +00:00
Android Build Merger (Role)
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
...
Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e
2018-01-31 11:20:15 +00:00
Android Build Merger (Role)
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
...
Change-Id: Ic336b5fafebabdd4a5ad4d775a96d76739189a09
2018-01-31 11:20:08 +00:00
Android Build Merger (Role)
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
...
Change-Id: I20336a5786e753e6941b9a784068480475415110
2018-01-31 11:19:56 +00:00
Adam Vartanian
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
...
The WHATWG URL parsing algorithm [1] used by browsers says that for
"special" URL schemes (which is basically all commonly-used
hierarchical schemes, including http, https, ftp, and file), the host
portion ends if a \ character is seen, whereas this class previously
continued to consider characters part of the hostname. This meant
that a malicious URL could be seen as having a "safe" host when viewed
by an app but navigate to a different host when passed to a browser.
[1] https://url.spec.whatwg.org/#host-state
Bug: 71360761
Test: vogar frameworks/base/core/tests/coretests/src/android/net/UriTest.java (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Id53f7054d1be8d59bbcc7e219159e59a2425106e
2018-01-31 11:14:45 +00:00
Sunny Goyal
cee125012a
RESTRICT AUTOMERGE Preventing recursive referrence in drawables
...
Bug: 68706673
Bug: 66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
(cherry picked from commit I8034f49d16f9a7bc1749714fd6d6231bba5088d0)
Merged-In: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
2018-01-16 23:41:21 +00:00
TreeHugger Robot
48df033607
Merge "Wrap StackOverflowError in NotFoundException. Bug: 67462465 Bug: 66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit dc92d925d8)" into oc-dev
2018-01-12 05:23:45 +00:00
Kevin Hufnagle
d195a9972b
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
...
docs: Revised descriptions of binding and connecting to services.
Clarified that Context.bindService() returning true only indicates
that the system has found a service to bind to the client and that
ServiceConnection.onServiceConnected() might not be called if the
service encounters an error, such as crashing during startup.
Test: make ds-docs
Bug: 63118511
Change-Id: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
2018-01-09 12:25:22 -08:00
Shuzhen Wang
4304a02ac9
OutputConfiguration: Fix missing mIsShared in parcel read
...
Test: Camera CTS
Bug: 69683251
Merged-In: I7ea4aa8ed4baa5a5e7d25a0073361d827ba86c13
Change-Id: I7ea4aa8ed4baa5a5e7d25a0073361d827ba86c13
2017-12-19 21:23:45 -08:00
Felipe Leme
2f58b03ea1
Proper autofill fix to let phone process autofill Settings activity.
...
Test: adb shell am start com.android.settings/.RadioInfo
Bug: 69981710
Fixes: 70506888
Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d
Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d
2017-12-12 19:35:40 +00:00
TreeHugger Robot
bd355dbf58
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
2017-12-08 18:16:24 +00:00
Felipe Leme
9ad2900630
Make sure apps cannot forge package name on AssistStructure used for Autofill.
...
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug: 69981710
Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f
Merged-In: Id6036cddb51dd8dd0c9128b7212d573f630d693f
2017-12-06 16:54:32 -08:00
Jon Dormody
ce7f1e6601
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev
2017-12-01 15:53:36 +00:00
Jon Dormody
fb839ce59a
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
2017-12-01 15:52:54 +00:00
Jonathan Dormody
1c7c4b2f14
Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor
...
Test: make ds-docs
Bug: 1766768
Change-Id: Idfea122569bb6f80889be3f224f9629cfebc0ca3
2017-11-30 22:25:42 +00:00
Jonathan Dormody
1bca5db0cb
Docs: Added mention that the getSharedPreferences method is thread
...
safe.
Test: make ds-docs
Bug: 5370116
Change-Id: I5aa851db5e1dbcb3563f1ce15f96cc10c80e90ba
2017-11-16 11:25:20 -07:00
Jon Dormody
ec741b83a3
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
2017-11-10 16:58:17 +00:00
Jonathan Dormody
35719399cb
Docs: Fixed a typo by changing "retu rn" to "return"
...
Test: make ds-docs
Bug: 32830129
Change-Id: I86b359c2cf65fbd3c9d50569bf81fd669111055e
2017-11-09 16:57:42 -07:00
Hyunyoung Song
aff04c35ae
Wrap StackOverflowError in NotFoundException.
...
Bug: 67462465
Bug: 66498711
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
(cherry picked from commit dc92d925d8
2017-11-09 20:18:43 +00:00
Jon Dormody
459735662f
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
2017-11-09 16:05:13 +00:00
Jonathan Dormody
f72e8263c7
Docs: Added a link to Updating Your Security Provider to Protect Against
...
SSL Exploits
Test: make ds-docs
Bug: 19110275
Change-Id: I3b0a35715c16c4e30a47aab9cbaf991770426c57
2017-11-08 17:13:58 -07:00
Adam Vartanian
560fb5d050
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc am: eb4598afba
...
am: a2149abe3a
2017-11-07 23:50:35 +00:00
Adam Vartanian
a2149abe3a
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333 am: 49dfdd66cc
...
am: eb4598afba
2017-11-07 23:30:44 +00:00
Adam Vartanian
eb4598afba
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21 am: f61daaa333
...
am: 49dfdd66cc
2017-11-07 23:04:25 +00:00
Adam Vartanian
49dfdd66cc
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c am: 3ac5dabc21
...
am: f61daaa333
2017-11-07 22:41:48 +00:00
Adam Vartanian
f61daaa333
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362 am: 240b55de2c
...
am: 3ac5dabc21
2017-11-07 22:12:09 +00:00
Adam Vartanian
3ac5dabc21
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e am: 49e5fca362
...
am: 240b55de2c
2017-11-07 21:56:10 +00:00
Adam Vartanian
240b55de2c
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3 am: eee677386e
...
am: 49e5fca362
2017-11-07 21:41:55 +00:00
Adam Vartanian
49e5fca362
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814 am: 4158c9fbf3
...
am: eee677386e
2017-11-07 21:29:27 +00:00
Adam Vartanian
eee677386e
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37 am: 6a9c7c4814
...
am: 4158c9fbf3
2017-11-07 21:02:07 +00:00
Adam Vartanian
4158c9fbf3
Adjust Uri host parsing to use last instead of first @. am: cd6228dd37
...
am: 6a9c7c4814
2017-11-07 20:51:02 +00:00
Adam Vartanian
6a9c7c4814
Adjust Uri host parsing to use last instead of first @.
...
am: cd6228dd37
2017-11-07 20:41:28 +00:00
Adam Vartanian
cd6228dd37
Adjust Uri host parsing to use last instead of first @.
...
Malformed authority segments can currently cause the parser to produce
a hostname that doesn't match the hostname produced by the WHATWG URL
parsing algorithm* used by browsers, which means that a URL could be seen
as having a "safe" host when checked by an Android app but actually visit
a different host when passed to a browser. The WHATWG URL parsing
algorithm always produces a hostname based on the last @ in the authority
segment, so we do the same.
* https://url.spec.whatwg.org/#authority-state resets the "buffer", which
is being used to build up the host name, each time an @ is found, so it
has the effect of using the content between the final @ and the end
of the authority section as the hostname.
Bug: 68341964
Test: vogar android.net.UriTest (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376
2017-11-07 15:51:53 +00:00
Abodunrinwa Toki
30fa5fb536
DO NOT MERGE Disable smart sharing for password fields.
...
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Bug: 66244132
Merged-In: Ifbf2c39d9f304251adc8c4acdf1b4fd6914011d8
Change-Id: If7d6f0240db22720fb8316cdac85eceee8003b35
2017-10-25 17:29:09 +01:00
Jeff Sharkey
8e151bf899
Only construct real Throwable objects.
...
Without this test, someone could trick us into constructing other
shady classes.
Test: builds, boots
Bug: 65281159
Change-Id: If678d0681708d1b0dcf056aa1133830ad3dbce31
2017-09-20 23:39:20 +00:00
Kevin Hufnagle
6087b990df
Merge "docs: updated link on RemoteInput page" into oc-dev
2017-09-15 00:12:41 +00:00
Dave Friedman
4b3a4b58ed
Docs: Updating ANDROID_ID information to reflect Android O changes.
...
Bug: 38270718
Test: Verified on local build.
Change-Id: If4f86d261ae950cc14579aeba65c36a289cdf56c
2017-09-13 08:47:46 -07:00
TreeHugger Robot
092349600d
Merge "Javadoc: Added alternative to Package verification." into oc-dev
2017-09-08 21:28:02 +00:00
Sujith Ramakrishnan
c07c23b1f7
Merge "Make ASSIST launch VIS and add a keycode for TV (ALL_APPS)" into oc-dev
2017-09-07 00:09:21 +00:00
Felipe Leme
87f03be771
Javadoc: Added alternative to Package verification.
...
Bug: 64125551
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML
Change-Id: I371cd1752ab92e19461fe3bf3d034c7bc83ca2dd
2017-09-05 10:56:07 -07:00
