OSDN Git Service
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
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
Atanas Kirilov [Fri, 28 Sep 2018 23:21:47 +0000 (23:21 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
Atanas Kirilov [Fri, 28 Sep 2018 23:21:47 +0000 (23:21 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-dr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
Atanas Kirilov [Fri, 28 Sep 2018 23:21:47 +0000 (23:21 +0000)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into nyc-dev
Atanas Kirilov [Fri, 28 Sep 2018 23:20:32 +0000 (23:20 +0000)]
Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into nyc-dev
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:28 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986 am:
79c6a599fe
Change-Id: I094a6ffa8dee70d4f9f45c4f8d9929d92b078cec
Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:21 +0000 (20:34 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am:
999e3fe986
Change-Id: I178b86c62e2b0e8d3399897adaa3bfc191daea2d
Atanas Kirilov [Fri, 28 Sep 2018 20:21:54 +0000 (20:21 +0000)]
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."
This reverts commit
8da6786608e374c20ae584b1c404fd4894786e46.
Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug:
114365189
Change-Id: I1826a5b6889f21fbbe16311a3da66c93e26383f3
Android Build Merger (Role) [Fri, 28 Sep 2018 20:33:53 +0000 (20:33 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846 am:
94e1a09bc6
Change-Id: Ie3b9caf9452711a136f50a5ac8aa4946fa0d2767
Android Build Merger (Role) [Fri, 28 Sep 2018 20:33:45 +0000 (20:33 +0000)]
[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am:
95a3e91846
Change-Id: Ib9aa56a12fff0fb53848b9856fb89c6bb4de3793
Atanas Kirilov [Fri, 28 Sep 2018 20:16:49 +0000 (20:16 +0000)]
RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."
This reverts commit
fa69d725eb99b8c20a15135304bf5be4ea811573.
Reason for revert: triggers other issue.
Bug:
114365189
Change-Id: I746c74b00f4524575279cdaa831435d12425de20
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge "Verify number of Map entries written to Parcel" into nyc-dev
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into nyc-mr1-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Verify number of Map entries written to Parcel
TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]
Merge changes from topic "am-
bdb0270e-8295-4ee6-be36-
2709e172d48f" into nyc-dr1-dev
* changes:
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Verify number of Map entries written to Parcel
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge "Hide overlay windows when requesting media projection permission." into nyc-dev
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into nyc-mr1-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]
Merge changes from topic "am-
51363a78-f167-48aa-956c-
f9bfd551a3a5" into nyc-dr1-dev
* changes:
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]
Merge changes from topic "am-
bada3a56-09dc-47f9-ba2e-
42434cf270e2" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]
Merge "RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission." into nyc-dr1-dev
Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:53 +0000 (20:38 +0000)]
[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am:
295af36009
Change-Id: I277a26c94cde1e77ddef8ddbc81dad3c963def8f
Wale Ogunwale [Wed, 16 May 2018 23:42:29 +0000 (16:42 -0700)]
RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.
1: Cherry-pick ag/
4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow
2: Cherry-pick ag/
3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded
3: Add permissions to SystemUI to allow it to hide non-system overlays
Bug:
34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
Android Build Merger (Role) [Wed, 5 Sep 2018 20:37:54 +0000 (20:37 +0000)]
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd skipped:
3eb97a9bd9
Change-Id: Icec5121efdff64b3352ac985141f612277549b6d
Android Build Merger (Role) [Wed, 5 Sep 2018 20:37:48 +0000 (20:37 +0000)]
[automerger skipped] Hide overlay windows when requesting media projection permission. skipped:
5c3f5a02bd
Change-Id: I76ade50f15b706e3f4e6acc156884b83967e4b40
Wale Ogunwale [Wed, 16 May 2018 23:42:29 +0000 (16:42 -0700)]
Hide overlay windows when requesting media projection permission.
1: Cherry-pick ag/
4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS
updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow
2: Cherry-pick ag/
3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on
relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded
3: Add permissions to SystemUI to allow it to hide non-system overlays
Bug:
34170870
Test: manual (see bug for poc)
Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753
Android Build Merger (Role) [Thu, 30 Aug 2018 20:45:59 +0000 (20:45 +0000)]
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3 am:
d6947f1cbf
Change-Id: Idaab5395d9e0970fe57b017bcba10f8757ffe3c7
Android Build Merger (Role) [Thu, 30 Aug 2018 20:45:51 +0000 (20:45 +0000)]
[automerger] Verify number of Map entries written to Parcel am:
057a01d1f3
Change-Id: Idb2572b46c48fe2f3e4b99c5cb4372dcfe6b20ce
Michael Wachenschwanz [Sat, 25 Aug 2018 04:50:35 +0000 (21:50 -0700)]
Verify number of Map entries written to Parcel
Make sure the number of entries written by Parcel#writeMapInternal
matches the size written. If a mismatch were allowed, an exploitable
scenario could occur where the data read from the Parcel would not
match the data written.
Fixes:
112859604
Test: cts-tradefed run cts -m CtsOsTestCases -t android.os.cts.ParcelTest
Change-Id: I325d08a8b66b6e80fe76501359c41b6656848607
Merged-In: I325d08a8b66b6e80fe76501359c41b6656848607
Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:22 +0000 (22:45 +0000)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608 am:
7d153c56c6
Change-Id: Idba111169b057b88a7b47dde4b734ede2c651310
Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:15 +0000 (22:45 +0000)]
[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am:
8da6786608
Change-Id: I2c9174d4b065aada8c4ba95e864b3628dd1f0975
akirilov [Fri, 24 Aug 2018 22:43:05 +0000 (15:43 -0700)]
RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions.
Bug:
111752150
Test: Manual local test
Change-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into nyc-mr1-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into nyc-dr1-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]
Merge changes from topic "am-
0f30ee3d-94a0-4dc3-bb14-
762781265ad9" into nyc-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:17:04 +0000 (19:17 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into nyc-dev
Android Build Merger (Role) [Wed, 15 Aug 2018 19:12:59 +0000 (19:12 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3
Change-Id: Iaf0aded3004f33fdb52dd0c19779329991b24746
Android Build Merger (Role) [Wed, 15 Aug 2018 19:12:52 +0000 (19:12 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb
Change-Id: I221d974ba9402c088235d5bdb3c94e91cf4167ba
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
78464361,
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
(cherry picked from commit
960647d582911ae7ab8b9491097898e6c313aaf1)
Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:16 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b am:
74ffd2bc55
Change-Id: I680848db0e845617323ecca36c380fdf890789d9
Android Build Merger (Role) [Wed, 15 Aug 2018 00:29:09 +0000 (00:29 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9 am:
65082f8f5b
Change-Id: I27b2220f568a37ff16b0dfc3376d7e46cb3659c9
Android Build Merger (Role) [Wed, 15 Aug 2018 00:28:52 +0000 (00:28 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f am:
04c7154fd9
Change-Id: Ic801a54fa6cb048ddf911c7b315849ab40bd7a52
Android Build Merger (Role) [Wed, 15 Aug 2018 00:28:41 +0000 (00:28 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2 skipped:
723f13d01f
Change-Id: If1607fb19bd806cb6d0f9b9010032e95df6549a8
Android Build Merger (Role) [Wed, 15 Aug 2018 00:26:19 +0000 (00:26 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea am:
b7a2d47ec2
Change-Id: I6995aab201805b64e81022db295356ef8abda30c
Android Build Merger (Role) [Wed, 15 Aug 2018 00:26:10 +0000 (00:26 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
95218ce7ea
Change-Id: Id97c3f508a0dcd82978b06891b3a979921d4be3a
Seigo Nonaka [Thu, 19 Jul 2018 23:22:02 +0000 (16:22 -0700)]
Fix crash during cursor moving on BiDi text
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0
The root cause of the crashing is requesting out-of-line access for the
horizontal width. This invalid access is silently ignored by
TextLine#measure() method but new implementation end up with out of
bounds access.
To makes behavior as old implementation, calling getHorizontal instead
of accessing measured result array.
Bug:
111580019
Test: Manually done
Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8
Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into nyc-dev
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-mr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into nyc-dr1-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:51 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8
Change-Id: I544bf2c6b5d0177aa70a6fb7bd4225d4d04881fd
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:45 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09
Change-Id: I6cdb5a5dd5531ad53ef02174ff5063788d11029d
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:28 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4
Change-Id: Ia9f489c55def0f592383ac2a10f5bd0b34c2663d
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:19 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a
Change-Id: Ia877305c642c3b7741941d2e438fe77f1d1550f3
Jeff Sharkey [Wed, 25 Jul 2018 20:52:14 +0000 (14:52 -0600)]
DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.
Developers often accept selection clauses from untrusted code, and
SQLiteQueryBuilder already supports a "strict" mode to help catch
SQL injection attacks. This change extends the builder to support
update() and delete() calls, so that we can help secure those
selection clauses too.
Bug:
111085900
Test: atest packages/providers/DownloadProvider/tests/
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Change-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c
Merged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c
Jeff Sharkey [Wed, 25 Jul 2018 20:01:59 +0000 (14:01 -0600)]
DO NOT MERGE. Execute "strict" queries with extra parentheses.
SQLiteQueryBuilder has a setStrict() mode which can be used to
detect SQL attacks from untrusted sources, which it does by running
each query twice: once with an extra set of parentheses, and if that
succeeds, it runs the original query verbatim.
This sadly doesn't catch inputs of the type "1=1) OR (1=1", which
creates valid statements for both tests above, but the final executed
query ends up leaking data due to SQLite operator precedence.
Instead, we need to continue compiling both variants, but we need
to execute the query with the additional parentheses to ensure
data won't be leaked.
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Bug:
111085900
Change-Id: I6e8746fa48f9de13adae37d2990de11c9c585381
Merged-In: I6e8746fa48f9de13adae37d2990de11c9c585381
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:18 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7
Change-Id: I16ddc194ac2f38676e929f98aebf7776dcaeed53
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:08 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb
Change-Id: I7bfd11dd549f814b59742c7565c4a39ed3df66fe
akirilov [Thu, 19 Jul 2018 00:50:05 +0000 (17:50 -0700)]
RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.
Bug:
67319274
Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved
Change-Id: I69edee8ed044cc2a8cdb01515f7996b004209c81
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge "Fix TrackInfo parcel write" into nyc-dev
Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:02 +0000 (06:57 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7
Change-Id: Ida72e9fed175aa9497af5c5f607640c07cb04cf5
Android Build Merger (Role) [Fri, 13 Jul 2018 06:56:56 +0000 (06:56 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc
Change-Id: I7ea941c8cffa147d2c6a46f0428899bf001a2672
Robert Shih [Mon, 9 Jul 2018 20:38:31 +0000 (13:38 -0700)]
Fix TrackInfo parcel write
Bug:
77600398
Change-Id: Ia316f1c5dc4879f6851fdb78fe8b9039579be7bc
Android Build Merger (Role) [Fri, 6 Jul 2018 22:55:02 +0000 (22:55 +0000)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a am:
2895b320b4
Change-Id: I26b97af90ef6ea8b640ff7198b2883297d4fb03e
Android Build Merger (Role) [Fri, 6 Jul 2018 22:54:55 +0000 (22:54 +0000)]
[automerger] Resolve inconsistent parcel read in NanoAppFilter am:
abe5a73a4a
Change-Id: Ieb925f073b80e4d624552e738d49b0996f0485ae
Arthur Ishiguro [Mon, 25 Jun 2018 18:31:33 +0000 (11:31 -0700)]
Resolve inconsistent parcel read in NanoAppFilter
Bug:
77599679
Test: Compile only
Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266
Atanas Kirilov [Wed, 27 Jun 2018 23:29:41 +0000 (23:29 +0000)]
Merge "RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing" into nyc-mr1-dev
Makoto Onuki [Tue, 12 Jun 2018 20:01:42 +0000 (13:01 -0700)]
RESTRICT AUTOMERGE: Prevent shortcut info package name spoofing
Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest
Bug:
109824443
Change-Id: I80b2680d9c7e067f1a36fc8ad1aac1d315022a71
Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:24 +0000 (18:09 +0000)]
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c am:
b9c3b099e4
Change-Id: I8a090de1075d6d30590ac1e535de841164753758
Android Build Merger (Role) [Wed, 13 Jun 2018 18:09:16 +0000 (18:09 +0000)]
[automerger] RESTRICT AUTOMERGE: Backporting of b/
77821568 am:
4bc1c2445c
Change-Id: I12a6a00f11b2d94d3ac112a2f18284e13062a814
akirilov [Thu, 7 Jun 2018 21:36:25 +0000 (14:36 -0700)]
RESTRICT AUTOMERGE: Backporting of b/
77821568
Enforce permission check before returning application info
Test: manually tested (see bug for repro steps)
Bug:
77821568
Change-Id: I5d81345b2d958c2bb0a62bbcb8bd8c714a1cf41e
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into mnc-dr1.5-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into cw-e-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into mnc-dr-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge "Fix DynamicRefTable::load security bug" into mnc-dev
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-mr1-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-dr1-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
Ryan Mitchell [Wed, 6 Jun 2018 23:33:08 +0000 (23:33 +0000)]
Merge changes from topic "dynamic-ref-se-mnc-dev" into nyc-dev
* changes:
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Fix DynamicRefTable::load security bug
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into mnc-dr1.5-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into cw-e-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into mnc-dr-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge "ResStringPool: Prevenet boot loop from se fix" into mnc-dev
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into nyc-mr1-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404 am:
3926163983
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into nyc-dr1-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6 am:
3a272fe404
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
TreeHugger Robot [Wed, 6 Jun 2018 22:09:54 +0000 (22:09 +0000)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into nyc-dev
* changes:
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59 am:
6714a260e6
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436 am:
5a632d1b59
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008 am:
fd1097e436
[automerger] ResStringPool: Prevenet boot loop from se fix am:
c31cf80008
ResStringPool: Prevenet boot loop from se fix
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:46 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69 am:
69b14d2a1a
Change-Id: I6e7ab766f6c88e61b8c2993a2f1420efc177319a
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:39 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606 am:
6f76fbfc69
Change-Id: I43c9c68ca69d26f6d4d2dee3cd2a66d5e4a73761
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:24 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9 am:
0938689606
Change-Id: Ib9e372290f9b2e1fa73470db3f7fd67bc9190711
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:18 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce am:
aeb2fc64d9
Change-Id: I0556ef6fb1ceb02f4972c7434895cfeb5e13188d
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:11 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0 am:
d65dbf91ce
Change-Id: I17fcbac2b6a7860749ddaabf6324cd89e3b78570
Android Build Merger (Role) [Wed, 6 Jun 2018 17:12:04 +0000 (17:12 +0000)]
[automerger] Fix DynamicRefTable::load security bug am:
8cf0f988b0
Change-Id: I17682a41fbacafd30a032bd78b176a883bc7bdd8
Ryan Mitchell [Wed, 30 May 2018 19:17:01 +0000 (12:17 -0700)]
Fix DynamicRefTable::load security bug
DynamicRefTables parsed from apks are missing bounds checks that prevent
buffer overflows. This changes verifies the bounds of the header before
attempting to preform operations on the chunk.
Bug:
79488511
Test: run cts -m CtsAppSecurityHostTestCases \
-t android.appsecurity.cts.CorruptApkTests
Change-Id: I02c8ad957da244fce777ac68a482e4e8fa70f846
Merged-In: I02c8ad957da244fce777ac68a482e4e8fa70f846
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:50 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540 am:
acb5b014af
Change-Id: If7742e7a94602f120b1ec1db9ff763998adae344
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:43 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93 am:
a16b03c540
Change-Id: I3b08cf27f6407fdf5789f8a49c3b3aa49f1c1ecd
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:30 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6 am:
a60d0b2e93
Change-Id: I23ca86e3bf3df6684d88f1be575f2be1599ac9eb
Android Build Merger (Role) [Wed, 6 Jun 2018 16:27:24 +0000 (16:27 +0000)]
[automerger] Optimise the hit test algorithm am:
3b6f84b77c am:
5b224ccf41 skipped:
eb86ac42e6
Change-Id: Ida4ae11d778115fb1f0d373523f71845fff88331
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into nyc-mr1-dev
* changes:
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c am:
42eaa8f932
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c
Optimise the hit test algorithm
Mihai Popa [Wed, 6 Jun 2018 16:21:21 +0000 (16:21 +0000)]
Merge changes from topic "am-
2d17369d-a241-482f-bad0-
edb5147de00b" into nyc-dr1-dev
* changes:
[automerger] Optimise the hit test algorithm am:
71ecf5bd5c
Optimise the hit test algorithm
OSDN Git Service
