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

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

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Fyodor Kupolov [Fri, 16 Mar 2018 19:20:40 +0000 (12:20 -0700)]

Use concrete CREATOR instance for parceling lists

Replaced readTypedArrayList/writeTypedArrayList with
writeTypedList/createTypedArrayList(CREATOR)

Bug: 71508348
Test: CtsAutoFillServiceTestCases pass
Merged-In: I2a8321023b40cc74b7026eb0fb32a9cc5f5543a9
Change-Id: Id17d02e40a4ae567bf2d74d2ea8ba4d8a943bdb7

commit | commitdiff | tree

TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]

Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into nyc-mr2-dev

* changes:
[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac
DO NOT MERGE: Restoring Network Available Notification to AGnssRil

commit | commitdiff | tree

TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]

Merge "DO NOT MERGE: Restoring Network Available Notification to AGnssRil" into cw-f-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 15 Mar 2018 21:39:46 +0000 (21:39 +0000)]

Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev

* changes:
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac skipped: d3ef137680
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac
  DO NOT MERGE: Restoring Network Available Notification to AGnssRil

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:14 +0000 (20:00 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855 skipped: 1160018fef

Change-Id: I1b2bb3c0c2adf15d344697381e5651b9a6adbf9f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:09 +0000 (20:00 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855

Change-Id: Ia2f661ae02c925da5d6e05f96983cc3f606cd9bd

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 20:00:04 +0000 (20:00 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2

Change-Id: I6388ec63ab6d29d1b002cc296571e67278245fc0

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:59 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f

Change-Id: I3a801f0e6cadeb98e28d91c52062e6e63164bca2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:54 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d

Change-Id: I17d0b95d850a142500d3932a472659c1e9e804f3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:42 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca

Change-Id: Ib29c785708e959391b3e388b453147e94037420f

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:37 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923

Change-Id: I9f69b090824a6c91bf11dbc0929ba5988a06af52

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:32 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644

Change-Id: I8539a02510ed9a61b683c66c66de7d1b319c2603

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Mar 2018 19:59:26 +0000 (19:59 +0000)]

[automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38

Change-Id: I5cb1316547ced23a1259e068d1ea34631d105608

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

DO NOT MERGE Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:33 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908 am: a982645d5c skipped: 9d3e228729

Change-Id: I1ce639a3ea40693d82501861d4b81afd3506b37d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:27 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908 am: a982645d5c

Change-Id: I329294b80015cbfb2c498c0752b340cbaf527735

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:17 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908

Change-Id: I927087da2df9ad993b449d8ec9b90bd641088d75

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:12 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba

Change-Id: I7204eee21fc2620f70dc8bc534aa0160d947ab7e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:24:06 +0000 (15:24 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3

Change-Id: I916228fb05914dbb89551a27418f746305a01ed6

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:46 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4

Change-Id: Ie516029e98d07f4ebb6916d75af625c92e711fde

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:39 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352

Change-Id: Ib890ce7495c1d5e64968cc9177ce3785bcfdedde

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:32 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97

Change-Id: I49de968aa0daa18b60921af1a381f77d13a8ff0e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 14 Mar 2018 15:23:19 +0000 (15:23 +0000)]

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab

Change-Id: I87dcb4ce2fc52e0ed6ce5f79d15ab49084d088e3

commit | commitdiff | tree

Alan Viverette [Tue, 13 Mar 2018 17:56:24 +0000 (13:56 -0400)]

DO NOT MERGE Fix build with SDK 24-like implementation of constructor

Bug: 71992105
Test: manual
Change-Id: I106760ada9c85adde29fd143e5dfcd924fd95f54

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 21:23:02 +0000 (21:23 +0000)]

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac skipped: d3ef137680

Change-Id: I166bdfa211911d3f3ebcc03af1e9c98edc54d8fc

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 21:22:58 +0000 (21:22 +0000)]

[automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac

Change-Id: Ifd4e09852646522a10971a38cf43ec1282d79dad

commit | commitdiff | tree

Wyatt Riley [Tue, 13 Dec 2016 18:45:29 +0000 (10:45 -0800)]

DO NOT MERGE: Restoring Network Available Notification to AGnssRil

Adds connectivity notification back for SUPL specific
case, needed esp. for case where WiFi is off and a
general purpose connectivity notification doesn't fire.

Bug: 33350903
Fixes: 33350903
Test: On device GPS-still-works checked, as well as notifications
going into HAL on airplane mode on/off, and SUPL call flows
(Further AGnssRil check to be done by partners)

Change-Id: I02af0b839d0bfd21dfefedff743208e02ab9c2dd
(cherry picked from commit 41f6bcebaf5fc687097f47411aacce7cc93d61d1)

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:54 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94 am: 16ee12ac68 am: d08bb4b174

Change-Id: I9749a1bacc983ee7fff06649f55d9b91d8df54ac

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:44 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94 am: 16ee12ac68

Change-Id: If81e264d57c533a12e270c197e99a31c895fa2dd

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:33 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c am: 6720ea0b94

Change-Id: Ibd9203bd7f91b9d25aaf497239e52e81bf18c295

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:25:25 +0000 (00:25 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1 skipped: 75767d1e3c

Change-Id: I36851ba644feb11c57aff0fe6bb218f5c6f14be4

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 13 Mar 2018 00:23:52 +0000 (00:23 +0000)]

[automerger] Rework thumbnail cleanup am: 0dc23f95a1

Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1

commit | commitdiff | tree

Marco Nelissen [Tue, 7 Nov 2017 21:52:02 +0000 (13:52 -0800)]

Rework thumbnail cleanup

Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608

commit | commitdiff | tree

Marco Nelissen [Mon, 12 Mar 2018 21:29:58 +0000 (21:29 +0000)]

Merge changes from topic "thumbnails-nyc-mr1-dev" into nyc-mr2-dev

* changes:
  [automerger] Rework thumbnail cleanup am: 82a2a87474 am: 97eb9d056a
  [automerger] Rework thumbnail cleanup am: 82a2a87474
  Rework thumbnail cleanup

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help