git.osdn.net Git - android-x86/frameworks-base.git/log

OSDN Git Service

(root) / android-x86 / frameworks-base.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

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

commit | commitdiff | tree

Wayne Lin [Mon, 1 Oct 2018 05:45:25 +0000 (05:45 +0000)]

Merge "[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control" into oc-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:44:56 +0000 (05:44 +0000)]

Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5
  [automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:43:47 +0000 (05:43 +0000)]

Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5
  [automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:42:36 +0000 (05:42 +0000)]

Merge changes from topic "am-95ed1a42-c734-497b-9e03-f8de9f42ea61" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28
  [automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:41:34 +0000 (05:41 +0000)]

Merge changes from topic "am-25c8f1dd-79b2-410a-8aa9-2fe914e32aa3" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a
  [automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:40:26 +0000 (05:40 +0000)]

Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2
  [automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:39:25 +0000 (05:39 +0000)]

Merge changes from topic "am-2e7b32c3-6d04-46ba-bfdc-309eff7d76b0" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177
  [automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8
  Import translations. DO NOT MERGE

commit | commitdiff | tree

TreeHugger Robot [Mon, 1 Oct 2018 05:38:16 +0000 (05:38 +0000)]

Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev

* changes:
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae
  [automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Wayne Lin [Thu, 13 Sep 2018 06:09:47 +0000 (14:09 +0800)]

[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point control

SUPL_ES=1 ensures the GnssLocationProvider and related framework code
accepts incoming SMS SUPL_INIT messages with ES-bit=1
(which allow redirection of the ESLP
end-point e.g. to the current local emergency services provider when
you are travelling) only during an emergency call

Bug: 115331218
Bug: 112159033
Test: Build pass
Change-Id: I4cd6832c065eb790981d6864a7d140fe64bc7356
Merged-In: I5075f7887a184ce18bb1815b35a2ce7acd8bca10

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 14:29:09 +0000 (14:29 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905 skipped: ebf64faa28

Change-Id: I19569fa366d950bfbc0edbc0f5192941a0e53f1a

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 14:28:59 +0000 (14:28 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 4310d4d905

Change-Id: I3e32708f8256546d3f80fc754af7f1f93bcf4eeb

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 14:28:34 +0000 (07:28 -0700)]

Import translations. DO NOT MERGE

Change-Id: Idbecc605a11e21c5135682deec928b6d48a43eb4
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 14:22:47 +0000 (14:22 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2

Change-Id: I5fb47e70e875b563287122bb003c4ef600933540

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 14:22:35 +0000 (14:22 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972

Change-Id: I26a0651ab8352744f54468d34f0409d0eb8f7930

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 14:22:12 +0000 (07:22 -0700)]

Import translations. DO NOT MERGE

Change-Id: I450f670e7cbe292d8d106331fe13c8439e076861
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 13:29:56 +0000 (13:29 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5

Change-Id: Ia04eeeb8205991351086706ae38f3af5f6d954ab

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 13:29:43 +0000 (13:29 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8

Change-Id: Iaf434a5575965995d5daa15a083e0e679a73b508

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 13:29:22 +0000 (06:29 -0700)]

Import translations. DO NOT MERGE

Change-Id: I39386c643d2d1dbfa360257407e6534883e1b3b0
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 13:19:02 +0000 (13:19 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5

Change-Id: Iae4d410b482b3dab1f607cfe6be36901f2acc448

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 13:18:47 +0000 (13:18 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520

Change-Id: I619f28b5ebea75c568b6b9dc6d0ac16870619be0

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 13:18:17 +0000 (06:18 -0700)]

Import translations. DO NOT MERGE

Change-Id: I989d81faf1fce9338a30f4b89d6ab01f4a5c4a02
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 13:07:35 +0000 (13:07 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8 skipped: 5883bd3177

Change-Id: I602bacf08051d3d112a43f8559166c12eec993f9

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 13:07:25 +0000 (13:07 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: b19a62bcf8

Change-Id: If0f6fc2ec219fc27201f4d907008e082e6e194ee

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 13:07:00 +0000 (06:07 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic381ee9e91646a44ffd0de0060758753fe0b128b
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 12:41:16 +0000 (12:41 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a

Change-Id: I3a14cd01a1fd3a6e2afab24b32c66bed6380bffe

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 12:41:02 +0000 (12:41 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae

Change-Id: I482be7b38a2da01e29fad0ef3051c51fe9b8b941

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 12:40:29 +0000 (05:40 -0700)]

Import translations. DO NOT MERGE

Change-Id: I29393152567735bae14379e51c14ead7be31e6d2
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 12:35:02 +0000 (12:35 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d

Change-Id: Iab79e57d33e496e6a7a8d6254490684b940c8b32

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 12:34:48 +0000 (12:34 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932

Change-Id: I72bd220fef91e2a5bc5b7774d5195b0f65099b48

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 12:34:07 +0000 (05:34 -0700)]

Import translations. DO NOT MERGE

Change-Id: I4abcce26cc5b73a42f658d10e85154948949136c
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 12:23:33 +0000 (12:23 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f skipped: 07dfa0baae

Change-Id: I009164bbe332a77f8967c76f2c417e8958e5c57a

commit | commitdiff | tree

Android Build Merger (Role) [Sun, 30 Sep 2018 12:23:14 +0000 (12:23 +0000)]

[automerger skipped] Import translations. DO NOT MERGE skipped: 5587649e8f

Change-Id: I20e457d90615a005e83f7f3c46006a505deee29b

commit | commitdiff | tree

Bill Yi [Sun, 30 Sep 2018 12:22:43 +0000 (05:22 -0700)]

Import translations. DO NOT MERGE

Change-Id: I85f31d6bac9ff093dd6ef9d129126dfc96b92e4e
Auto-generated-cl: translation import

commit | commitdiff | tree

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-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [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."

commit | commitdiff | tree

Atanas Kirilov [Fri, 28 Sep 2018 23:21:47 +0000 (23:21 +0000)]

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [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."

commit | commitdiff | tree

Atanas Kirilov [Fri, 28 Sep 2018 23:21:46 +0000 (23:21 +0000)]

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 skipped: 50861d59c2
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be
  [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."

commit | commitdiff | tree

Atanas Kirilov [Fri, 28 Sep 2018 23:21:09 +0000 (23:21 +0000)]

Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."" into oc-dev

commit | commitdiff | tree

Atanas Kirilov [Fri, 28 Sep 2018 23:20:32 +0000 (23:20 +0000)]

Merge changes from topic "am-9d36a543-b4f5-4e8c-89c9-8dc49a83a644" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 skipped: 90b8425c0b
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe
  [automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."

commit | commitdiff | tree

Atanas Kirilov [Fri, 28 Sep 2018 23:20:29 +0000 (23:20 +0000)]

Merge "RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."" into oc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Sep 2018 20:35:10 +0000 (20:35 +0000)]

[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." am: 999e3fe986 am: 79c6a599fe am: 446837c874 am: 84b50e6a10 skipped: 90b8425c0b

Change-Id: I614084f668b63261c14748b9dc0faf7c94aaedbd

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:53 +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 am: 446837c874 am: 84b50e6a10

Change-Id: I2df84d1d165f276b0da0aa58c4945f9a5d89e31f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:40 +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 am: 446837c874

Change-Id: I01bfdf7bcc657acf3827aa0b1675adf107562f8a

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:39 +0000 (20:34 +0000)]

[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70 skipped: 50861d59c2

Change-Id: I60d4127489f1d8f26deb7ad822e16141cc4a4b16

commit | commitdiff | tree

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

commit | commitdiff | tree

Atanas Kirilov [Fri, 28 Sep 2018 20:22:08 +0000 (20:22 +0000)]

RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."

This reverts commit 05dc947c63a2304adce53a0aef6b0e0a9db9343a.

Reason for revert: Not a security fix and the security fix needs this cl is reverted.
Bug: 114365189

Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:21 +0000 (20:34 +0000)]

[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be am: 276f6cbb70

Change-Id: If5cdbd2e616e8441fe469950342114c6771d1571

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 28 Sep 2018 20:34:04 +0000 (20:34 +0000)]

[automerger] RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." am: 95a3e91846 am: 94e1a09bc6 am: 84756be0be

Change-Id: I83b2b097d30d2ea1fae3361cc06c503d61a444e8

commit | commitdiff | tree

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

commit | commitdiff | tree

Atanas Kirilov [Fri, 28 Sep 2018 20:16:37 +0000 (20:16 +0000)]

RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package."

This reverts commit 821076440434443af4257c5ba0b7b1f037735041.

Reason for revert: triggers other issue.
Bug: 114365189

Change-Id: If6f500e8abdc343774c5e853ba8e7c457ffa5961

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev

* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec am: 686897ddd9
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [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

commit | commitdiff | tree

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-mr2-dev

* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [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

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Sep 2018 01:29:28 +0000 (01:29 +0000)]

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into cw-f-dev

* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53
  [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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 6 Sep 2018 00:48:33 +0000 (00:48 +0000)]

Merge "Hide overlay windows when requesting media projection permission." into oc-dev

commit | commitdiff | tree

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-mr2-dev

* changes:
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a
  [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.

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]

Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into cw-f-dev

* changes:
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a
  [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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Sep 2018 23:39:21 +0000 (23:39 +0000)]

Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev

* changes:
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596 skipped: 6619efdd68
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596
  [automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a
  [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.

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Sep 2018 23:19:12 +0000 (23:19 +0000)]

Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev

commit | commitdiff | tree

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-mr2-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
  RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]

Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into cw-f-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
  RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Sep 2018 22:24:16 +0000 (22:24 +0000)]

Merge changes from topic "am-bada3a56-09dc-47f9-ba2e-42434cf270e2" into oc-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e skipped: 2e5c1ed2ad
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5
  [automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009
  RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.

commit | commitdiff | tree

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
Merged-In: I57cb0f390d9a78e721c5ddce49a377d385002753

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Sep 2018 20:39:21 +0000 (20:39 +0000)]

[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e skipped: 2e5c1ed2ad

Change-Id: Iaec0b5ba5b3adeb6ac1150c7e2cc5534432def11

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Sep 2018 20:39:13 +0000 (20:39 +0000)]

[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5 am: 3290f3b22e

Change-Id: If7b764f16eaf2bdc7f5327351e74458fad48d250

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Sep 2018 20:39:05 +0000 (20:39 +0000)]

[automerger] RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission. am: 295af36009 am: 7ee280f8b5

Change-Id: Ic52ca75008a7a428fae62f9e1adc861ec51abc09

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:14 +0000 (20:38 +0000)]

[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596 skipped: 6619efdd68

Change-Id: I228c8aa69b9a20c00153f961dc8459aa7d839e39

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:06 +0000 (20:38 +0000)]

[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a skipped: defeb8c596

Change-Id: Ia209169eb2587ede53cc0199c5eaa79f5819e674

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Sep 2018 20:38:00 +0000 (20:38 +0000)]

[automerger skipped] Hide overlay windows when requesting media projection permission. skipped: 5c3f5a02bd skipped: 3eb97a9bd9 skipped: 50f6c53a1a

Change-Id: I1e986e823c9fcb1fc11e3d634e0c6b31725a57c5

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Aug 2018 20:46:20 +0000 (20:46 +0000)]

[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec am: 686897ddd9

Change-Id: I07c1d68a0c5d8da6ec81c717dff97d33dba86a16

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Aug 2018 20:46:12 +0000 (20:46 +0000)]

[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec

Change-Id: I8375f1c1a860f5021efc5873e94b452a44d6c145

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 30 Aug 2018 20:46:05 +0000 (20:46 +0000)]

[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53

Change-Id: Id32bd5aa02d5689873bb311eebc87f367af9a9d9

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:45 +0000 (22:45 +0000)]

[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83 skipped: 879ecd17ab

Change-Id: I8aa91170ea26a60a714f05ce59a27a8c510ac197

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:36 +0000 (22:45 +0000)]

[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342 am: ee4a2aee83

Change-Id: Ieaa5386305a8d359b5b79d99925bd12696bbce2a

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 24 Aug 2018 22:45:29 +0000 (22:45 +0000)]

[automerger] RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions. am: 8da6786608 am: 7d153c56c6 am: eff2a46342

Change-Id: I2f97a9e176348ae81e9d72f8cb3c22e3f74c0a81

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 17 Aug 2018 18:56:28 +0000 (18:56 +0000)]

Merge "RESTRICT AUTOMERGE Relax security exception for backport" into oc-dev

commit | commitdiff | tree

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-mr2-dev

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573 am: 7693ce7eaf
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573
  [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

commit | commitdiff | tree

Mihai Popa [Wed, 15 Aug 2018 19:23:35 +0000 (19:23 +0000)]

Merge changes from topic "am-0f30ee3d-94a0-4dc3-bb14-762781265ad9" into cw-f-dev

* changes:
  [automerger] Fix crash during cursor moving on BiDi text am: 95218ce7ea am: b7a2d47ec2 skipped: 723f13d01f am: 04c7154fd9 am: 65082f8f5b am: 74ffd2bc55 am: f7f008f573
  [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

commit | commitdiff | tree

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

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.