OSDN Git Service

android-x86/frameworks-base.git
6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf...
Bill Yi [Mon, 16 Apr 2018 19:14:27 +0000 (12:14 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054 am: bfcb8b99a5  -s ours
am: f62419973f  -s ours

Change-Id: I37dbec1d64219b2c2b57da0535364606b527f3f3

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d...
Bill Yi [Mon, 16 Apr 2018 18:58:54 +0000 (11:58 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425 am: cb80417eab  -s ours
am: 3194fdd40a  -s ours

Change-Id: I67f37180a53bdd87975f458ce68ae75890ebec29

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf...
Bill Yi [Mon, 16 Apr 2018 18:56:07 +0000 (11:56 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054
am: bfcb8b99a5  -s ours

Change-Id: I9573bb5fb938d29fbd40c94bb36203607bacdfee

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972...
Bill Yi [Mon, 16 Apr 2018 18:55:52 +0000 (11:55 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288 am: 67841fe1e6  -s ours
am: 97ddc81da4  -s ours

Change-Id: I0a2be41354fd01b370c95f0f77d67c878bb84d55

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d...
Bill Yi [Mon, 16 Apr 2018 18:52:51 +0000 (11:52 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425
am: cb80417eab  -s ours

Change-Id: I29e67171958497655f4d0374b2decbc1429135f7

6 years ago[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972...
Bill Yi [Mon, 16 Apr 2018 18:49:23 +0000 (11:49 -0700)]
[automerger skipped] [automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288
am: 67841fe1e6  -s ours

Change-Id: Ic7684c0d86e85aaebfb4e459d4dbd57d0d67d3b9

6 years ago[automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:53 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am: ba2da34cdf skipped: 9812374054

Change-Id: I7cb9fde2607bd5cf254218df7922c552f200d425

6 years ago[automerger] Import translations. DO NOT MERGE am: ba2da34cdf
Android Build Merger (Role) [Mon, 16 Apr 2018 18:42:48 +0000 (18:42 +0000)]
[automerger] Import translations. DO NOT MERGE am: ba2da34cdf

Change-Id: Ic48e117b51a8f0d3c2f9a45536b4f85f9100b43e

6 years ago[automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:14 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d skipped: 8383370425

Change-Id: Id86be4edea769f62ae4dd3de5a21a6fe8471151d

6 years ago[automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d
Android Build Merger (Role) [Mon, 16 Apr 2018 18:39:09 +0000 (18:39 +0000)]
[automerger] Import translations. DO NOT MERGE am: aaf2bd3c6d

Change-Id: I1a5a8473bb77a315ce84e2656e5640488ecb7881

6 years ago[automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288
Android Build Merger (Role) [Mon, 16 Apr 2018 18:33:00 +0000 (18:33 +0000)]
[automerger] Import translations. DO NOT MERGE am: c7fe3a5972 skipped: 9a64c59288

Change-Id: Iaf447a22df4ace00079a63066b0dcadce145443b

6 years ago[automerger] Import translations. DO NOT MERGE am: c7fe3a5972
Android Build Merger (Role) [Mon, 16 Apr 2018 18:32:54 +0000 (18:32 +0000)]
[automerger] Import translations. DO NOT MERGE am: c7fe3a5972

Change-Id: I9ec7fb1d5c5657b8b4936303d39fbecff498eb46

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Bill Yi [Mon, 16 Apr 2018 00:08:34 +0000 (17:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28 am: d12aff917a  -s ours
am: 06e9f9dad5  -s ours

Change-Id: I87341fd783f4e18607921d0023c0a8d9bb2cdaf6

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Bill Yi [Mon, 16 Apr 2018 00:03:09 +0000 (17:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28
am: d12aff917a  -s ours

Change-Id: I7400a1e8da6fde612c5b130228b28cf25ce5b99c

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e
Philip P. Moltmann [Sun, 15 Apr 2018 00:36:23 +0000 (17:36 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev am: 6173fbe12e
am: 6a845fe056

Change-Id: I5aebe2f67ad5f0f748db1b45c2b4ad6a1c4df530

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
Philip P. Moltmann [Sun, 15 Apr 2018 00:26:51 +0000 (17:26 -0700)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
am: 6173fbe12e

Change-Id: I9f8435dbdee7c532c68542e5a1de75e97dfc6dea

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Philip P. Moltmann [Sun, 15 Apr 2018 00:25:40 +0000 (17:25 -0700)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805 am: 877a845005
am: 885bcab242

Change-Id: Iec02fbfef86e421f0c7b6efc8dd49184bc39a6be

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Philip P. Moltmann [Sun, 15 Apr 2018 00:14:53 +0000 (17:14 -0700)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805
am: 877a845005

Change-Id: Ifd815fa2dcabe164a7445654ac9f2374c7a7db9e

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf
Philip P. Moltmann [Sat, 14 Apr 2018 23:37:25 +0000 (16:37 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev am: cda08919cf
am: d139755de8

Change-Id: I3607d28823ced42c14d39d99bbfd8ea346cfc835

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
Philip P. Moltmann [Sat, 14 Apr 2018 23:28:15 +0000 (16:28 -0700)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
am: cda08919cf

Change-Id: I949f16944d202078a1f191a1284f1c48a46cbb58

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped...
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:14 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2 skipped: 1789ac6b28

Change-Id: I07cc5ff54cd477b8ea8ff6a448f7bd3622a9eb8d

6 years ago[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2
Android Build Merger (Role) [Sat, 14 Apr 2018 23:05:09 +0000 (23:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped: 9b8bceedc2

Change-Id: Iaceae5c38f84ffe2ec85ea9b7219da86a857487c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 14 Apr 2018 23:04:25 +0000 (16:04 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 14 Apr 2018 21:59:57 +0000 (14:59 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 14 Apr 2018 21:35:24 +0000 (14:35 -0700)]
Import translations. DO NOT MERGE

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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 14 Apr 2018 21:00:11 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE

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

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into oc-dev

* changes:
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7 skipped: f421873d6f
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627
  DO NOT MERGE (N) Revoke permision when group changed

6 years agoMerge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr2-dev
TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]
Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806
  [automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627
  DO NOT MERGE (N) Revoke permision when group changed

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev
Philip P. Moltmann [Sat, 14 Apr 2018 01:09:04 +0000 (01:09 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-mr1-dev

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:56 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0 skipped: f1776f0805

Change-Id: I18b5a81159834936591727793777557749128589

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:52 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f am: 9b71a72cb0

Change-Id: Ib6b064e5ea956d7ecd98bb3f7c04bbc43dc783ba

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:46 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f am: 874fe98a8f

Change-Id: Idea79fe96e755a47851bee4779bd1d7f589881f5

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:41 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5 am: 8dbf706e9f

Change-Id: If22b28a0ed93f1ab3fb0380ebc67281591720e24

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:35 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4 am: 1bbc69d8f5

Change-Id: I5f5ba660e59867e17a5cd0f8dcfb0afb2f3060da

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:25 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e skipped: 275e6bf1b4

Change-Id: I40f818e3e3174645c8786263ddbe6428ce927084

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:19 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178 am: 90cb8f7b6e

Change-Id: I12743702ec15b7d92b0197496e8a3426777ed4db

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:14 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53 am: 5630564178

Change-Id: I5220d4063a27154243b74e7cd43dc8fd8ffdeb51

6 years ago[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53
Android Build Merger (Role) [Sat, 14 Apr 2018 01:07:08 +0000 (01:07 +0000)]
[automerger] DO NOT MERGE (M) Revoke permision when group changed am: d87a1a7d53

Change-Id: Ie178331d03d590e50a81117498a0f5dabe4d83ae

6 years agoDO NOT MERGE (M) Revoke permision when group changed
Philip P. Moltmann [Thu, 12 Apr 2018 23:44:43 +0000 (16:44 -0700)]
DO NOT MERGE (M) Revoke permision when group changed

If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.

Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.

This is undesirable, hence we revoke the permission during the update
process.

Test: atest android.permission.cts.PermissionGroupChange
Bug: 72710897
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:05:08 +0000 (01:05 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7 skipped: f421873d6f

Change-Id: Ic67fd7dadddf7a727dc075cba0fcfa8db7984512

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:05:02 +0000 (01:05 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93 am: abbad1d1d7

Change-Id: I92684e1b95d265795996222d869ab1457a97dbe2

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:55 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806 am: 1111596b93

Change-Id: I31c8e9d69b1234c7e63c8c45385e7bf743a10b7c

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627...
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:49 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627 am: 419b357806

Change-Id: I4253d70e283336dfd52f821d5a649b8caf2bfd01

6 years ago[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627
Android Build Merger (Role) [Sat, 14 Apr 2018 01:04:40 +0000 (01:04 +0000)]
[automerger] DO NOT MERGE (N) Revoke permision when group changed am: 5aee569627

Change-Id: Ib1696ad75e93be83eef20dd016eff2d83462ea92

6 years agoDO NOT MERGE (N) Revoke permision when group changed
Philip P. Moltmann [Thu, 12 Apr 2018 20:48:13 +0000 (13:48 -0700)]
DO NOT MERGE (N) Revoke permision when group changed

If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.

Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.

This is undesirable, hence we revoke the permission during the update
process.

Test: atest android.permission.cts.PermissionGroupChange
Bug: 72710897
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339

6 years agoMerge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev
TreeHugger Robot [Sat, 14 Apr 2018 00:35:38 +0000 (00:35 +0000)]
Merge "DO NOT MERGE (O) Revoke permision when group changed" into oc-dev

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
y [Fri, 13 Apr 2018 21:08:07 +0000 (14:08 -0700)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910 am: 86cfcaa610
am: 4f5e234020

Change-Id: Iedf59329ed35149cec2143e8f179c7912534a41d

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
y [Fri, 13 Apr 2018 20:57:36 +0000 (13:57 -0700)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910
am: 86cfcaa610

Change-Id: I6d37d24fd14271d24595c380ea553cb37948fa9e

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
Android Build Merger (Role) [Fri, 13 Apr 2018 20:35:02 +0000 (20:35 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910

Change-Id: I971b589190cae708a08dd568290807dff0f75349

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:58 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72

Change-Id: Ibeb5d99f477048e8715a0d4b093052f3d88445e2

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:53 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba

Change-Id: I48bf9619571a30e6f5ea5bad503a3805e0821a75

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:49 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530

Change-Id: I068f51adbb0248db232c50bd89fb25ef0d7273a9

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:44 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa

Change-Id: I61c158947f3508aab9ef65988267562663c97a21

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:34 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40

Change-Id: I24a1df41eb29a6ac7e6c67368f07c6702dacf071

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50...
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:29 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344

Change-Id: Ia175db4206119bed5e1a6b1aeeff72ae86489d38

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:24 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50

Change-Id: I0a5c57b7a50d9221b3be4d193388ac610ba92f73

6 years ago[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261
Android Build Merger (Role) [Fri, 13 Apr 2018 20:34:20 +0000 (20:34 +0000)]
[automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261

Change-Id: I57e2ea2122d22341c43b9b445291cc4b02ec2b11

6 years agoResStringPool: Fix security vulnerability
y [Fri, 6 Apr 2018 00:57:27 +0000 (17:57 -0700)]
ResStringPool: Fix security vulnerability

Adds detection of attacker-modified size and data fields passed to
ResStringPool::setTo(). These attacks are modified apks that AAPT would
not normally generate. In the rare case this occurs, the installation
cannot be allowed to continue.

Bug: 71361168
Bug: 71360999
Test: run cts -m CtsAppSecurityHostTestCases \
          -t android.appsecurity.cts.CorruptApkTests

Change-Id: If7eb93a9e723b16c8a0556fc4e20006aa0391d57
Merged-In: If7eb93a9e723b16c8a0556fc4e20006aa0391d57

6 years agoDO NOT MERGE (O) Revoke permision when group changed
Philip P. Moltmann [Thu, 12 Apr 2018 21:45:14 +0000 (14:45 -0700)]
DO NOT MERGE (O) Revoke permision when group changed

If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.

Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.

This is undesirable, hence we revoke the permission during the update
process.

Test: atest android.permission.cts.PermissionGroupChange
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339
Fixes: 72710897

6 years agoDO NOT MERGE (O) Revoke permision when group changed
Philip P. Moltmann [Thu, 12 Apr 2018 21:45:14 +0000 (14:45 -0700)]
DO NOT MERGE (O) Revoke permision when group changed

If a run time permission of a group is already granted we grant the
other permission of the group automatically when requested.

Hence if an already granted permission changed its group during an
update suddenly permission of a potentially not approved group will
get auto-granted.

This is undesirable, hence we revoke the permission during the update
process.

Test: atest android.permission.cts.PermissionGroupChange
Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339
Fixes: 72710897

6 years ago[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framew...
akirilov [Tue, 10 Apr 2018 18:23:14 +0000 (11:23 -0700)]
[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev) am: e5776af814
am: 531975da75  -s ours

Change-Id: I3df7a9b0722b57c3059ec86ede4e93652404df61

6 years agoRESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to...
akirilov [Tue, 10 Apr 2018 18:11:53 +0000 (11:11 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev)
am: e5776af814

Change-Id: If7a7b5f316cbf8640e0760e590b279494e5341ac

6 years agoRESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to...
akirilov [Tue, 27 Mar 2018 20:08:47 +0000 (13:08 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev)

Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

Bug: 69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
Merged-In: If3752e106aa7fdee4645dc9852289af471ceff18

6 years agoMerge "RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport...
TreeHugger Robot [Mon, 9 Apr 2018 23:43:01 +0000 (23:43 +0000)]
Merge "RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-mr1-dev)" into oc-mr1-dev

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
akirilov [Mon, 9 Apr 2018 22:54:48 +0000 (15:54 -0700)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456 skipped: bae1ea6478 am: 840e366d50
am: 1e4dfe7d71

Change-Id: I9947716a6cd7ba5e6b8de63e3036b4d21d139691

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
akirilov [Mon, 9 Apr 2018 22:40:46 +0000 (15:40 -0700)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456 skipped: bae1ea6478
am: 840e366d50

Change-Id: I920dc967f00b4197dcb5702111efc9fda0e930de

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
akirilov [Mon, 9 Apr 2018 22:36:59 +0000 (15:36 -0700)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23 skipped: 4fbc80f05b am: dc5ccd8d30
am: 70cff3248e

Change-Id: I2cb7a7012c1bb872fb4cd67f69351c79c51f550e

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
akirilov [Mon, 9 Apr 2018 22:25:14 +0000 (15:25 -0700)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23 skipped: 4fbc80f05b
am: dc5ccd8d30

Change-Id: Ie8ba1d050f753d91fa9304f579b9ef1db701ffc4

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:32 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456 skipped: bae1ea6478

Change-Id: I67ae802c25bfdaa1a5a7b7bc6880d954e30f3e27

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:28 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456

Change-Id: I1d6b280c14a7a6166221ea0d1448de7bc7feb18c

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:22 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116

Change-Id: Ib3a14de258a548393279940fd3aeb067f2596ca8

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:16 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61

Change-Id: If515d9ec229e37bdc1368a96ae1f1b474dd50ebe

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 22:24:08 +0000 (22:24 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c

Change-Id: I793b787b6275262f1df6caa9262054e15c94840f

6 years agoRESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to...
akirilov [Tue, 27 Mar 2018 20:08:47 +0000 (13:08 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev)

Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

Bug: 69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:57 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23 skipped: 4fbc80f05b

Change-Id: I31f7f0b24c4abb211837b4143bd17922cbd910a1

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:53 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23

Change-Id: Idc5e03ce291191f07f6be769ee777e6dd8f59915

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:48 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287

Change-Id: I04b6008abff856d7998566a2e9136d62d6ac9c5e

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:43 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4

Change-Id: I4c4a136d4c77b6f1ba869992bb54be2ac755a9f7

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:38 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e

Change-Id: Ibbfaf7f47f2471895f7fd5151be1230de51ff258

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:26 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9

Change-Id: Idc789e68b33b1f8fd841204ce9ffb4b988f9c553

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:20 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521

Change-Id: I9f6c6fedfdc987a2acf1978a71fb0bdcd034e9e0

6 years agoRESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to...
akirilov [Tue, 27 Mar 2018 20:08:47 +0000 (13:08 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-mr1-dev)

Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

Bug: 69981755
Change-Id: If3752e106aa7fdee4645dc9852289af471ceff18
Merged-In: I13304efbee10d1affa087e9c8bc4ec237643283e

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:15 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559

Change-Id: Ib50692050fd4e62ad80f24531818a378c75dfe25

6 years ago[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework...
Android Build Merger (Role) [Mon, 9 Apr 2018 21:00:08 +0000 (21:00 +0000)]
[automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a

Change-Id: I000fae45e723679ba44b378a36a85daef20ae96d

6 years agoRESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to...
akirilov [Thu, 22 Mar 2018 21:01:44 +0000 (14:01 -0700)]
RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev)

Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts --package android.accessibilityservice
      cts-tradefed run cts --package android.accessibility

BUG:69981755

Change-Id: Id9990ccf1e88cea441f9b8927e849e67a059cfe4

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Dianne Hackborn [Mon, 9 Apr 2018 20:49:47 +0000 (13:49 -0700)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da am: 65b3f30dfe am: e55d5fca11
am: b39b2018e1

Change-Id: Id9abd97ef188ed9ac025ddbafc7a50d5f2b342a3

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Dianne Hackborn [Mon, 9 Apr 2018 20:37:50 +0000 (13:37 -0700)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da am: 65b3f30dfe
am: e55d5fca11

Change-Id: Idba3148fd606f4061d79cced3a4583258e48492d

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:18:09 +0000 (20:18 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da am: 65b3f30dfe

Change-Id: I37d65e9e885739b3f4a897f9ceabe221534e65f8

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:18:03 +0000 (20:18 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da

Change-Id: Ic1cb5a34385d6cbdb2e332fd96b6caf6c53b353b

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:57 +0000 (20:17 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914

Change-Id: Id6bc4a730ed862e380eb3b396a61999c56d2c679

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:52 +0000 (20:17 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32

Change-Id: I4a2e77198d157f52266095338cf118896fb53348

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:44 +0000 (20:17 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1

Change-Id: I29865f40b20c86a3d13493886cfe818638075fea

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:24 +0000 (20:17 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62

Change-Id: Id581b577b7c21bca96019a0a1b9c4bb3c3abc7f6

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:15 +0000 (20:17 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e

Change-Id: I9719266bad39cd58527b0aaeec10b39a1eba3509

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:17:09 +0000 (20:17 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286

Change-Id: Ic3796cc42e2ce78558fe47cff83e19d1aa52cea1

6 years ago[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am...
Android Build Merger (Role) [Mon, 9 Apr 2018 20:16:59 +0000 (20:16 +0000)]
[automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725

Change-Id: Ic2e2b8d07e1f9872189282923114846db3b3c94c

6 years agoFix issue #27317952: PendingIntent.getIntent() should be protected
Dianne Hackborn [Tue, 1 Mar 2016 02:02:43 +0000 (18:02 -0800)]
Fix issue #27317952: PendingIntent.getIntent() should be protected

Bug: 64752751
Change-Id: Ib05135cd94f5251942a6fc6df542ed39083f7827
(cherry picked from commit e5ad41bc022db99c4f6663da0a9e49356c006741)

6 years agoUse concrete CREATOR instance for parceling lists am: 4921986db7
Fyodor Kupolov [Mon, 2 Apr 2018 22:59:23 +0000 (22:59 +0000)]
Use concrete CREATOR instance for parceling lists am: 4921986db7
am: 609bc2d63e

Change-Id: I4d1315586acd143cece0c27c08084012b7b18e22

6 years agoUse concrete CREATOR instance for parceling lists
Fyodor Kupolov [Mon, 2 Apr 2018 22:46:26 +0000 (22:46 +0000)]
Use concrete CREATOR instance for parceling lists
am: 4921986db7

Change-Id: I935e9a5db9faaf150a6472e49dc5a900bdf30b5a

6 years agoMerge "docs: fixed a couple of typos" into oc-mr1-dev
Joshua Baxter [Wed, 28 Mar 2018 21:54:29 +0000 (21:54 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev