Hansong Zhang
24da173b63
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name
...
Test: manual
Bug: 73173182
Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f
2018-04-26 21:26:27 +00:00
akirilov
c36db6d473
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-mr1-dev)
...
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
cts-tradefed run cts -m CtsAccessibilityServiceTestCases
cts-tradefed run cts -m CtsAccessibilityTestCases
Bug: 69981755
Change-Id: If3752e106aa7fdee4645dc9852289af471ceff18
Merged-In: I13304efbee10d1affa087e9c8bc4ec237643283e
2018-04-09 21:00:16 +00:00
Fyodor Kupolov
3f13ccee8c
Use concrete CREATOR instance for parceling lists am: 4921986db7
...
am: 609bc2d63e
2018-04-02 22:59:23 +00:00
Fyodor Kupolov
609bc2d63e
Use concrete CREATOR instance for parceling lists
...
am: 4921986db7
2018-04-02 22:46:26 +00:00
Joshua Baxter
651ffd426c
Merge "docs: fixed a couple of typos" into oc-mr1-dev
2018-03-28 21:54:29 +00:00
Joshua Baxter
9a841a6519
docs: fixed a couple of typos
...
Test: make ds-docs
Bug: 36948822
Bug: 36946883
Change-Id: I4de699dc7d5a69e456b0656de890f76b9787aafa
2018-03-27 21:44:55 +00:00
Joshua Baxter
eb5d2d96ad
docs: fixed typo
...
Test: make ds-docs
Bug: 36944055
Change-Id: I52c6d6404340ada5a18b99fd37a2f1d75af00677
2018-03-27 10:28:05 -07:00
Joshua Baxter
3639e2f929
docs: fixed typo
...
Test: make ds-docs
Bug: 36941741
Change-Id: I451d8095bcc5d30dbefe3503441d718a69d821ca
2018-03-26 18:17:08 -07:00
Todd Kopriva
5b0a4eea8d
Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev
2018-03-23 21:48:55 +00:00
kopriva
60b06bd217
docs: fixing typo in reference document
...
Test: make ds-docs
Bug: 36998786
Change-Id: I7b0f5623eec608436eacd5d27d63a3f6b41cc419
2018-03-20 20:42:59 -07:00
kopriva
6a7f167f67
docs: fixing bug 36982027 and 30636712, typos
...
Test: make ds-docs
Bug: 36982027
Bug: 30636712
Change-Id: I70d6d216c714a31b7e762a203a27f6124642131e
2018-03-20 17:59:48 -07:00
kopriva
4dddc63ee7
docs: fixing typo, bug 36909553
...
Test: make ds-docs
Bug: 36909553
Change-Id: I6e6842fe555690d97b954c370b777b25c6f5e54e
2018-03-19 14:25:30 -07:00
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
dfd8732488
Rework thumbnail cleanup -- DO NOT MERGE
...
am: 338438b389
2018-03-12 20:18:40 +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
Marco Nelissen
6d2096f388
Rework thumbnail cleanup
...
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
2018-03-08 21:46:15 +00:00
Scott Main
bda0cc9c3c
Fix javadoc typo causing broken links
...
Change-Id: I988e06100562c574bbda1bb530359da289062d65
bug: 74262753
2018-03-07 01:39:29 +00:00
Adam Vartanian
f64dcd5bb5
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev am: 36c202ed80
...
am: cf31e066a9
2018-02-02 03:46:04 +00:00
Adam Vartanian
cf31e066a9
Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into oc-dev
...
am: 36c202ed80
2018-02-01 23:44:18 +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
Shuzhen Wang
152acb5162
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev am: 5f7cdba8ab
...
am: df255a4a6b
2018-01-31 21:49:57 +00:00
Shuzhen Wang
df255a4a6b
Merge "OutputConfiguration: Fix missing mIsShared in parcel read" into oc-dev
...
am: 5f7cdba8ab
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
Jakub Pawlowski
5332988c62
Fix bad type for txPower in PeriodicAdvertisingReport serialization
...
Bug: 69634768
Test: compilation
Change-Id: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
Merged-In: Icedfbaf1ba933637e935ada0fd98aea42c73f2b2
2018-01-31 18:45:05 +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
Jon Dormody
0704571547
Merge "Docs: Changed "the value of an item that previously added with putExtra()" to "the value of an item previously added with putExtra(),"" into oc-mr1-dev
2018-01-29 21:04:50 +00:00
Jon Dormody
7b3c924114
Merge "Docs: Inserting a line to include the documentation for keyPreviewHeight." into oc-mr1-dev
2018-01-29 19:23:32 +00:00
Jon Dormody
04d261f309
Merge "Docs: Added a link to the Motion Sensor docs for information on gravity values and calculating alpha. Test: make ds-docs Bug: 6442659" into oc-mr1-dev
2018-01-29 19:23:15 +00:00
Ricardo Loo Foronda
f8f6d0a8ec
Docs: Removed rogue "(TODO)" note in FLAG_SHOW_LIGHTS member
...
Status: Ready for review
Note: This is a Javadoc only change.
Changes: Removed unnecessary "(TODO)" note.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/app/Notification.html#FLAG_SHOW_LIGHTS
Bug: 20150478
Change-Id: I3a7fc0414ccb6f52e9b4919031a93ca1a7a29336
2018-01-29 04:21:10 +00:00
Ricardo Loo Foronda
16a77c54ef
Merge "Docs: Fixed broken link to Traceview docs" into oc-mr1-dev
2018-01-29 04:04:09 +00:00
Jonathan Dormody
69151702b4
Docs: Added a link to the Motion Sensor docs for information on gravity
...
values and calculating alpha.
Test: make ds-docs
Bug: 6442659
Change-Id: Ifbb58526d01894c4c7570596348a8bd3e5c9eb4f
2018-01-26 15:21:23 -07:00
Jonathan Dormody
d07017e7a7
Docs: Changed "the value of an item that previously added with
...
putExtra()" to "the value of an item previously added with putExtra(),"
Test: make ds-docs
Bug: 1429953
Change-Id: Ided080aea7686e7a711376fa380c41027b71b1d3
2018-01-26 21:56:39 +00:00
Ricardo Loo Foronda
ac750a8a60
Docs: Fixed broken link to Traceview docs
...
Status: Ready for review.
Note: This is a Javadoc only change.
Changes:
* Replaced "guide/developing/tools/traceview.html/ with
"studio/profile/traceview.html"
Test: * Build with "make ds-docs -j16"
* Staged content at go/dac-stage/reference/android/os/Debug.html
* Ran linkchecker against staged content
Bug: 37640935
Change-Id: I0446c44a78ae7d1d9193e2fe08e059cdc90cac7a
2018-01-26 18:16:23 +00:00
Ricardo Loo Foronda
f710a2307a
docs: Added a missing "be" in ACTION_CONNECTION_STATE_CHANGED
...
Status: Ready for writer review.
Note: This is a javadoc only change.
Test: Build the docs with "make ds-docs" and staged updated content.
Staged content:
go/dac-stage/reference/android/bluetooth/BluetoothAdapter.html#ACTION_CONNECTION_STATE_CHANGED
Bug: 69097875
Change-Id: Ibffea2373ded825558beaa669ae4daf3c0ff3d2f
2018-01-26 18:16:05 +00:00
TreeHugger Robot
2eeab61b4c
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
2018-01-23 21:39:09 +00:00
Felipe Leme
b25b4736db
DO NOT MERGE - fix AFM.getComponentNameFromContext()
...
This method broke on O-MR1 when I3abf999eb6056c1df7982780bae43b58337c0668
was chery-picked from master.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.AttachedContextActivityTest#testAutofill
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Also individually ran tests that failed (due to flakiness) when ran in a suite:
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \
-t android.autofillservice.cts.OptionalSaveActivityTest#testDontShowSaveUiWhenUserManuallyFilled_oneDatasetAllRequiredFields
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.PreSimpleSaveActivityTest #testTapLink_tapBack_thenStartOverBySayingYesAndManualRequest
Fixes: 71960322
Change-Id: Ia093dcefe6699dc9493c46d671e48c2000214b31
Merged-In: I3abf999eb6056c1df7982780bae43b58337c0668
2018-01-22 16:29:23 -08:00
Jonathan Dormody
bfaf862130
Docs: Inserting a line to include the documentation for
...
keyPreviewHeight.
Test: make ds-docs
Bug: 68838052
Change-Id: I25c58d2cfd2fe3637edcd6962202e5b0d1632e0e
2018-01-22 15:49:04 -07: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
3aab9561b2
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
...
am: 69d240d584
2018-01-12 05:44:25 +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
2018-01-12 05:31:38 +00:00
