Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_a... | Wolfgang Wiedmeyer | 2016-03-18 | 17 | -37/+240 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'dr15' into cm-13.0 | Steve Kondik | 2016-03-12 | 1 | -2/+7 | |
| |\ \ \ | ||||||
| | * \ \ | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr... | Steve Kondik | 2016-03-10 | 1 | -2/+7 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac... | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | |\ \ | ||||||
| | | | * \ | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac... | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | |\ \ | ||||||
| | | | | * \ | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac... | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | |\ \ | ||||||
| | | | | | * \ | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac... | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | | |\ \ | ||||||
| | | | | | | * \ | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac... | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | | | |\ \ | ||||||
| | | | | | | | * \ | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | | | | |\ \ | ||||||
| | | | | | | | | * \ | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | | | | | |\ \ | ||||||
| | | | | | | | | | * \ | Fix out-of-bounds write am: 5403587a74 | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | * \ | Fix out-of-bounds write | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | * | | Fix out-of-bounds write | Marco Nelissen | 2016-01-12 | 1 | -1/+9 | |
| | | | | | | * | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." | Eric Laurent | 2016-01-12 | 2 | -8/+2 | |
| | | * | | | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3... | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3... | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | ||||||
| | | | | * | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3... | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | ||||||
| | | | | | * | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3... | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | ||||||
| | | | | | | * | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3... | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | ||||||
| | | | | | | | * | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3... | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / / | ||||||
| | | | | | | | | * | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / / | ||||||
| | | | | | | | | | * | | | | fix possible overflow in effect wrappers. am: 9e29523b95 | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | |/ / / | ||||||
| | | | | | | | | | | * | | | fix possible overflow in effect wrappers. | Eric Laurent | 2016-01-12 | 2 | -2/+8 | |
| | | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | | * | | fix possible overflow in effect wrappers. | Eric Laurent | 2016-01-11 | 2 | -2/+8 | |
| | | | | | | | | | | * | | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread | Andy Hung | 2015-12-03 | 1 | -19/+42 | |
| | | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | | * | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread | Andy Hung | 2015-12-03 | 1 | -19/+42 | |
| | | | | | | | | | | * | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ... | Wei Jia | 2015-12-03 | 2 | -1/+18 | |
| | | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | | * | | DO NOT MERGE - libstagefright: check requested memory size before allocation ... | Wei Jia | 2015-12-03 | 2 | -1/+18 | |
| | | | | | | | | * | | | | | Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolT... | Andy Hung | 2015-12-03 | 1 | -19/+42 | |
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / / | ||||||
| | | | | | | | | | * | | | | Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolT... | Andy Hung | 2015-12-03 | 1 | -19/+42 | |
| | | | | | | | | | |\ \ \ \ | ||||||
| | | | | | | | | | | * | | | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread | Andy Hung | 2015-12-02 | 1 | -19/+42 | |
| | | | | | | | | * | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ... | Wei Jia | 2015-12-03 | 2 | -0/+18 | |
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / | ||||||
| | | | | | | | | | * | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ... | Wei Jia | 2015-12-03 | 2 | -0/+18 | |
| | | | | | | | | | |/ / / / | ||||||
| | | | | | | * | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ... | Wei Jia | 2015-12-10 | 2 | -0/+18 | |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | ||||||
| | | | | | | | * | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ... | Wei Jia | 2015-12-10 | 2 | -0/+18 | |
| | | | | | | * | | | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c | Chong Zhang | 2015-12-08 | 1 | -23/+32 | |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | ||||||
| | | | | | | | * | | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content | Chong Zhang | 2015-12-04 | 1 | -23/+32 | |
| | | * | | | | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 8... | Jeff Tinker | 2015-12-09 | 1 | -1/+3 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | ||||||
| | | | * | | | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 8... | Jeff Tinker | 2015-12-10 | 1 | -1/+3 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | ||||||
| | | | | * | | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev | Jeff Tinker | 2015-12-09 | 1 | -1/+3 | |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | ||||||
| | | | | | * | | | | | | | | Fix security vulnerability in ICrypto DO NOT MERGE | Jeff Tinker | 2015-12-05 | 1 | -1/+3 | |
| | | | | | * | | | | | | | | libstagefright: check requested memory size before allocation for SoftMPEG4En... | Wei Jia | 2015-12-03 | 2 | -0/+18 | |
| | | | | | * | | | | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8... | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | ||||||
| | | | | | | * | | | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8... | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | ||||||
| | | | | | | | * | | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / / | ||||||
| | | | | | | | | * | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / / | ||||||
| | | | | | | | | | * | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. | Wei Jia | 2015-10-22 | 1 | -0/+1 | |
| | | | | | * | | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | ||||||
| | | | | | | * | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / / | ||||||
| | | | | | | | * | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485... | Wei Jia | 2015-10-21 | 1 | -0/+1 | |
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / / |