Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
253,340 Commits 3 Branches 0 Tags
79d0fb25305134566b2561ef638ed550db9e0dfd
Commit Graph

253340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
79d0fb2530 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa 
Change-Id: I61c158947f3508aab9ef65988267562663c97a21
 2018-04-13 20:34:44 +00:00
Android Build Merger (Role)
927b3357fa [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 
Change-Id: I24a1df41eb29a6ac7e6c67368f07c6702dacf071
 2018-04-13 20:34:34 +00:00
Android Build Merger (Role)
d85632ae40 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 
Change-Id: Ia175db4206119bed5e1a6b1aeeff72ae86489d38
 2018-04-13 20:34:29 +00:00
Android Build Merger (Role)
24a89da344 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 
Change-Id: I0a5c57b7a50d9221b3be4d193388ac610ba92f73
 2018-04-13 20:34:24 +00:00
Android Build Merger (Role)
98e2d2ec50 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 
Change-Id: I57e2ea2122d22341c43b9b445291cc4b02ec2b11
 2018-04-13 20:34:20 +00:00
y
7e54c3f261 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
 2018-04-13 20:34:18 +00:00
Android Build Merger (Role)
93d9547b61 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c 
Change-Id: I793b787b6275262f1df6caa9262054e15c94840f
 2018-04-09 22:24:08 +00:00
akirilov
33c37cb37c 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
 2018-04-09 22:24:05 +00:00
Android Build Merger (Role)
aa20944ca4 [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
 2018-04-09 21:00:38 +00:00
Android Build Merger (Role)
815008072e [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 
Change-Id: Idc789e68b33b1f8fd841204ce9ffb4b988f9c553
 2018-04-09 21:00:26 +00:00
Android Build Merger (Role)
0df0b30be9 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 
Change-Id: I9f6c6fedfdc987a2acf1978a71fb0bdcd034e9e0
 2018-04-09 21:00:20 +00:00
Android Build Merger (Role)
86f5488521 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 
Change-Id: Ib50692050fd4e62ad80f24531818a378c75dfe25
 2018-04-09 21:00:15 +00:00
Android Build Merger (Role)
d672eef559 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a 
Change-Id: I000fae45e723679ba44b378a36a85daef20ae96d
 2018-04-09 21:00:08 +00:00
akirilov
de71ee469a 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
 2018-04-09 21:00:05 +00:00
Android Build Merger (Role)
f91e527a32 [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 
Change-Id: I29865f40b20c86a3d13493886cfe818638075fea
 2018-04-09 20:17:44 +00:00
Android Build Merger (Role)
209f5413a1 [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 
Change-Id: Id581b577b7c21bca96019a0a1b9c4bb3c3abc7f6
 2018-04-09 20:17:24 +00:00
Android Build Merger (Role)
cb76e24e62 [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e 
Change-Id: I9719266bad39cd58527b0aaeec10b39a1eba3509
 2018-04-09 20:17:15 +00:00
Android Build Merger (Role)
73fcfd424e [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 
Change-Id: Ic3796cc42e2ce78558fe47cff83e19d1aa52cea1
 2018-04-09 20:17:09 +00:00
Android Build Merger (Role)
d6b6319286 [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 
Change-Id: Ic2e2b8d07e1f9872189282923114846db3b3c94c
 2018-04-09 20:16:59 +00:00
Dianne Hackborn
ae77fa4725 Fix issue #27317952: PendingIntent.getIntent() should be protected 
Bug: 64752751
Change-Id: Ib05135cd94f5251942a6fc6df542ed39083f7827
(cherry picked from commit e5ad41bc02)
 2018-04-09 20:16:55 +00:00
Android Build Merger (Role)
31ee079d5f [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d 
Change-Id: I17d0b95d850a142500d3932a472659c1e9e804f3
 2018-03-15 19:59:54 +00:00
Android Build Merger (Role)
4ef2cbc58d [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca 
Change-Id: Ib29c785708e959391b3e388b453147e94037420f
 2018-03-15 19:59:42 +00:00
Android Build Merger (Role)
9d13b0f6ca [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 
Change-Id: I9f69b090824a6c91bf11dbc0929ba5988a06af52
 2018-03-15 19:59:37 +00:00
Android Build Merger (Role)
019eec3923 [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 
Change-Id: I8539a02510ed9a61b683c66c66de7d1b319c2603
 2018-03-15 19:59:32 +00:00
Android Build Merger (Role)
b8dad6c644 [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 
Change-Id: I5cb1316547ced23a1259e068d1ea34631d105608
 2018-03-15 19:59:26 +00:00
Marco Nelissen
b514ce9b38 DO NOT MERGE Rework thumbnail cleanup 
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
 2018-03-15 19:58:42 +00:00
Android Build Merger (Role)
f98157e2ba [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
 2018-03-14 15:24:06 +00:00
Android Build Merger (Role)
e32e8229b3 [automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 
Change-Id: Ie516029e98d07f4ebb6916d75af625c92e711fde
 2018-03-14 15:23:46 +00:00
Android Build Merger (Role)
93f8bfa5c4 [automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 
Change-Id: Ib890ce7495c1d5e64968cc9177ce3785bcfdedde
 2018-03-14 15:23:39 +00:00
Android Build Merger (Role)
d0fcb49352 [automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 
Change-Id: I49de968aa0daa18b60921af1a381f77d13a8ff0e
 2018-03-14 15:23:32 +00:00
Android Build Merger (Role)
1b6f3f9a97 [automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab 
Change-Id: I87dcb4ce2fc52e0ed6ce5f79d15ab49084d088e3
 2018-03-14 15:23:19 +00:00
Alan Viverette
f3c2e0b3ab DO NOT MERGE Fix build with SDK 24-like implementation of constructor 
Bug: 71992105
Test: manual
Change-Id: I106760ada9c85adde29fd143e5dfcd924fd95f54
 2018-03-14 11:22:10 -04:00
Android Build Merger (Role)
75767d1e3c [automerger] Rework thumbnail cleanup am: 0dc23f95a1 
Change-Id: Ia3a740184191990fa43ca705b5eae8ea572fb6c1
 2018-03-13 00:23:52 +00:00
Marco Nelissen
0dc23f95a1 Rework thumbnail cleanup 
Bug: 63766886
Test: ran CTS tests
Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608
Merged-In: I1f92bb014e275eafe3f42aef1f8c817f187c6608
 2018-03-13 00:23:51 +00:00
Pengquan Meng
765a5e785d 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
 2018-03-09 23:37:01 +00:00
Pengquan Meng
c33c8719ff 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
 2018-03-09 23:37:01 +00:00
Pengquan Meng
518a6d0c85 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
 2018-03-09 23:37:01 +00:00
Pengquan Meng
64377471f0 Merge "Fixed Security Vulnerability of DcParamObject" into mnc-dev 2018-03-09 23:37:01 +00:00
Pengquan Meng
a9399dbc09 Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into nyc-dr1-dev 
* changes:
  [automerger] Fixed Security Vulnerability of DcParamObject am: 8c55a70728 am: 61f84448eb am: a007cb0734 am: 3b356d5111 am: a61fe8f6c0
  [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
 2018-03-09 23:37:01 +00:00
Pengquan Meng
80a84c4aad 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
 2018-03-09 23:37:01 +00:00
Alan Viverette
f26c5dbcdb 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
 2018-03-09 18:43:02 +00:00
Alan Viverette
1ecf5c9185 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
 2018-03-09 18:43:02 +00:00
Alan Viverette
558166043c 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
 2018-03-09 18:43:02 +00:00
Alan Viverette
38e9a0a934 Merge "Update internal ViewPager's SavedState to match Support Library version" into mnc-dev 2018-03-09 18:43:02 +00:00
Alan Viverette
b857f46bfb Merge changes from topic "viewpager_state" into nyc-dr1-dev 
* changes:
  [automerger] Update internal ViewPager's SavedState to match Support Library version am: 187964aca1 am: 4c24e4d831 am: fece305de0 am: cb362192e8 am: bc42f76941
  [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
 2018-03-09 18:43:02 +00:00
Alan Viverette
2c72729428 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
 2018-03-09 18:43:02 +00:00
Eugene Susla
e02cd061ca Merge changes from topic "recognition_service-mnc-dev" into nyc-dr1-dev 
* changes:
  [automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082 am: 26aaadd3b5 skipped: a1ad0de1f7 am: cf92266ad9
  [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
 2018-03-09 18:42:08 +00:00
Eugene Susla
338cb38cad 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
 2018-03-09 18:42:08 +00:00
TreeHugger Robot
fb6e4bc01b Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-dr1-dev 
* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
 2018-03-09 15:01:42 +00:00
TreeHugger Robot
28c7060b11 Merge "[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids" into nyc-dev 2018-03-09 15:01:42 +00:00