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

OSDN Git Service

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

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

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

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

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

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

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

* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111
  [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

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

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

Merge changes from topic "viewpager_state" into nyc-dev

* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8
  [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

Eugene Susla [Fri, 9 Mar 2018 18:42:08 +0000 (18:42 +0000)]

Merge changes from topic "recognition_service-mnc-dev" into nyc-dev

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 9 Mar 2018 15:01:42 +0000 (15:01 +0000)]

Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into nyc-dev

commit | commitdiff | tree

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

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

Change-Id: I96567f3adabce5207b07f71ac3b8fe60944a83f2

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:58 +0000 (00:35 +0000)]

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

Change-Id: I0deb776ab86a2dfa512b092072d9e8f1e4d1b900

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

Fyodor Kupolov [Wed, 21 Feb 2018 01:02:35 +0000 (17:02 -0800)]

Verify last array's length in readFromParcel

Length of the last array in readFromParcel should be the same as
value of mNextIndex.

Test: PoC app in the bug
Bug: 73252178
Change-Id: I69f935949e945c3a036b19b4f88684d906079ea5

commit | commitdiff | tree

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

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

Change-Id: Ie379f04b1e570ebc94a9e5c37ab3ddbf469acb93

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:54 +0000 (00:05 +0000)]

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

Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1

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

Rubin Xu [Thu, 11 Jan 2018 10:59:19 +0000 (10:59 +0000)]

[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

Bug: 63000005
Test: runtest frameworks-net -c com.android.server.connectivity.VpnTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnLockDown
Change-Id: Ia1a82ee73d8617f3124032986fe6c09c14bf7752

commit | commitdiff | tree

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

Merge changes from topic "am-513301705eec406eb3be13d14037bb53" into nyc-dev

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

commit | commitdiff | tree

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

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

Change-Id: I2e6188de2f8814f2f75efe5000013c5636bc154a

commit | commitdiff | tree

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

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

Change-Id: Ia7fedd1202e9250d27d16dc3327b7664b134ae1f

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 changes from topic "am-922cd235076540bdb5f01e7024397331" into nyc-dev

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

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:27:31 +0000 (23:27 +0000)]

Merge "Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev am: 1c198dfc71" into nyc-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

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

Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev

* changes:
  [automerger] Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr-dev am: 0153ac9dad am: 523fed0deb am: 04e84bb0ec
  [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

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

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

Change-Id: I694605b85bb5b5d123663c7fe670274cb2e15f36

commit | commitdiff | tree

Etan Cohen [Wed, 7 Feb 2018 23:25:20 +0000 (23:25 +0000)]

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

Change-Id: I26d40e2d2dd918f8dbe7b8b688f2834808c240c2

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:06 +0000 (23:23 +0000)]

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

Change-Id: I3cb0275cf475b0551dec3b9e4fbc6301756fb15d

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:59 +0000 (23:21 +0000)]

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

Change-Id: I5d1adb5f7d6d5eb3ba584033453bf4766b5fd300

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 nyc-dev

* changes:
  [automerger] [RTT] ParcelableRttResults parcel code fix am: e1e5a2409c am: 5f4d9350f4 am: 8d2d052b61 am: af9f48b7e8
  [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 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:22 +0000 (08:18 +0000)]

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

Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177

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:12 +0000 (18:16 +0000)]

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

Change-Id: I5a6d8519fc77c96d2df7afc58c1d45af57250e8b

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:27 +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 am: 3ec9cb8d3a

Change-Id: I964d1b8a03e24cc51b8c385d2a04c4a6a338aa36

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:20 +0000 (14:06 +0000)]

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

Change-Id: I3649d3b8bfa880ac44c88f5f6672b94877345911

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.

frameworks/base

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.