330499 Commits

Author SHA1 Message Date
Bill Yi
d2eb52dd7b Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev
am: cfbf7a21c3

Change-Id: I26bdbcd48705c30189d55904823cfd03a0fd11dc
2018-11-10 18:15:34 -08:00
Bill Yi
497cb6d257 [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
am: 39a2390fb9  -s ours

Change-Id: I7ce95669411440d93e113c1f6facd374a9c36241
2018-11-10 18:13:06 -08:00
Bill Yi
fefdff353f Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev
am: 8c5514b186

Change-Id: I20cb7234b5b7a48b57af23b71311989978503de9
2018-11-10 18:07:06 -08:00
Bill Yi
82f5bd65de [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
am: cbaf1505a0  -s ours

Change-Id: I362c59a89efba73b45a9a5d81474cac8448c2f84
2018-11-10 18:04:59 -08:00
Bill Yi
51ec5967af Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev
am: 3fa917c8bc

Change-Id: I9b83367bb794f295c81ccfaf7c9ac1f2113c72e4
2018-11-10 18:01:06 -08:00
Bill Yi
519fa54629 [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
am: 204f727404  -s ours

Change-Id: I3830beca2052ed387304bcdb546aa431627dae1f
2018-11-10 17:59:03 -08:00
Bill Yi
8b1df08930 Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev
am: 568344a776

Change-Id: If9f7d923e98f33d346ede4bfe3be622f3742ee90
2018-11-10 17:54:56 -08:00
Bill Yi
1da1b80a9f [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
am: 176758a8cb  -s ours

Change-Id: I83944a6a1e013ba6c0a675637e102949115b4ba0
2018-11-10 17:52:40 -08:00
Bill Yi
d72f7d1d9e Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
am: ef0d8b4472

Change-Id: Ie4cdce55a83a00f2ceac184cbc858b7fa4deddcb
2018-11-10 17:49:06 -08:00
Bill Yi
94c6fa964f [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
am: 236da59677  -s ours

Change-Id: I8f2cce17bfcec29b146a46343cded42d1afd99de
2018-11-10 17:46:47 -08:00
TreeHugger Robot
cfbf7a21c3 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
2018-11-11 01:38:13 +00:00
Bill Yi
5c7f0c40fb [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903
am: 09f4f73afa  -s ours

Change-Id: Ib2b40d7dd3601e97353a63718bfbc44e5c967ee4
2018-11-10 17:35:57 -08:00
TreeHugger Robot
8c5514b186 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
2018-11-11 01:31:19 +00:00
TreeHugger Robot
3fa917c8bc 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
2018-11-11 01:31:00 +00:00
TreeHugger Robot
568344a776 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
2018-11-11 01:30:11 +00:00
TreeHugger Robot
ef0d8b4472 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
2018-11-11 01:27:55 +00:00
Android Build Merger (Role)
176758a8cb [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f
Change-Id: I63583ee2589e27644de2fe138fde88d1efd7c4f6
2018-11-10 19:47:15 +00:00
Android Build Merger (Role)
985e4a2c7f [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed
Change-Id: I58f6aae098f5dcb6c8ecfcaef6427f5276d36324
2018-11-10 19:47:09 +00:00
Bill Yi
c82e0b36ed Import translations. DO NOT MERGE
Change-Id: I9be4c84c6a0abd2cecfc8ac49b1d9b8a8fe38079
Auto-generated-cl: translation import
2018-11-10 11:46:51 -08:00
Android Build Merger (Role)
09f4f73afa [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903
Change-Id: I80379f2416b5f60734fce3db6b8d74ceca628331
2018-11-10 19:40:53 +00:00
Android Build Merger (Role)
7176023903 [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2
Change-Id: I17330d6b3d4cf62d89a3413605ceae1b701bb858
2018-11-10 19:40:44 +00:00
Bill Yi
5739e3bfb2 Import translations. DO NOT MERGE
Change-Id: Ib25ad353f0684aebfd2817cabd5abea5a63d970f
Auto-generated-cl: translation import
2018-11-10 11:40:18 -08:00
Android Build Merger (Role)
cbaf1505a0 [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
Change-Id: I2bb4251fa00c257d00e4cefa4ddca89fc24ad7f3
2018-11-10 18:50:19 +00:00
Android Build Merger (Role)
d9cf1de3e4 [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9
Change-Id: Id0e2056ac5c7ef52d8d2f844bb3ff5c660e27959
2018-11-10 18:50:11 +00:00
Bill Yi
cfd1e141b9 Import translations. DO NOT MERGE
Change-Id: I80ba9acb8d4bcf859fbef444b4553b720b67b347
Auto-generated-cl: translation import
2018-11-10 10:49:42 -08:00
Android Build Merger (Role)
236da59677 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
Change-Id: I71ed720b5ec39dc9be62aa13d71f5d06f3bec0e3
2018-11-10 18:43:44 +00:00
Android Build Merger (Role)
84b233fab0 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57
Change-Id: I997246032f47b236724ae93f3fe4e0ba34053d66
2018-11-10 18:43:37 +00:00
Bill Yi
eadf247a57 Import translations. DO NOT MERGE
Change-Id: Icda106c2509ee7cfe135a526ddc6b1da312e0d00
Auto-generated-cl: translation import
2018-11-10 10:43:10 -08:00
Android Build Merger (Role)
39a2390fb9 [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
Change-Id: I717bb8adc24725ee2c219bb322520ec4d6ff3256
2018-11-10 18:31:16 +00:00
Android Build Merger (Role)
38e04d8b0a [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
Change-Id: I098638c4895f56981058a6d7e3cd08dd47d6c3d6
2018-11-10 18:31:06 +00:00
Bill Yi
faba866b30 Import translations. DO NOT MERGE
Change-Id: I7f4eca632304e01212332a24545020f6641d8bd3
Auto-generated-cl: translation import
2018-11-10 10:30:20 -08:00
Android Build Merger (Role)
204f727404 [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343
Change-Id: If19056c1c2ed311693bd74ee5514fa789f5a1faa
2018-11-10 17:31:53 +00:00
Android Build Merger (Role)
79dc3a3343 [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69
Change-Id: Ied955d35cf088b5e432ff984d948d4ccf075562c
2018-11-10 17:31:43 +00:00
Bill Yi
65cfd97b69 Import translations. DO NOT MERGE
Change-Id: I2d1faf1497f7bccdebee6ae93a8a3f56c01ca042
Auto-generated-cl: translation import
2018-11-10 09:31:11 -08:00
Steve Elliott
d2fa9c3ecf DO NOT MERGE ANYWHERE: resolve merge conflicts of 77c1f6080171bd02efe84501365495e98cae0a50 to oc-dr1-dev
Bug: 111603898
Test: manual
Change-Id: I5933f27f2fbd90a6de447fbf7f17063f6b7f1fb8
2018-10-31 16:29:12 +00:00
Steve Elliott
77c1f60801 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
2018-10-19 20:11:08 +00:00
Jeff Sharkey
893598cd4b Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am: ab80221a8c

Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
2018-10-11 21:56:21 -07:00
Jeff Sharkey
80c65f6ce7 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac
am: af72f01db8

Change-Id: Ib260367aeaab863c9eeef492d46736dcf1c05591
2018-10-11 21:51:36 -07:00
Jeff Sharkey
ab80221a8c Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev 2018-10-12 04:31:20 +00:00
Jeff Sharkey
a1ec7b115c 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
2018-10-05 20:39:03 +00:00
Android Build Merger (Role)
af72f01db8 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac
Change-Id: I72c58f65bd2709e23d7631d2e0acc06b40a917f9
2018-10-05 00:19:44 +00:00
Android Build Merger (Role)
50e06f25ac [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665
Change-Id: I0cd990dcdfb899fa419cf1b28934d4118c225937
2018-10-05 00:19:37 +00:00
Android Build Merger (Role)
ae30765665 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac
Change-Id: Id59316f6628fcabc71962bd9ca8ab15cbbfb8b6d
2018-10-05 00:19:27 +00:00
Android Build Merger (Role)
6ef77aedac [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c
Change-Id: I5f8b88ca54c22bb978fc6c468259fec9e0e9898a
2018-10-05 00:19:19 +00:00
Android Build Merger (Role)
010585fe3c [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd
Change-Id: I80ac911a166e12eedf77518436808d4f3ede872c
2018-10-05 00:19:12 +00:00
Jeff Sharkey
301d17e4dd 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
2018-10-05 00:19:08 +00:00
Wayne Lin
fd6df001e0 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
2018-10-03 23:53:46 +00:00
Bill Yi
6c2376ce80 Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev
am: 57b2e38837

Change-Id: Ia168d6b5a5dba2c768c62de8548400b6937c1692
2018-09-30 23:47:20 -07:00
Bill Yi
318224ae93 [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5
am: 0bc949205b  -s ours

Change-Id: Ib37e4ec5fc6764341a51a9153842c2080b001b69
2018-09-30 23:44:52 -07:00
Bill Yi
e90b1d120c Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev
am: 33be0d800a

Change-Id: I589409d6a34ed7091fa182fad4a9d86f65970b38
2018-09-30 23:40:04 -07:00