Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
318,656 Commits 3 Branches 0 Tags
86cfcaa610e2d3d199ddb16d5e9e98e5734dc9b0
Commit Graph

318656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
86cfcaa610 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 am: 76d71fa910 
Change-Id: I971b589190cae708a08dd568290807dff0f75349
 2018-04-13 20:35:02 +00:00
Android Build Merger (Role)
76d71fa910 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba am: 80e36faa72 
Change-Id: Ibeb5d99f477048e8715a0d4b093052f3d88445e2
 2018-04-13 20:34:58 +00:00
Android Build Merger (Role)
80e36faa72 [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 am: a509e771ba 
Change-Id: I48bf9619571a30e6f5ea5bad503a3805e0821a75
 2018-04-13 20:34:53 +00:00
Android Build Merger (Role)
a509e771ba [automerger] ResStringPool: Fix security vulnerability am: 7e54c3f261 am: 98e2d2ec50 am: 24a89da344 am: d85632ae40 am: 927b3357fa am: 79d0fb2530 
Change-Id: I068f51adbb0248db232c50bd89fb25ef0d7273a9
 2018-04-13 20:34:49 +00:00
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
akirilov
e5776af814 RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev) 
Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked
      cts-tradefed run cts -m CtsAccessibilityServiceTestCases
      cts-tradefed run cts -m CtsAccessibilityTestCases

Bug: 69981755
Change-Id: I187e3e9839f654cea9e06e5de93e10e4d1de3109
Merged-In: If3752e106aa7fdee4645dc9852289af471ceff18
 2018-04-10 17:55:55 +00:00
Android Build Merger (Role)
840e366d50 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456 skipped: bae1ea6478 
Change-Id: I67ae802c25bfdaa1a5a7b7bc6880d954e30f3e27
 2018-04-09 22:24:32 +00:00
Android Build Merger (Role)
bae1ea6478 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 am: 1890afd456 
Change-Id: I1d6b280c14a7a6166221ea0d1448de7bc7feb18c
 2018-04-09 22:24:28 +00:00
Android Build Merger (Role)
1890afd456 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 am: 5ddeef7116 
Change-Id: Ib3a14de258a548393279940fd3aeb067f2596ca8
 2018-04-09 22:24:22 +00:00
Android Build Merger (Role)
5ddeef7116 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to nyc-dev) am: 33c37cb37c am: 93d9547b61 
Change-Id: If515d9ec229e37bdc1368a96ae1f1b474dd50ebe
 2018-04-09 22:24:16 +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)
dc5ccd8d30 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23 skipped: 4fbc80f05b 
Change-Id: I31f7f0b24c4abb211837b4143bd17922cbd910a1
 2018-04-09 21:00:57 +00:00
Android Build Merger (Role)
4fbc80f05b [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 am: 20a5009e23 
Change-Id: Idc5e03ce291191f07f6be769ee777e6dd8f59915
 2018-04-09 21:00:53 +00:00
Android Build Merger (Role)
20a5009e23 [automerger] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to mnc-dev) am: de71ee469a am: d672eef559 am: 86f5488521 skipped: 0df0b30be9 am: 815008072e am: aa20944ca4 am: 569ad1b287 
Change-Id: I04b6008abff856d7998566a2e9136d62d6ac9c5e
 2018-04-09 21:00:48 +00:00
Android Build Merger (Role)
569ad1b287 [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
 2018-04-09 21:00:43 +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)
e55d5fca11 [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da am: 65b3f30dfe 
Change-Id: I37d65e9e885739b3f4a897f9ceabe221534e65f8
 2018-04-09 20:18:09 +00:00
Android Build Merger (Role)
65b3f30dfe [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 am: 42dee597da 
Change-Id: Ic1cb5a34385d6cbdb2e332fd96b6caf6c53b353b
 2018-04-09 20:18:03 +00:00
Android Build Merger (Role)
42dee597da [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 am: db6d6a2914 
Change-Id: Id6bc4a730ed862e380eb3b396a61999c56d2c679
 2018-04-09 20:17:57 +00:00
Android Build Merger (Role)
db6d6a2914 [automerger] Fix issue #27317952: PendingIntent.getIntent() should be protected am: ae77fa4725 am: d6b6319286 am: 73fcfd424e am: cb76e24e62 am: 209f5413a1 am: f91e527a32 
Change-Id: I4a2e77198d157f52266095338cf118896fb53348
 2018-04-09 20:17:52 +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
Fyodor Kupolov
4921986db7 Use concrete CREATOR instance for parceling lists 
Replaced readTypedArrayList/writeTypedArrayList with
writeTypedList/createTypedArrayList(CREATOR)

Bug: 71508348
Test: CtsAutoFillServiceTestCases pass
Merged-In: I2a8321023b40cc74b7026eb0fb32a9cc5f5543a9
Change-Id: Id17d02e40a4ae567bf2d74d2ea8ba4d8a943bdb7
 2018-03-16 23:37:13 +00:00
TreeHugger Robot
24873b5b28 Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into nyc-mr2-dev 
* changes:
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac
  DO NOT MERGE: Restoring Network Available Notification to AGnssRil
 2018-03-15 21:39:46 +00:00
TreeHugger Robot
01f297ecb7 Merge "DO NOT MERGE: Restoring Network Available Notification to AGnssRil" into cw-f-dev 2018-03-15 21:39:46 +00:00
TreeHugger Robot
38860f2cab Merge changes from topic "am-4832db20-4618-4c51-930c-c4179c7f0a1b" into oc-dev 
* changes:
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac skipped: d3ef137680
  [automerger skipped] DO NOT MERGE: Restoring Network Available Notification to AGnssRil skipped: 3656457fac
  DO NOT MERGE: Restoring Network Available Notification to AGnssRil
 2018-03-15 21:39:46 +00:00
Android Build Merger (Role)
957e6ff8fe [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855 skipped: 1160018fef 
Change-Id: I1b2bb3c0c2adf15d344697381e5651b9a6adbf9f
 2018-03-15 20:00:14 +00:00
Android Build Merger (Role)
1160018fef [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 am: c077fab855 
Change-Id: Ia2f661ae02c925da5d6e05f96983cc3f606cd9bd
 2018-03-15 20:00:09 +00:00
Android Build Merger (Role)
c077fab855 [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f am: 6100f6d3b2 
Change-Id: I6388ec63ab6d29d1b002cc296571e67278245fc0
 2018-03-15 20:00:04 +00:00
Android Build Merger (Role)
6100f6d3b2 [automerger] DO NOT MERGE Rework thumbnail cleanup am: b514ce9b38 am: b8dad6c644 am: 019eec3923 skipped: 9d13b0f6ca am: 4ef2cbc58d am: 31ee079d5f 
Change-Id: I3a801f0e6cadeb98e28d91c52062e6e63164bca2
 2018-03-15 19:59:59 +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