summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_a...replicant-6.0-alpha-0005replicant-6.0-alpha-0004Wolfgang Wiedmeyer2016-03-1844-109/+557
|\
| * audio: Remove LEGACY_ALSA_AUDIO ifdefs from AudioPolicyManager.cppArne Coucheron2016-03-171-54/+0
| * Merge branch 'dr15' into cm-13.0Steve Kondik2016-03-123-5/+28
| |\
| | * Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-103-5/+28
| | |\
| | | * resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974...Eino-Ville Talvala2016-01-150-0/+0
| | | |\
| | | | * resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974...Eino-Ville Talvala2016-01-150-0/+0
| | | | |\
| | | | | * resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974...Eino-Ville Talvala2016-01-150-0/+0
| | | | | |\
| | | | | | * resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974...Eino-Ville Talvala2016-01-150-0/+0
| | | | | | |\
| | | | | | | * resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974...Eino-Ville Talvala2016-01-1512-5/+43
| | | | | | | |\
| | | | | | | | * resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966e am: 0fefc974ffEino-Ville Talvala2016-01-1512-5/+43
| | | | | | | | |\
| | | | | | | | | * resolve merge conflicts of 88b736a198 to lmp-dev. am: 899823966eEino-Ville Talvala2016-01-1512-5/+43
| | | | | | | | | |\
| | | | | | | | | | * resolve merge conflicts of 88b736a198 to lmp-dev.Eino-Ville Talvala2016-01-1512-5/+43
| | | | | | | | | | |\
| | | | | | | | | | | * resolve merge conflicts of 88b736a198 to lmp-dev.Eino-Ville Talvala2016-01-1412-5/+43
| | | | | | | | | | | |\
| | | | | | | | | | | | * Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1412-5/+43
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1312-5/+43
| | | * | | | | | | | | | | Camera: Disallow dumping clients directly am: c400396525 am: 795243686fEino-Ville Talvala2016-01-1410-6/+37
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Camera: Disallow dumping clients directly am: c400396525Eino-Ville Talvala2016-01-1410-6/+37
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1410-6/+37
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1310-6/+37
| | | * | | | | | | | | | | Camera: set mNumberOfNormalCameras correctlyYin-Chia Yeh2016-01-131-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Camera: set mNumberOfNormalCameras correctlyYin-Chia Yeh2016-01-121-0/+1
| | | * | | | | | | | | | | Merge "audioflinger: fix standby delay on A2DP output" into mnc-dr1.5-devEric Laurent2016-01-131-3/+20
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | audioflinger: fix standby delay on A2DP outputEric Laurent2016-01-121-3/+20
| | | * | | | | | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| / / / / / / / / / / | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / /
| | | | | | | | * | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / /
| | | | | | | | | * | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7eMarco Nelissen2016-01-121-1/+9
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / /
| | | | | | | | | | * | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102Marco Nelissen2016-01-121-1/+9
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | |/ / /
| | | | | | | | | | | * | | Fix out-of-bounds write am: 5403587a74Marco Nelissen2016-01-121-1/+9
| | | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ /
| | | | | | | | | | | | * | Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | | | | | | | |\ \ | | | | | | | | | | | | | |/
| | | | | | | | | | | | | * Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | * | | | | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: ...Eric Laurent2016-01-120-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: ...Eric Laurent2016-01-120-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: ...Eric Laurent2016-01-120-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."Eric Laurent2016-01-120-0/+0
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."Eric Laurent2016-01-122-8/+2
| | | * | | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / /
| | | | | | | * | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / /
| | | | | | | | * | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / /
| | | | | | | | | * | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / /
| | | | | | | | | | * | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0Eric Laurent2016-01-122-2/+8
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | |/ / /
| | | | | | | | | | | * | | fix possible overflow in effect wrappers. am: 9e29523b95Eric Laurent2016-01-122-2/+8
| | | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ /
| | | | | | | | | | | | * | fix possible overflow in effect wrappers.Eric Laurent2016-01-122-2/+8
| | | | | | | | | | | | |\ \ | | | | | | | | | | | | | |/
| | | | | | | | | | | | | * fix possible overflow in effect wrappers.Eric Laurent2016-01-112-2/+8