Shuzhen Wang
df255a4a6b
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
...
am: 5f7cdba8ab
Change-Id: Ic55969e029228542f79e870cb7b5c68602b9a084
2018-01-31 21:28:00 +00:00
TreeHugger Robot
5f7cdba8ab
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
2018-01-31 21:11:32 +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
Hyunyoung Song
69d240d584
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
...
am: 48df033607
Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465
2018-01-12 05:31:38 +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
800e061359
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e docs: Revised descriptions of binding and connecting to services.
...
am: d195a9972b
Change-Id: I7a59a3b8c18492961aea7f480276a401ab8bb6ae
2018-01-09 23:44:04 +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
4a8d9b628f
Proper autofill fix to let phone process autofill Settings activity.
...
am: 2f58b03ea1
Change-Id: Ia167badcdb5fee60a62c9cf0932150b54180ba0b
2017-12-14 01:49:36 +00: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
Felipe Leme
d62d68785e
Merge "Make sure apps cannot forge package name on AssistStructure used for Autofill." into oc-dev
...
am: bd355dbf58
Change-Id: I922cbe5c9b1e71569e09241564faf537fb923604
2017-12-08 18:39:01 +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
3ba37e1f53
Merge "Docs: Renamed ParcelFileDescritor to ParcelFileDescriptor Test: make ds-docs Bug: 1766768" into oc-dev
...
am: ce7f1e6601
Change-Id: If7798db1aea1f1d6cdb42a7d25509c814a31f6ca
2017-12-01 16:14:15 +00:00
Jon Dormody
728ca235b5
Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev
...
am: fb839ce59a
Change-Id: Ic135f510c6e5ff8a9a00f2d2be1fcc0c284dd5cf
2017-12-01 16:07:27 +00: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
719e8b5412
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
...
am: ec741b83a3
Change-Id: I9d170c0baf186d074c77d2a98bd60bee66bfd701
2017-11-10 17:14:04 +00: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
13e959bbec
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
...
am: 459735662f
Change-Id: I31f036fa2365084454ac7899d92580e985bd9f21
2017-11-09 16:17:35 +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
2edd31e7fc
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
...
am: 560fb5d050
Change-Id: I088a828022a70b0d2ac1b88c4fab3801528eb4f8
2017-11-08 00:15:23 +00: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
Change-Id: I48d611e91318a8f85f12fcff5fc00de8b1f834c9
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
Change-Id: Ibf435bc90e013af2a7c72f1988ac0f78485f2c23
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
Change-Id: I49d0744049b593ea47ede3ad9e128a5344196811
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
Change-Id: Iee679fb3a115f6c1a2683905e5b392ec665aee33
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
Change-Id: I43fbad45f90ec2d1fb48fecbd2d73a05f39730a9
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
Change-Id: Ie3d378e8d9aeaff6f45838ebe988a5799f6acf3b
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
Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
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
Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
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
Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
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
Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
2017-11-07 20:51:02 +00:00
Adam Vartanian
6a9c7c4814
Adjust Uri host parsing to use last instead of first @.
...
am: cd6228dd37
Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
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
f247977cbe
Merge "DO NOT MERGE Disable smart sharing for password fields." into oc-dev
...
am: 66ca42d5ac
Change-Id: I0e57e666f790c94ddf04d304a633c835a99d3d69
2017-10-31 03:10:06 +00:00
Christine Franks
cf74d28888
Support native and srgb for night display
...
Bug: 68159303
Test: make -j100
Merged-In: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
Change-Id: Iea4b38bd8c9037f50b7ffa6e3c4f12b0e536a8ce
2017-10-26 13:22:46 -07: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
f0278f30da
Merge "Only construct real Throwable objects." into oc-dev
...
am: 0868533760
Change-Id: I260dc1d1c903f1c1c2828d68049f9f202daa0869
2017-09-28 00:15:18 +00: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
91fb9b2a16
Merge "docs: updated link on RemoteInput page" into oc-dev
...
am: 6087b990df
Change-Id: Idc629243c3794565cdfebe7bd737a78d97010295
2017-09-15 00:42: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
d1412d3d60
Docs: Updating ANDROID_ID information to reflect Android O changes. Bug: 38270718
...
am: 4b3a4b58ed
Change-Id: I2925d1d3bf70cebfb8d830a28a977208138d91af
2017-09-13 23:42:48 +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
Felipe Leme
33d476c170
Merge "Javadoc: Added alternative to Package verification." into oc-dev
...
am: 092349600d
Change-Id: Ic765df95fc660fb0df8a0f027d739ea999a36702
2017-09-08 21:41:36 +00:00
TreeHugger Robot
092349600d
Merge "Javadoc: Added alternative to Package verification." into oc-dev
2017-09-08 21:28:02 +00:00