OSDN Git Service
Mihai Popa [Wed, 15 Aug 2018 20:48:07 +0000 (13:48 -0700)]
[automerger skipped] Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev am:
d5e6e1e83e -s ours
am:
e82c4b82cc -s ours
Change-Id: I1b7c3d8c456fa438233fa0884567b06f3b63eb4f
Mihai Popa [Wed, 15 Aug 2018 20:38:40 +0000 (13:38 -0700)]
[automerger skipped] Merge "Fix crash during cursor moving on BiDi text" into oc-dev am:
e385255db4
am:
06829a62b1 -s ours
Change-Id: I9563f6fc8afa112e8a8455ffde9a221432cbcbf9
Mihai Popa [Wed, 15 Aug 2018 19:52:34 +0000 (12:52 -0700)]
[automerger skipped] Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev
am:
d5e6e1e83e -s ours
Change-Id: Ie4fb9ca93c435f53cfe6db23b4902b094506b618
Mihai Popa [Wed, 15 Aug 2018 19:43:55 +0000 (12:43 -0700)]
Merge "Fix crash during cursor moving on BiDi text" into oc-dev
am:
e385255db4
Change-Id: Ib094039b1c515af77fcc3c051352de5cb15861cb
Mihai Popa [Wed, 15 Aug 2018 19:17:04 +0000 (19:17 +0000)]
Merge changes from topic "am-
c709fe3e-1c07-4ecd-9998-
2477e3445dd4" into oc-dev
* changes:
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a am:
8f85f5ffd2
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb
Fix crash during cursor moving on BiDi text
Mihai Popa [Wed, 15 Aug 2018 19:16:40 +0000 (19:16 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into oc-dev
Mihai Popa [Wed, 15 Aug 2018 19:16:21 +0000 (19:16 +0000)]
Merge "Fix crash during cursor moving on BiDi text" into oc-mr1-dev
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:15 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a am:
8f85f5ffd2
Change-Id: If854f61c2516a61ac36426c10eafd30bf638e919
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:10 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4 am:
a959ee227a
Change-Id: I7cb6623befc84f76e783b8800aa18ce28a8cc2b7
Android Build Merger (Role) [Wed, 15 Aug 2018 19:13:04 +0000 (19:13 +0000)]
[automerger] Fix crash during cursor moving on BiDi text am:
82c84d5fbb am:
12baaa2bc3 am:
99e3f649b4
Change-Id: I16bff43cf755e443ed53f7a45469351c498f977f
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
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
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
Atanas Kirilov [Tue, 14 Aug 2018 20:46:06 +0000 (13:46 -0700)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into oc-dev am:
9d85c1ff53
am:
3f4c1ece82
Change-Id: I0df7f7f048ebdc8fbfc608ec8e532fbf9fa3a866
Atanas Kirilov [Tue, 14 Aug 2018 20:36:38 +0000 (13:36 -0700)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev am:
5315bbfbc7
am:
02d1a54dcf
Change-Id: Id2ce7a146a5fc65e8c9c24560376a387cef76ca0
Atanas Kirilov [Tue, 14 Aug 2018 20:16:40 +0000 (13:16 -0700)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into oc-dev
am:
9d85c1ff53
Change-Id: I96184594285add35eacbac8e61da3120e4ce67a1
Atanas Kirilov [Tue, 14 Aug 2018 19:59:29 +0000 (12:59 -0700)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev
am:
5315bbfbc7
Change-Id: Ibde8da5add8ee9e51c03b1ebb68b80313a7a5bb6
Atanas Kirilov [Tue, 14 Aug 2018 19:40:27 +0000 (19:40 +0000)]
Merge changes from topic "am-
81126cf1-3777-4130-82b2-
fbb9b5f9bcf8" into oc-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3 skipped:
c565a7f7e2
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[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-mr2-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[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 cw-f-dev
* changes:
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
[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-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.
Atanas Kirilov [Tue, 14 Aug 2018 19:40:14 +0000 (19:40 +0000)]
Merge "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package." into oc-dev
Jeff Sharkey [Fri, 10 Aug 2018 19:28:13 +0000 (12:28 -0700)]
Merge changes from topic "back111085900" into oc-dev am:
f0095ec4d6
am:
5e8e47d4f8
Change-Id: I251eeddbbd73f0747920d757d6a210d0d5b772f5
Jeff Sharkey [Fri, 10 Aug 2018 19:23:42 +0000 (12:23 -0700)]
DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
5a55a72fcd
am:
628667ac86
Change-Id: I8f8645a99e8b3bd07cd82722b8af888d46955030
Jeff Sharkey [Fri, 10 Aug 2018 19:20:08 +0000 (12:20 -0700)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893 am:
b2e2b1386f skipped:
a2ad2596b7 am:
4ccfb1d0aa
am:
efe1afbf93
Change-Id: I7ebe940777eba8ee575a0f970b462e447f241d53
Jeff Sharkey [Fri, 10 Aug 2018 19:12:07 +0000 (12:12 -0700)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209 am:
ca5fd693bc skipped:
19d2af61df am:
f5c1a7ca27
am:
b2ed78a197
Change-Id: I695962bed5fdd932b434244a5c50d33dce34f08b
Jeff Sharkey [Fri, 10 Aug 2018 18:12:36 +0000 (11:12 -0700)]
Merge changes from topic "back111085900" into oc-dev
am:
f0095ec4d6
Change-Id: Ie563f7c17a201dadfe8a6696d2cf99aebc07b855
Jeff Sharkey [Fri, 10 Aug 2018 18:05:51 +0000 (11:05 -0700)]
DO NOT MERGE. Execute "strict" queries with extra parentheses.
am:
5a55a72fcd
Change-Id: I4be4620726e30ca4131320bde074a2e572c51a42
Jeff Sharkey [Fri, 10 Aug 2018 17:58:44 +0000 (10:58 -0700)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893 am:
b2e2b1386f skipped:
a2ad2596b7
am:
4ccfb1d0aa
Change-Id: Iffccf38fd5e090757a2610d7b2cea6f9eacfb51b
Jeff Sharkey [Fri, 10 Aug 2018 17:50:44 +0000 (10:50 -0700)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209 am:
ca5fd693bc skipped:
19d2af61df
am:
f5c1a7ca27
Change-Id: I931e17dba1218ea342f9ec0f17a8a8432e77fc20
Jeff Sharkey [Fri, 10 Aug 2018 17:26:54 +0000 (17:26 +0000)]
Merge changes from topic "back111085900" into oc-dev
* changes:
DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.
DO NOT MERGE. Execute "strict" queries with extra parentheses.
Android Build Merger (Role) [Thu, 9 Aug 2018 20:16:05 +0000 (20:16 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893 am:
b2e2b1386f skipped:
a2ad2596b7
Change-Id: I18dbb198314da3b3722e5b0dfbd9f1dd1e203d4a
Android Build Merger (Role) [Thu, 9 Aug 2018 20:16:00 +0000 (20:16 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893 am:
b2e2b1386f
Change-Id: Icdb977d8cb260d5210d103f306de550b3f8fed96
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:55 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete. am:
8e95967f09 am:
c09bb997e8 am:
424304f893
Change-Id: I4c0f715b12df5e7ffb4f3a1b7cf9ae5da4be22ca
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:44 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209 am:
ca5fd693bc skipped:
19d2af61df
Change-Id: I66ddfbffbec736061780c86c9c9e542fe2a200ba
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:39 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209 am:
ca5fd693bc
Change-Id: Iccacb48d382a3fd8012dff81c3d8482afe0e5f14
Android Build Merger (Role) [Thu, 9 Aug 2018 20:15:33 +0000 (20:15 +0000)]
[automerger] DO NOT MERGE. Execute "strict" queries with extra parentheses. am:
286fd5652a am:
8ecd22c0a4 am:
97d0d2c209
Change-Id: I92820ffe7b45077bc4beaf97144a7b7eb3117af0
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 [Thu, 9 Aug 2018 00:53:03 +0000 (17:53 -0700)]
DO NOT MERGE. Persistable Uri grants still require permissions. am:
05519b7e3d
am:
1e4d88926f
Change-Id: I267a65ad3c2e73b697f832059567f4f2c2438792
Jeff Sharkey [Thu, 9 Aug 2018 00:23:00 +0000 (17:23 -0700)]
DO NOT MERGE. Persistable Uri grants still require permissions.
am:
05519b7e3d
Change-Id: I6d42f089fec6c268b35885d3169644853ab734c5
Jeff Sharkey [Tue, 7 Aug 2018 21:02:17 +0000 (15:02 -0600)]
DO NOT MERGE. Persistable Uri grants still require permissions.
When FLAG_GRANT_PERSISTABLE_URI_PERMISSION is requested, we still
need to check permissions between the source and target packages,
instead of shortcutting past them.
The spirit of the original change is remains intact: if the caller
requested FLAG_GRANT_PERSISTABLE_URI_PERMISSION, then we avoid
returning "-1", which would prevent the grant data structure from
being allocated.
Bug:
111934948
Test: atest android.appsecurity.cts.AppSecurityTests
Change-Id: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030
Merged-In: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030
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
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
Bill Yi [Mon, 30 Jul 2018 06:04:31 +0000 (23:04 -0700)]
Merge changes from topic "am-
c65d7988-0ca0-4757-9d9c-
21f4575eec01" into oc-dev am:
515700b4fe
am:
c93b474752
Change-Id: I94c7b1d7e9bda726390fc5ceba62f8286a06bc42
Bill Yi [Mon, 30 Jul 2018 05:58:06 +0000 (22:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96 skipped:
b71941c9bb am:
976bb372c3 -s ours
am:
27c3ba01ff -s ours
Change-Id: Id3d12a61dbf1a9e7eeabf1c12c39b8aa43ffe52b
Bill Yi [Mon, 30 Jul 2018 05:46:54 +0000 (22:46 -0700)]
Merge changes from topic "am-
1155d171-2145-4903-8420-
80ecfd6c6b08" into oc-dev am:
d0025407df
am:
0834c94a93
Change-Id: I82eb8a2dfab9d3ce1d7b8de91950d9c2069da2db
Bill Yi [Mon, 30 Jul 2018 05:43:33 +0000 (22:43 -0700)]
Merge changes from topic "am-
c65d7988-0ca0-4757-9d9c-
21f4575eec01" into oc-dev
am:
515700b4fe
Change-Id: I0f58a9fe2bb437e8caf854b4ca8f5c4bc0f10c7d
Bill Yi [Mon, 30 Jul 2018 05:41:40 +0000 (22:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96 skipped:
b71941c9bb
am:
976bb372c3 -s ours
Change-Id: I971275a90e048fec4861d2e866ec53c5d1b0a356
Bill Yi [Mon, 30 Jul 2018 05:40:28 +0000 (22:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0 skipped:
eff2a7b637 am:
70ebabc63d -s ours
am:
786ae0d322 -s ours
Change-Id: I1a741c23da3317c1b711a1a58cbf23bc4e97837e
Bill Yi [Mon, 30 Jul 2018 05:19:49 +0000 (22:19 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c781e19f5 skipped:
b3e44fae1f am:
843fb76d1f -s ours
am:
ffe456e49c -s ours
Change-Id: Ifc2aceed944b28d1a9d923f01eb92ab374d67d6b
Bill Yi [Mon, 30 Jul 2018 05:18:03 +0000 (22:18 -0700)]
Merge changes from topic "am-
1155d171-2145-4903-8420-
80ecfd6c6b08" into oc-dev
am:
d0025407df
Change-Id: I7186be0877b4649e3246a05ea610c7c5ee75e542
Bill Yi [Mon, 30 Jul 2018 05:15:41 +0000 (22:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0 skipped:
eff2a7b637
am:
70ebabc63d -s ours
Change-Id: I06839e68100abc88459588a4fec9ef4e04f65c08
TreeHugger Robot [Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)]
Merge changes from topic "am-
c65d7988-0ca0-4757-9d9c-
21f4575eec01" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 30 Jul 2018 05:14:30 +0000 (05:14 +0000)]
Merge changes from topic "am-
c65d7988-0ca0-4757-9d9c-
21f4575eec01" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96 skipped:
b71941c9bb
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96
Import translations. DO NOT MERGE
Bill Yi [Mon, 30 Jul 2018 05:10:47 +0000 (22:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c781e19f5 skipped:
b3e44fae1f
am:
843fb76d1f -s ours
Change-Id: Id1336208575063e2fe1231b7655731132beb7953
TreeHugger Robot [Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)]
Merge changes from topic "am-
1155d171-2145-4903-8420-
80ecfd6c6b08" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0 skipped:
eff2a7b637
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)]
Merge changes from topic "am-
1155d171-2145-4903-8420-
80ecfd6c6b08" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0
Import translations. DO NOT MERGE
TreeHugger Robot [Mon, 30 Jul 2018 05:04:27 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Android Build Merger (Role) [Sun, 29 Jul 2018 15:53:30 +0000 (15:53 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c781e19f5 skipped:
b3e44fae1f
Change-Id: I877e44ea6efe845c0c30a3280b512c1253d727ce
Android Build Merger (Role) [Sun, 29 Jul 2018 15:53:26 +0000 (15:53 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c781e19f5
Change-Id: Ib62c14bc0bb4d205821e8f3b6312c5dca7773fde
Bill Yi [Sun, 29 Jul 2018 15:53:11 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I556f15b9dc9c144d1ddd3bee21f823a52afdfbf4
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 29 Jul 2018 15:40:55 +0000 (15:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96 skipped:
b71941c9bb
Change-Id: I5326a09d8328b9767c6420e08e59374910b3ce49
Android Build Merger (Role) [Sun, 29 Jul 2018 15:40:50 +0000 (15:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
1c484c5d96
Change-Id: I5f7b6e78d38bebadba08ce1e2d18302f5e7464ee
Bill Yi [Sun, 29 Jul 2018 15:40:30 +0000 (08:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I544bbffa43bdf203519441dd1d1b66b54bb54238
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 29 Jul 2018 14:41:02 +0000 (14:41 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0 skipped:
eff2a7b637
Change-Id: Ib22e9ba37dcb69862e8f4c46577e8c240c429c6c
Android Build Merger (Role) [Sun, 29 Jul 2018 14:40:54 +0000 (14:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f9a5e160d0
Change-Id: Ic133994f8f27708e96772601a2dcb5e6173dae28
Bill Yi [Sun, 29 Jul 2018 14:40:09 +0000 (07:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ae5687befc9fd492b9baa7a5ca0bc674a30ebb2
Auto-generated-cl: translation import
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: I2771c048e13529e168121c5a5501aa26fc21e30f
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:40 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3 skipped:
c565a7f7e2
Change-Id: I04c37f5288e234f5eaafa436877fc9279c68bd05
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:33 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815 am:
9310c5bdd3
Change-Id: I83e62233a15ffa1a02ac62e7d1323d342876756f
Android Build Merger (Role) [Thu, 19 Jul 2018 21:29:26 +0000 (21:29 +0000)]
[automerger] RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package. am:
fa69d725eb am:
7d252f5ed7 am:
a491c04815
Change-Id: Id6b495855c7ca0d33aa965556546622bff487dcd
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
Robert Shih [Mon, 16 Jul 2018 20:13:13 +0000 (13:13 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258
am:
dccb62bcca
Change-Id: I9e6762b25f001e31da7df0bb25984856989b9fd9
Robert Shih [Mon, 16 Jul 2018 19:51:28 +0000 (12:51 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
am:
e43837e258
Change-Id: Ib0ef741f0188ff3e6edc52e20eae997e9dba56e4
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge "Fix TrackInfo parcel write" into nyc-dev
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
* changes:
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675 am:
d6143e9307
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc
Fix TrackInfo parcel write
Bernie Innocenti [Fri, 13 Jul 2018 16:28:11 +0000 (09:28 -0700)]
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am:
8f1c70e49b
am:
d1f53d13a9 -s ours
Change-Id: I293fc38d50e75b0b021dff6af045ac8a2aa6927f
Bernie Innocenti [Fri, 13 Jul 2018 16:17:40 +0000 (09:17 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
am:
8f1c70e49b
Change-Id: Ic103dfa909ca4567a815b16f0794baf74c1cf068
TreeHugger Robot [Fri, 13 Jul 2018 16:05:32 +0000 (16:05 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev
TreeHugger Robot [Fri, 13 Jul 2018 16:05:27 +0000 (16:05 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev
Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:21 +0000 (06:57 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675 am:
d6143e9307
Change-Id: I67d3d47cf3ba616d8b8d963d7092895621f63200
Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:15 +0000 (06:57 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675
Change-Id: I1f39ec37a6e4fa163caf51702e0924cc9c89ee04
Android Build Merger (Role) [Fri, 13 Jul 2018 06:57:08 +0000 (06:57 +0000)]
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca
Change-Id: I29f00c9b6dca76c5b780d659d122e08a0d7e581c
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
Bill Yi [Thu, 12 Jul 2018 20:17:45 +0000 (13:17 -0700)]
Merge changes from topic "am-
9f47cb6c-9cea-4b25-9f9b-
e0e460e471ac" into oc-dev am:
71bd839856
am:
262d6935a0
Change-Id: Ic9027e92228853ab6dffacf72c0afc3920946d19
Bill Yi [Thu, 12 Jul 2018 20:10:22 +0000 (13:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
f4037fb69e skipped:
741c97faa9 am:
0c31d81cd1 -s ours
am:
afb05522f1 -s ours
Change-Id: I92e39d42756e8d5d7f517802ddbdc8e539024d88
Bill Yi [Thu, 12 Jul 2018 20:08:42 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e059d5fb83 skipped:
e97378c657 am:
9935787f3b -s ours
am:
bf789ba0d1 -s ours
Change-Id: I157f816f170fc9af6263e552a46612fab2760f63
OSDN Git Service
