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

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into mnc-dr1.5-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into cw-e-dev

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
  Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into mnc-dr-dev

* changes:
[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728
Fixed Security Vulnerability of DcParamObject

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 23:37:01 +0000 (23:37 +0000)]

Merge "Fixed Security Vulnerability of DcParamObject" into mnc-dev

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into mnc-dr1.5-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into cw-e-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
  Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge changes from topic "viewpager_state" into mnc-dr-dev

* changes:
[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1
Update internal ViewPager's SavedState to match Support Library version

commit | commitdiff | tree

Alan Viverette [Fri, 9 Mar 2018 18:43:02 +0000 (18:43 +0000)]

Merge "Update internal ViewPager's SavedState to match Support Library version" into mnc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:55 +0000 (04:18 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734

Change-Id: I03d75f7b837fdeafabcf64a8d56e1b1f7af89050

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:50 +0000 (04:18 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb

Change-Id: Ibdad47ba4b4f48341957f1112cf26794ef3af0ac

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 04:18:45 +0000 (04:18 +0000)]

[automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728

Change-Id: Ic9cf5392057bfb47945e9a1b06abb19697468610

commit | commitdiff | tree

Pengquan Meng [Fri, 9 Mar 2018 04:08:25 +0000 (20:08 -0800)]

Fixed Security Vulnerability of DcParamObject

The writeToParcel and readFromParcel is not symmetry, fixed it.

Test: no test
Bug: 70721937
Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:53 +0000 (00:35 +0000)]

[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5

Change-Id: Icf7b82e7dfbdebeb382c56e2c1db061abd87a3e9

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:48 +0000 (00:35 +0000)]

[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082

Change-Id: I0cbca14aed609ab81556ee1deb72ef1e0e294256

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 9 Mar 2018 00:35:42 +0000 (00:35 +0000)]

[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe

Change-Id: I09ac593ade4e725b560384042304f93f451b5be5

commit | commitdiff | tree

Eugene Susla [Thu, 22 Feb 2018 18:39:34 +0000 (10:39 -0800)]

[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService

Fixes: 73511076, 73311729
Test: presubmit
Change-Id: Ie98f67ffee4744050ac85d8b229370a16a76a194
(cherry picked from commit 726b51a26e9a54b7352aad90ed15edccc44dd60d)

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:36 +0000 (19:45 +0000)]

[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0

Change-Id: Ie54af74e2ab273be07c4cd73881010ee952997ef

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:30 +0000 (19:45 +0000)]

[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831

Change-Id: I33e06bfcad6941fd8845f443991dfbcbd4167348

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Feb 2018 19:45:24 +0000 (19:45 +0000)]

[automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1

Change-Id: Ia2d011a3e2c705e82ab11dbf571f6f52cf05bae8

commit | commitdiff | tree

Alan Viverette [Fri, 16 Feb 2018 18:56:02 +0000 (13:56 -0500)]

Update internal ViewPager's SavedState to match Support Library version

Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e
Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b
Fixes: 71992105
Test: manual

commit | commitdiff | tree

Siyamed Sinir [Thu, 15 Feb 2018 00:14:36 +0000 (00:14 +0000)]

Merge "DO NOT MERGE Fix mTrustManager NPE" into mnc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0

Change-Id: I80463ee5315c2672e812659192b227c8271e9113

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a

Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3

Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:39:13 +0000 (23:39 +0000)]

Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev
am: 84118c127f

Change-Id: Id813276417c71446dd2ac8d146888297e5a6c89c

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]

Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev am: 6cc0b76e85" into mnc-dr1.5-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]

Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad" into cw-e-dev

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]

Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev

* changes:
[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb
Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:24:45 +0000 (23:24 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev
am: 6cc0b76e85

Change-Id: Ic11f51471318d3343024226f3bc282e35f9d6346

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:01 +0000 (23:23 +0000)]

[automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb

Change-Id: I4e69906486cfec4c4db7cbb119df1d55aec55675

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:22:41 +0000 (23:22 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev
am: 0153ac9dad

Change-Id: I2a07841e7cd27f2ba7c30f9b2df5ddf1afcc6ef5

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:52 +0000 (23:21 +0000)]

[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be am: c3fc912374

Change-Id: I9a94eac5fa1b832b4334e08676b2be7a032c3efc

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:42 +0000 (23:21 +0000)]

[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am: e137462b2c am: 15754b34be

Change-Id: Idfec393662af2392aba6949d7ffcad720b4d4eb6

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:21:17 +0000 (23:21 +0000)]

Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
am: e137462b2c

Change-Id: I4132c2ccfc0db161c6a89a6c62fb276f0874d39b

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into cw-e-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
  [RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]

Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev

* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c
[RTT] ParcelableRttResults parcel code fix

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:15 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d am: 83cb35453f

Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:09 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888 am: 0231bc4d6d

Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:02 +0000 (08:18 +0000)]

[automerger] Fix VerifyCredentialResponse parcelling code am: 54813e9888

Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62

commit | commitdiff | tree

Rubin Xu [Wed, 7 Feb 2018 08:10:08 +0000 (08:10 +0000)]

Fix VerifyCredentialResponse parcelling code

There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.

Test: none
Bug: 71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:07 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61

Change-Id: I2be402278897c6d97207672f8bfc5af8cbc6dc6d

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:00 +0000 (18:16 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4

Change-Id: I371f3a2967a5a7a826bca94637a78b7dae7c2cd8

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 2 Feb 2018 18:15:53 +0000 (18:15 +0000)]

[automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c

Change-Id: I46bbee504ea7a64d39b98a2a8336b3bcf593869a

commit | commitdiff | tree

Etan Cohen [Fri, 2 Feb 2018 16:07:20 +0000 (08:07 -0800)]

[RTT] ParcelableRttResults parcel code fix

ParcelableRttResults was unparceled incorrectly.

Bug: 70398564
Test: exploit provided in bug no longer works
Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:22 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249 am: 2c70774e72

Change-Id: I982742b65d3ae6941b274c147d09ce6f50533c1e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:17 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e am: c1cb058249

Change-Id: I1ea542611301d0c4359021303b05a5e59ee1185b

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:11 +0000 (14:14 +0000)]

[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am: 5ed5d15e66 am: 8a0c7fd99e

Change-Id: If53ecf0654e883fa43e2f543561f0f7994763698

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 14:13:34 +0000 (14:13 +0000)]

Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
am: 5ed5d15e66

Change-Id: I7eb106b0db3ab568a7d8845ddd2025d80eeced3c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:15 +0000 (14:06 +0000)]

[automerger] Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev am: fea4158eea am: 8fbe4e673f

Change-Id: Ifd6fc978fb4544f7f4c9fe99599d472c10b071ac

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev
am: fea4158eea

Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dev

* changes:
[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into mnc-dr1.5-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]

Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev

commit | commitdiff | tree

Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]

Merge changes from topic "am-f1eb5cc5-7ac1-4540-b9cf-e0577f9334e7" into cw-e-dev

* changes:
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137
  [automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7
  Adjust URI host parsing to stop on \ character.

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:21 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2 am: d3c0db66b9

Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:15 +0000 (11:20 +0000)]

[automerger] Adjust URI host parsing to stop on \ character. am: fa3afbd0e7 am: 97668ae137 am: fddbf1b6b2

Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help