OSDN Git Service
Jakub Pawlowski [Fri, 30 Nov 2018 16:22:48 +0000 (08:22 -0800)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
am:
f843ccbf9e
Change-Id: I73800fa61a09d6a5e603582a0a4046a8bb7fd5d8
Jakub Pawlowski [Thu, 29 Nov 2018 17:54:21 +0000 (18:54 +0100)]
Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettings
Bug:
119819889
Test: compilation
Change-Id: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
Merged-In: If51d0e2af74d99758f79a603d40cc2f5c84e4dde
Varun Shah [Mon, 19 Nov 2018 23:11:59 +0000 (15:11 -0800)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev
am:
546ba589a2
Change-Id: I0b63c0bef57320b7465c2fe4e45304fd637e712d
TreeHugger Robot [Mon, 19 Nov 2018 22:49:58 +0000 (22:49 +0000)]
Merge "RESTRICT AUTOMERGE: Added an app id security check in isAppForeground." into oc-dev
Guliz Tuncay [Fri, 16 Nov 2018 21:46:12 +0000 (13:46 -0800)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f am:
6e652225ad am:
6bd38ca2aa
am:
608d567e43
Change-Id: I5d09ecdb574e347f5f8c8c86a7f6a8ecb26e42c4
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:40 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f am:
6e652225ad am:
6bd38ca2aa
Change-Id: I63d8639a52f0be081b397e1bb7813d1e7e4b8aa4
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:32 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f am:
6e652225ad
Change-Id: Iece38d8723b40e22f86f4aa599d42dbf9a2fcbab
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:25 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63 am:
8df481923f
Change-Id: If661d9f3206b0e9da2a98ffb14b0ff38154cd757
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:20 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970 am:
c008f3df63
Change-Id: I9541ff6206955ed3479d5b4aa6c78f23304d3165
Android Build Merger (Role) [Wed, 14 Nov 2018 20:07:12 +0000 (20:07 +0000)]
[automerger] Select only preinstalled Spell Checker Services am:
fa265ed970
Change-Id: I6a0825a14c8b0f38415cccacc315ba84eb88f5b9
Guliz Tuncay [Wed, 16 Aug 2017 19:02:31 +0000 (12:02 -0700)]
Select only preinstalled Spell Checker Services
When we are setting a new spell checker as the default one in
Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up
any available spell checker service. This violates the principle
that user should be warned whenever we are setting an untrusted
spell checker service as the default service, since the warning
dialog is never shown.
Fixes:
64764051
Bug:
118694079
Test: Manually as follows:
0. Make sure AOSP keyboard is pre-installed.
1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
2. tapas SampleSpellCheckerService
3. make -j
4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk
5. adb shell pm disable com.android.inputmethod.latin
6. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
7. adb reboot
8. adb shell settings get --user 0 secure selected_spell_checker
-> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService
Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
Bill Yi [Sun, 11 Nov 2018 03:49:37 +0000 (19:49 -0800)]
Merge changes from topic "am-
9fd37bbd-f227-4135-a674-
78c7ef1f0468" into oc-dev
am:
bc7da75f87
Change-Id: Ibdf168a787a6208e78afce6ee311cfd84b198c4b
Bill Yi [Sun, 11 Nov 2018 03:47:36 +0000 (19:47 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f77737395b skipped:
640fb0a793
am:
c9590c8fc1 -s ours
Change-Id: I8c87d21d8f99ea3a8e9639a56e8acb10712e7366
Bill Yi [Sun, 11 Nov 2018 03:43:45 +0000 (19:43 -0800)]
Merge changes from topic "am-
6c55709f-f895-4072-8c00-
5133d079d8d8" into oc-dev
am:
cff099466e
Change-Id: I173094597612750f9c4645236ddeb972aa5ad7c5
Bill Yi [Sun, 11 Nov 2018 03:41:31 +0000 (19:41 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0697e9e6d7 skipped:
b702eb1807
am:
5e3def3f70 -s ours
Change-Id: Iab399a5abfc4c27aac2956e4d048ef491bd64a3e
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge changes from topic "am-
9fd37bbd-f227-4135-a674-
78c7ef1f0468" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f77737395b skipped:
640fb0a793
[automerger skipped] Import translations. DO NOT MERGE skipped:
f77737395b
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge changes from topic "am-
9fd37bbd-f227-4135-a674-
78c7ef1f0468" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f77737395b
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 03:33:51 +0000 (03:33 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge changes from topic "am-
6c55709f-f895-4072-8c00-
5133d079d8d8" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
0697e9e6d7 skipped:
b702eb1807
[automerger skipped] Import translations. DO NOT MERGE skipped:
0697e9e6d7
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge changes from topic "am-
6c55709f-f895-4072-8c00-
5133d079d8d8" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
0697e9e6d7
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 03:26:32 +0000 (03:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Sun, 11 Nov 2018 02:15:34 +0000 (18:15 -0800)]
Merge changes from topic "am-
8da5d3f1-21c0-4b80-9cbb-
748987f515da" into oc-dev
am:
cfbf7a21c3
Change-Id: I26bdbcd48705c30189d55904823cfd03a0fd11dc
Bill Yi [Sun, 11 Nov 2018 02:13:06 +0000 (18:13 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faba866b30 skipped:
38e04d8b0a
am:
39a2390fb9 -s ours
Change-Id: I7ce95669411440d93e113c1f6facd374a9c36241
Bill Yi [Sun, 11 Nov 2018 02:07:06 +0000 (18:07 -0800)]
Merge changes from topic "am-
a4f2313d-91d9-4723-8d15-
dc7e5aa52970" into oc-dev
am:
8c5514b186
Change-Id: I20cb7234b5b7a48b57af23b71311989978503de9
Bill Yi [Sun, 11 Nov 2018 02:04:59 +0000 (18:04 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9 skipped:
d9cf1de3e4
am:
cbaf1505a0 -s ours
Change-Id: I362c59a89efba73b45a9a5d81474cac8448c2f84
Bill Yi [Sun, 11 Nov 2018 02:01:06 +0000 (18:01 -0800)]
Merge changes from topic "am-
707d9054-0085-4add-8cb5-
07f6cb10d135" into oc-dev
am:
3fa917c8bc
Change-Id: I9b83367bb794f295c81ccfaf7c9ac1f2113c72e4
Bill Yi [Sun, 11 Nov 2018 01:59:03 +0000 (17:59 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
65cfd97b69 skipped:
79dc3a3343
am:
204f727404 -s ours
Change-Id: I3830beca2052ed387304bcdb546aa431627dae1f
Bill Yi [Sun, 11 Nov 2018 01:54:56 +0000 (17:54 -0800)]
Merge changes from topic "am-
e8cf3957-7e41-48c5-b339-
2114401da749" into oc-dev
am:
568344a776
Change-Id: If9f7d923e98f33d346ede4bfe3be622f3742ee90
Bill Yi [Sun, 11 Nov 2018 01:52:40 +0000 (17:52 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed skipped:
985e4a2c7f
am:
176758a8cb -s ours
Change-Id: I83944a6a1e013ba6c0a675637e102949115b4ba0
Bill Yi [Sun, 11 Nov 2018 01:49:06 +0000 (17:49 -0800)]
Merge changes from topic "am-
6f74b9fb-4f7a-4949-a2b2-
4de2e4256447" into oc-dev
am:
ef0d8b4472
Change-Id: Ie4cdce55a83a00f2ceac184cbc858b7fa4deddcb
Bill Yi [Sun, 11 Nov 2018 01:46:47 +0000 (17:46 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
eadf247a57 skipped:
84b233fab0
am:
236da59677 -s ours
Change-Id: I8f2cce17bfcec29b146a46343cded42d1afd99de
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge changes from topic "am-
8da5d3f1-21c0-4b80-9cbb-
748987f515da" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
faba866b30 skipped:
38e04d8b0a
[automerger skipped] Import translations. DO NOT MERGE skipped:
faba866b30
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge changes from topic "am-
8da5d3f1-21c0-4b80-9cbb-
748987f515da" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
faba866b30
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:38:13 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Sun, 11 Nov 2018 01:35:57 +0000 (17:35 -0800)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5739e3bfb2 skipped:
7176023903
am:
09f4f73afa -s ours
Change-Id: Ib2b40d7dd3601e97353a63718bfbc44e5c967ee4
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge changes from topic "am-
a4f2313d-91d9-4723-8d15-
dc7e5aa52970" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9 skipped:
d9cf1de3e4
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge changes from topic "am-
a4f2313d-91d9-4723-8d15-
dc7e5aa52970" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:31:19 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge changes from topic "am-
707d9054-0085-4add-8cb5-
07f6cb10d135" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
65cfd97b69 skipped:
79dc3a3343
[automerger skipped] Import translations. DO NOT MERGE skipped:
65cfd97b69
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge changes from topic "am-
707d9054-0085-4add-8cb5-
07f6cb10d135" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
65cfd97b69
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:31:00 +0000 (01:31 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge changes from topic "am-
e8cf3957-7e41-48c5-b339-
2114401da749" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed skipped:
985e4a2c7f
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge changes from topic "am-
e8cf3957-7e41-48c5-b339-
2114401da749" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:30:11 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge changes from topic "am-
6f74b9fb-4f7a-4949-a2b2-
4de2e4256447" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
eadf247a57 skipped:
84b233fab0
[automerger skipped] Import translations. DO NOT MERGE skipped:
eadf247a57
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge changes from topic "am-
6f74b9fb-4f7a-4949-a2b2-
4de2e4256447" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
eadf247a57
Import translations. DO NOT MERGE
TreeHugger Robot [Sun, 11 Nov 2018 01:27:55 +0000 (01:27 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:15 +0000 (19:47 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed skipped:
985e4a2c7f
Change-Id: I63583ee2589e27644de2fe138fde88d1efd7c4f6
Android Build Merger (Role) [Sat, 10 Nov 2018 19:47:09 +0000 (19:47 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c82e0b36ed
Change-Id: I58f6aae098f5dcb6c8ecfcaef6427f5276d36324
Bill Yi [Sat, 10 Nov 2018 19:46:51 +0000 (11:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9be4c84c6a0abd2cecfc8ac49b1d9b8a8fe38079
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:53 +0000 (19:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5739e3bfb2 skipped:
7176023903
Change-Id: I80379f2416b5f60734fce3db6b8d74ceca628331
Android Build Merger (Role) [Sat, 10 Nov 2018 19:40:44 +0000 (19:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5739e3bfb2
Change-Id: I17330d6b3d4cf62d89a3413605ceae1b701bb858
Bill Yi [Sat, 10 Nov 2018 19:40:18 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib25ad353f0684aebfd2817cabd5abea5a63d970f
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:19 +0000 (18:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9 skipped:
d9cf1de3e4
Change-Id: I2bb4251fa00c257d00e4cefa4ddca89fc24ad7f3
Android Build Merger (Role) [Sat, 10 Nov 2018 18:50:11 +0000 (18:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cfd1e141b9
Change-Id: Id0e2056ac5c7ef52d8d2f844bb3ff5c660e27959
Bill Yi [Sat, 10 Nov 2018 18:49:42 +0000 (10:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I80ba9acb8d4bcf859fbef444b4553b720b67b347
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:44 +0000 (18:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
eadf247a57 skipped:
84b233fab0
Change-Id: I71ed720b5ec39dc9be62aa13d71f5d06f3bec0e3
Android Build Merger (Role) [Sat, 10 Nov 2018 18:43:37 +0000 (18:43 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
eadf247a57
Change-Id: I997246032f47b236724ae93f3fe4e0ba34053d66
Bill Yi [Sat, 10 Nov 2018 18:43:10 +0000 (10:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icda106c2509ee7cfe135a526ddc6b1da312e0d00
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 18:31:16 +0000 (18:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faba866b30 skipped:
38e04d8b0a
Change-Id: I717bb8adc24725ee2c219bb322520ec4d6ff3256
Android Build Merger (Role) [Sat, 10 Nov 2018 18:31:06 +0000 (18:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
faba866b30
Change-Id: I098638c4895f56981058a6d7e3cd08dd47d6c3d6
Bill Yi [Sat, 10 Nov 2018 18:30:20 +0000 (10:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7f4eca632304e01212332a24545020f6641d8bd3
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 18:01:54 +0000 (18:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f77737395b skipped:
640fb0a793
Change-Id: I596b914378d3cf86fb5d93c515c5ff47176d636f
Android Build Merger (Role) [Sat, 10 Nov 2018 18:01:47 +0000 (18:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f77737395b
Change-Id: Ie294af994de6deefe985c3af3695a2ed7097928e
Bill Yi [Sat, 10 Nov 2018 18:01:28 +0000 (10:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id581072702a6cd8312047105027fe82db61d1053
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 17:38:36 +0000 (17:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0697e9e6d7 skipped:
b702eb1807
Change-Id: Ib778cb2efec1d341648d54bd38a0c215bb7fbc18
Android Build Merger (Role) [Sat, 10 Nov 2018 17:38:30 +0000 (17:38 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
0697e9e6d7
Change-Id: I7f4920d65b03f1bc7e4b398e9391560cc36a4d1a
Bill Yi [Sat, 10 Nov 2018 17:38:06 +0000 (09:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I39c59a482736fd930abc77d8c3f0d26541ac7fe9
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Nov 2018 17:31:53 +0000 (17:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
65cfd97b69 skipped:
79dc3a3343
Change-Id: If19056c1c2ed311693bd74ee5514fa789f5a1faa
Android Build Merger (Role) [Sat, 10 Nov 2018 17:31:43 +0000 (17:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
65cfd97b69
Change-Id: Ied955d35cf088b5e432ff984d948d4ccf075562c
Bill Yi [Sat, 10 Nov 2018 17:31:11 +0000 (09:31 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2d1faf1497f7bccdebee6ae93a8a3f56c01ca042
Auto-generated-cl: translation import
Varun Shah [Sat, 27 Oct 2018 00:03:23 +0000 (17:03 -0700)]
RESTRICT AUTOMERGE: Added an app id security check in isAppForeground.
ActivityManagerService#isAppForeground now checks if the caller has the
permission to view if an app is in the foreground.
Bug:
115384617
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundNormal
Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundMalicious
Change-Id: I9602c89b2d40036e525c38960a08326dc74c6682
Steve Elliott [Fri, 26 Oct 2018 19:29:12 +0000 (15:29 -0400)]
DO NOT MERGE ANYWHERE: resolve merge conflicts of
77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev
Bug:
111603898
Test: manual
Change-Id: I5933f27f2fbd90a6de447fbf7f17063f6b7f1fb8
Steve Elliott [Tue, 25 Sep 2018 15:23:38 +0000 (15:23 +0000)]
DO NOT MERGE: Add configurable default setting for assistant componentname
By requiring an explicit default setting, it eliminates all ambiguous
states where a disambiguation would normally be shown. With this
change in place, at no point should a disambiguation be shown.
Test: manual
Bug:
111603898
Change-Id: Ib32dafbd3c6fcbe11186dc8ecab6b09c9b734067
Merged-In: Id39fdf700ed4ef08ebbc333b5452223430ac2e48
Jeff Sharkey [Fri, 12 Oct 2018 04:56:21 +0000 (21:56 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am:
ab80221a8c
Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
Jeff Sharkey [Fri, 12 Oct 2018 04:51:36 +0000 (21:51 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac
am:
af72f01db8
Change-Id: Ib260367aeaab863c9eeef492d46736dcf1c05591
Jeff Sharkey [Fri, 12 Oct 2018 04:31:20 +0000 (04:31 +0000)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
Jeff Sharkey [Mon, 24 Sep 2018 19:23:57 +0000 (13:23 -0600)]
RESTRICT AUTOMERGE: Recover shady content:// paths.
The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.
This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths. Consider this example:
<path-permission android:pathPrefix="/private" ... />
uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);
content://com.example//private
The Uri above will pass the security check, since it's not
technically a prefix match. But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.
Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.
Bug:
112555574
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:44 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac
Change-Id: I72c58f65bd2709e23d7631d2e0acc06b40a917f9
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:37 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665
Change-Id: I0cd990dcdfb899fa419cf1b28934d4118c225937
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:27 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac
Change-Id: Id59316f6628fcabc71962bd9ca8ab15cbbfb8b6d
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:19 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c
Change-Id: I5f8b88ca54c22bb978fc6c468259fec9e0e9898a
Android Build Merger (Role) [Fri, 5 Oct 2018 00:19:12 +0000 (00:19 +0000)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd
Change-Id: I80ac911a166e12eedf77518436808d4f3ede872c
Jeff Sharkey [Mon, 24 Sep 2018 19:23:57 +0000 (13:23 -0600)]
RESTRICT AUTOMERGE: Recover shady content:// paths.
The path-permission element offers prefix or regex style matching of
paths, but most providers internally use UriMatcher to decide what
to do with an incoming Uri.
This causes trouble because UriMatcher uses Uri.getPathSegments(),
which quietly ignores "empty" paths. Consider this example:
<path-permission android:pathPrefix="/private" ... />
uriMatcher.addURI("com.example", "/private", CODE_PRIVATE);
content://com.example//private
The Uri above will pass the security check, since it's not
technically a prefix match. But the UriMatcher will then match it
as CODE_PRIVATE, since it ignores the "//" zero-length path.
Since we can't safely change the behavior of either path-permission
or UriMatcher, we're left with recovering these shady paths by
trimming away zero-length paths.
Bug:
112555574
Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests
Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a
Wayne Lin [Mon, 1 Oct 2018 08:59:49 +0000 (16:59 +0800)]
resolve merge conflicts of
3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev
Bug:
115331218
Bug:
112159033
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id82146b32d95cc791b1905c8acdfe52b79dac2f5
Merged-In: I5075f7887a184ce18bb1815b35a2ce7acd8bca10
Bill Yi [Mon, 1 Oct 2018 06:47:20 +0000 (23:47 -0700)]
Merge changes from topic "am-
59fcdedb-d1d8-4894-bcee-
75f4085aa930" into oc-dev
am:
57b2e38837
Change-Id: Ia168d6b5a5dba2c768c62de8548400b6937c1692
Bill Yi [Mon, 1 Oct 2018 06:44:52 +0000 (23:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4b2cb1520 skipped:
853c7ca3a5
am:
0bc949205b -s ours
Change-Id: Ib37e4ec5fc6764341a51a9153842c2080b001b69
Bill Yi [Mon, 1 Oct 2018 06:40:04 +0000 (23:40 -0700)]
Merge changes from topic "am-
51a4d236-f631-4fe1-9fa8-
50a6c5132ce4" into oc-dev
am:
33be0d800a
Change-Id: I589409d6a34ed7091fa182fad4a9d86f65970b38
Bill Yi [Mon, 1 Oct 2018 06:37:34 +0000 (23:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
73a5116af8 skipped:
b5f88962d5
am:
fd474f8dc8 -s ours
Change-Id: I81cfcdf20b7c53f16b50d217d231713589c31a5e
Bill Yi [Mon, 1 Oct 2018 06:32:35 +0000 (23:32 -0700)]
Merge changes from topic "am-
95ed1a42-c734-497b-9e03-
f8de9f42ea61" into oc-dev
am:
eb92e99a06
Change-Id: I770dac967bc946a9c89550989057bb99f8a213fd
Bill Yi [Mon, 1 Oct 2018 06:30:12 +0000 (23:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4310d4d905 skipped:
ebf64faa28
am:
5bf6376615 -s ours
Change-Id: Ica580645d38649c5210ddbe0b88bd3516275db13
Bill Yi [Mon, 1 Oct 2018 06:25:30 +0000 (23:25 -0700)]
Merge changes from topic "am-
25c8f1dd-79b2-410a-8aa9-
2fe914e32aa3" into oc-dev
am:
1825d87bc7
Change-Id: Ifff670d53d6cbfddac8756f1f7f1352a77528036
Bill Yi [Mon, 1 Oct 2018 06:23:08 +0000 (23:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f40a0a8dae skipped:
110074be1a
am:
77b862002b -s ours
Change-Id: I58dd736fc460e04f8e56b330640681c4e7e5aafc
Bill Yi [Mon, 1 Oct 2018 06:17:51 +0000 (23:17 -0700)]
Merge changes from topic "am-
4f2d7404-9a6c-4f5f-9d17-
25f79c4505ff" into oc-dev
am:
8c53c6e4e3
Change-Id: I64b06a863a95707eb9d5ef1db4cd5f5b2c70000b
Bill Yi [Mon, 1 Oct 2018 06:15:15 +0000 (23:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f6e12d6972 skipped:
f487edc7f2
am:
2053a11236 -s ours
Change-Id: If63e80c1cbdfa7b56d8c6f5d902b990686daf2be
Bill Yi [Mon, 1 Oct 2018 06:11:05 +0000 (23:11 -0700)]
Merge changes from topic "am-
2e7b32c3-6d04-46ba-bfdc-
309eff7d76b0" into oc-dev
am:
d349bd741d
Change-Id: If41945b25a473afa1c870e294a4b42e856e5c42c
Bill Yi [Mon, 1 Oct 2018 06:08:41 +0000 (23:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
b19a62bcf8 skipped:
5883bd3177
am:
1e00122904 -s ours
Change-Id: I5efbcb9878eff1c5df234fdafc8fec126dbf95ca
Bill Yi [Mon, 1 Oct 2018 06:04:11 +0000 (23:04 -0700)]
Merge changes from topic "am-
8e0e30ce-6e2e-43b5-a842-
3581d218043b" into oc-dev
am:
0adf6e1981
Change-Id: I689851b43fd7ad2577badd4115571478d1597be3
Bill Yi [Mon, 1 Oct 2018 06:01:49 +0000 (23:01 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
5587649e8f skipped:
07dfa0baae
am:
997014d63a -s ours
Change-Id: I20a39d2e1be36339d11611ed8db8963c624ed4a1
Bill Yi [Mon, 1 Oct 2018 05:58:21 +0000 (22:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
6105ad5932 skipped:
e50fc63e3d
am:
20ce1f4c33 -s ours
Change-Id: I78a7a1809236cb0867143d2c4deeddfbdc4e9a18
OSDN Git Service
