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

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

Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:53 +0000 (15:05 +0000)]

[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404 am: 3926163983

Change-Id: I34f05a182873509dd1e19a5692af5001d58cf8ec

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:41 +0000 (15:05 +0000)]

[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6 am: 3a272fe404

Change-Id: I8774e7b9ca61abd7fbfc43f0d4793cea41ae2e7c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:24 +0000 (15:05 +0000)]

[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59 am: 6714a260e6

Change-Id: I5c8048d78c4e499419cee8b60e1a591c47b5456b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 6 Jun 2018 15:05:12 +0000 (15:05 +0000)]

[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436 am: 5a632d1b59

Change-Id: I0de34641572b18ba701f41df542124b6331537c0

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 6 Jun 2018 15:04:54 +0000 (15:04 +0000)]

[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008 am: fd1097e436

Change-Id: I50e23f33371f7f1e47b65d421628ab771238b278

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 6 Jun 2018 15:04:30 +0000 (15:04 +0000)]

[automerger] ResStringPool: Prevenet boot loop from se fix am: c31cf80008

Change-Id: Ie8651904560e43e89374df132bf30cd615718192

commit | commitdiff | tree

Ryan Mitchell [Mon, 21 May 2018 20:59:23 +0000 (13:59 -0700)]

ResStringPool: Prevenet boot loop from se fix

Changes the logs adding in a previous security fix to warnings so
devices with malformed APKs currently on them will not undergo DOS when
they are upgraded to P.

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

Change-Id: Ied54e4bb14abdaf79da562022c7ea6075187c1f8
(cherry picked from commit f05f47b2c1838529e682ad8f931d3da72244b1a1)

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 22 May 2018 21:59:30 +0000 (21:59 +0000)]

[automerger] Make safe label more safe am: 2263da9539 am: 05086b1008

Change-Id: Ibf0d6da3ef712a2cc45587d59880ddce03a34447

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 22 May 2018 21:59:24 +0000 (21:59 +0000)]

[automerger] Make safe label more safe am: 2263da9539

Change-Id: If833354e5ae2b056de124fe23f0414c7654f6c33

commit | commitdiff | tree

Todd Kennedy [Thu, 3 May 2018 09:05:04 +0000 (10:05 +0100)]

Make safe label more safe

* limit the absolute maximum size of the label to 50000 characters
[which is probably far more than necessary, but, can be dialed down]

* use a string buffer while processing the string [instead of creating
multiple string objects]

Bug: 62537081
Test: Manual. Install APK in bug and see that it can be uninstalled
Change-Id: Ibf63c2691ad7438a123e92110d95b1f50050f8b1
Merged-In: Ibf63c2691ad7438a123e92110d95b1f50050f8b1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 May 2018 17:40:52 +0000 (17:40 +0000)]

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8 am: fb67a0f5f3

Change-Id: I756b595747e3d97ddb14dc45ed1b6001ec6ebed8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 May 2018 17:40:46 +0000 (17:40 +0000)]

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3 am: 42ded39df8

Change-Id: I315da9ccb85d9e69edf18dd85b7bdf183bd6f738

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 May 2018 17:40:32 +0000 (17:40 +0000)]

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360 am: 6a42ea18b3

Change-Id: If82fd8b2c76bedf089bec4501169417427854b1d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 May 2018 17:40:27 +0000 (17:40 +0000)]

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510 am: 884d2c7360

Change-Id: I0e5ba8adaed2d6247137319262278fac98f467e1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 May 2018 17:40:22 +0000 (17:40 +0000)]

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373 am: b1f2848510

Change-Id: I689d44b6617f0ed949e3f72367980158ea06ad0d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 10 May 2018 17:40:16 +0000 (17:40 +0000)]

[automerger] clearCallingIdentity before calling into getPackageUidAsUser am: 857326e373

Change-Id: I2166c2f9ca0a6654e1a88b1d183062eb1564c24d

commit | commitdiff | tree

Tony Mak [Thu, 14 Dec 2017 12:40:07 +0000 (12:40 +0000)]

clearCallingIdentity before calling into getPackageUidAsUser

Fix: 70585244
Bug: 69981755

Test: Enable any accessibility service -> inflate work profile
-> Tap on any work app -> no longer crash

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest.testPrimaryUserToManagedProfile
Change-Id: I80d18f4e2ab76a228cb0aa2c8312c323a9b5c84d

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 9 May 2018 17:19:38 +0000 (17:19 +0000)]

[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2 am: 97f7498c18

Change-Id: I4f4b15c92832c0806fcf3e67f6fd5c9b13eebc1f

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 9 May 2018 17:19:32 +0000 (17:19 +0000)]

[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960 am: 9e291fe8c2

Change-Id: Ia6ba75b4938ab6d9ec0ffe1bc39b6ce6995a808e

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 9 May 2018 17:19:18 +0000 (17:19 +0000)]

[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f am: 6b95503960

Change-Id: Ia3658c17dc890ca2de951da5c701e953ce8c969b

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 9 May 2018 17:19:12 +0000 (17:19 +0000)]

[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am: a99414f51f

Change-Id: I7aaceff0646a5e738ed862c34645e548aabf62f1

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 9 May 2018 17:19:07 +0000 (17:19 +0000)]

[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a

Change-Id: Ia89ea1adb47be3b70f5db292677c4c19194a04db

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 9 May 2018 17:19:02 +0000 (17:19 +0000)]

[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288

Change-Id: I379d54d926e01da53b637bba6b3b1ee8577cbdbb

commit | commitdiff | tree

Eugene Susla [Mon, 11 Dec 2017 18:07:03 +0000 (10:07 -0800)]

Nullcheck to fix Autofill CTS

Test: presubmit
Fixes: 70506475
Bug: 69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186

commit | commitdiff | tree

android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]

Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81
  [automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1
  DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name

commit | commitdiff | tree

android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]

Merge changes from topic "am-01dfab30-af7a-4b8d-97d8-55bde12588f9-nyc-dev" into nyc-dr1-dev

* changes:
[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1
DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name

commit | commitdiff | tree

android-build-team Robot [Thu, 3 May 2018 23:10:52 +0000 (23:10 +0000)]

Merge "DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:53 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1 am: b906043c81

Change-Id: I12322ddbacc848912426bacaa49469d6d5982c60

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:51 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda am: cdc99a0e87

Change-Id: I1aa2ecc6c3d344a5889edc10401515178620d42b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:47 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: b6cde9ecc1

Change-Id: I3f951fac78c6e2da84eac511d3b0e19141e90153

commit | commitdiff | tree

Hansong Zhang [Thu, 26 Apr 2018 21:13:45 +0000 (14:13 -0700)]

DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name

Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:45 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844 am: 1839e70cda

Change-Id: I264e7ffed376146303f48c01b57fad6d2fe8e19a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:32 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f skipped: 365fb1c844

Change-Id: I2d42a069fb0b4bae27b8e29e1182e2935c604835

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:27 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e am: 0cd0cef08f

Change-Id: I937e2d9a676b38f6a18cda70f42d06eaa22ce051

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:21 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c am: 8fbe4bce1e

Change-Id: If7693b2ff5785a1a09920061b318aaac33f5d6b6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 26 Apr 2018 21:18:14 +0000 (21:18 +0000)]

[automerger] DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name am: 984dfe074c

Change-Id: Iac403f5118d55d9919745d98eba260dd2929d56c

commit | commitdiff | tree

Hansong Zhang [Thu, 26 Apr 2018 21:13:45 +0000 (14:13 -0700)]

DO NOT MERGE Truncate newline and tab characters in BluetoothDevice name

Test: manual
Bug: 73173182
Change-Id: I3c25af233742e63351a68e8c5a279b51a94e49e2

commit | commitdiff | tree

TreeHugger Robot [Sat, 14 Apr 2018 02:21:07 +0000 (02:21 +0000)]

Merge changes from topic "ClearGrantIfGroupChanged-nyc" into nyc-mr1-dev

* changes:
  [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-dr1-dev

* changes:
[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 "DO NOT MERGE (N) Revoke permision when group changed" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Sat, 14 Apr 2018 01:56:10 +0000 (01:56 +0000)]

Merge "DO NOT MERGE (M) Revoke permision when group changed" into mnc-dev

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: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

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

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: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: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

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: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 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 "Rework thumbnail cleanup" into nyc-mr1-dev

commit | commitdiff | tree