summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-1078-3562/+1654
|\ | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Dialer into cm-13.0 Android 6.0.1 release 22 Change-Id: Ie42d0f447825104d3aebcd87a83d4b51ad138274
| * Fix NPE in requestContent am: f4b1101e58Jay Shrauner2015-10-201-1/+5
| |\ | | | | | | | | | | | | | | | | | | am: e57c45eabf * commit 'e57c45eabf14ec199c2f18e9bc4ae47083c6e694': Fix NPE in requestContent
| | * Fix NPE in requestContentJay Shrauner2015-10-201-1/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | am: f4b1101e58 * commit 'f4b1101e5831faa5407e44566185007788090dce': Fix NPE in requestContent
| * | | am 2f311c7b: am ccf6c7a8: Correct issue where content of "All" and "Missed" ↵Tyler Gunn2015-10-131-1/+14
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | tabs reversed in RTL. * commit '2f311c7bbedd2200d8f91035303b0a359598ff7f': Correct issue where content of "All" and "Missed" tabs reversed in RTL.
| | * | am ccf6c7a8: Correct issue where content of "All" and "Missed" tabs reversed ↵Tyler Gunn2015-10-131-1/+14
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in RTL. * commit 'ccf6c7a8b3da1da6bf9df41e18485ddc08a5a17a': Correct issue where content of "All" and "Missed" tabs reversed in RTL.
| * | | | am 46b15454: am f72637df: DO NOT MERGE Handle null contact lookup.Andrew Lee2015-10-121-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '46b15454997b85bd28d3be2559ba103f8e224de2': DO NOT MERGE Handle null contact lookup.
| | * | | am f72637df: DO NOT MERGE Handle null contact lookup.Andrew Lee2015-10-121-3/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f72637df6ee6cc0c5bc66205199ed6294f2eb623': DO NOT MERGE Handle null contact lookup.
| * | | | | am d022ce93: (-s ours) am 269d8cc7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd022ce93d3001d03b62dd7f4e0d7209d298c2124': Import translations. DO NOT MERGE
| | * | | | am 269d8cc7: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '269d8cc77c4c8ca3d64555b6f554e1333f1e0cb7': Import translations. DO NOT MERGE
| * | | | | | am 2b3bbcfb: (-s ours) am 1fb10e00: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2b3bbcfba7de4f4e362899b536d3c101c2e9c6fa': Import translations. DO NOT MERGE
| | * | | | | am 1fb10e00: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1fb10e00f9cbc41cac7ffecad874e8b23ef95511': Import translations. DO NOT MERGE
| * | | | | | | am 01d5d7e5: am 407bfa30: Use View.performHapticFeedback for haptic vibrationYorke Lee2015-08-261-16/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01d5d7e5c23293f0319e07173f07ea500a1a1f5e': Use View.performHapticFeedback for haptic vibration
| | * | | | | | am 407bfa30: Use View.performHapticFeedback for haptic vibrationYorke Lee2015-08-261-16/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '407bfa30cc7dd8107521292edd8d7c25545d75df': Use View.performHapticFeedback for haptic vibration
| * | | | | | | | am bc891fe6: am 93f905e4: am 9d1d797b: Prevent NPE in ↵Andrew Lee2015-08-221-3/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VoicemailPlaybackPresenter. * commit 'bc891fe69efcb31748441cd04bc317c1eca7edb9': Prevent NPE in VoicemailPlaybackPresenter.
| | * | | | | | | am 93f905e4: am 9d1d797b: Prevent NPE in VoicemailPlaybackPresenter.Andrew Lee2015-08-221-3/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '93f905e4cdbc53aac4d001dce6fe81548e3372da': Prevent NPE in VoicemailPlaybackPresenter.
| * | | | | | | | | am 11a953c6: am dd6bd7e0: am 6b9d9a0b: Use correct "Can write to settings" ↵Yorke Lee2015-08-131-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check in DefaultRingtonePreference * commit '11a953c6abdb816a8c2e35e29028e6efe6a24341': Use correct "Can write to settings" check in DefaultRingtonePreference
| | * | | | | | | | am dd6bd7e0: am 6b9d9a0b: Use correct "Can write to settings" check in ↵Yorke Lee2015-08-131-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DefaultRingtonePreference * commit 'dd6bd7e046fbff887d127bbf3ea3404ccfe64858': Use correct "Can write to settings" check in DefaultRingtonePreference
| * | | | | | | | | | am ec239ed1: am d94b24bc: Merge "Consolidate CallSubject history and ↵Tyler Gunn2015-08-131-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dialog." into mnc-dr-dev * commit 'ec239ed1814d97037bf17f68f887fbdcef22e75d': Consolidate CallSubject history and dialog.
| | * | | | | | | | | am d94b24bc: Merge "Consolidate CallSubject history and dialog." into mnc-dr-devTyler Gunn2015-08-131-2/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd94b24bc13c12bfa10d48614f27adae54fdd6902': Consolidate CallSubject history and dialog.
| * | | | | | | | | | | am 4422da16: am f88d4708: Add a version number to DialerAnthony Lee2015-08-131-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4422da16b43847147599e4677667ab6caea69702': Add a version number to Dialer
| | * | | | | | | | | | am f88d4708: Add a version number to DialerAnthony Lee2015-08-131-1/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f88d47081b2f4a04db5018f530d26590c5f1d1c6': Add a version number to Dialer
| * | | | | | | | | | | | am 40d4dd84: (-s ours) am 82640f6f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40d4dd8409f6fcb88dcb19d30eca9e107f147df5': Import translations. DO NOT MERGE
| | * | | | | | | | | | | am 82640f6f: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '82640f6f71bbc37337a90d359d8d2f027f025b71': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | am 5eb5437a: am f118b2b8: am 26b9e56b: Correctly check for ability to write ↵Yorke Lee2015-08-072-7/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to system settings * commit '5eb5437aff10c0c6fe63dd6e57e8ac91e3b99c98': Correctly check for ability to write to system settings
| | * | | | | | | | | | | | am f118b2b8: am 26b9e56b: Correctly check for ability to write to system ↵Yorke Lee2015-08-072-7/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings * commit 'f118b2b8f8223da216eb3e549964c8d76dd98df7': Correctly check for ability to write to system settings
| * | | | | | | | | | | | | | am 0604f16a: am c72f419b: Add "Call with Note" from dialpad.Tyler Gunn2015-08-073-3/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0604f16a932ebe5889d5f3e6380f22aefcc9bff2': Add "Call with Note" from dialpad.
| | * | | | | | | | | | | | | am c72f419b: Add "Call with Note" from dialpad.Tyler Gunn2015-08-073-3/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c72f419b18258cfc6f29590e3b97dac8b175f904': Add "Call with Note" from dialpad.
| * | | | | | | | | | | | | | | am 98cf19a5: am 20c63bb4: Merge "Add "Call with a note" action." into mnc-dr-devTyler Gunn2015-08-057-25/+100
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98cf19a53d5f0c722def08a075854f7a52a97d83': Add "Call with a note" action.
| | * | | | | | | | | | | | | | am 20c63bb4: Merge "Add "Call with a note" action." into mnc-dr-devTyler Gunn2015-08-057-25/+100
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '20c63bb47435c4ab770bb3008ed2f69666d2f0aa': Add "Call with a note" action.
| * | | | | | | | | | | | | | | | am ec5371e4: (-s ours) am 480c600d: (-s ours) am 97e3b5fc: (-s ours) Import ↵Geoff Mendal2015-08-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'ec5371e4a7398bd872c536f828aa1f157e082741': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | am 480c600d: (-s ours) am 97e3b5fc: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '480c600df210b9b0c421ab4e7387a453aac849b4': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | am 48ac99fc: (-s ours) am a8e033d1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '48ac99fc155cf107e5442a93a54245ccbdd94ac1': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | am a8e033d1: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8e033d1ff1c81d68f54a7ac894db7058c7642f6': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | am a68e17a3: am 7803a759: am c14a4816: Merge "Use ACTION_SENDTO for send sms ↵Yorke Lee2015-07-291-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intent" into mnc-dev * commit 'a68e17a35ed5b8bd05504a195d17737415f624ba': Use ACTION_SENDTO for send sms intent
| | * | | | | | | | | | | | | | | | | am 7803a759: am c14a4816: Merge "Use ACTION_SENDTO for send sms intent" into ↵Yorke Lee2015-07-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '7803a759563422a12eeaf5c54561d86fd41b0d49': Use ACTION_SENDTO for send sms intent
| * | | | | | | | | | | | | | | | | | | am 6a7af7a6: (-s ours) am 3e9a75b7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a7af7a6b987a2853f6532f3abfd3c5296b20e9b': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | am 3e9a75b7: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e9a75b7da4feb61307031591608996d936547b5': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | am af789916: am 59308086: am 2b83b0f0: Merge "Don\'t update call log in ↵Yorke Lee2015-07-291-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallerInfoQueryThread without permission" into mnc-dev * commit 'af7899163012fbcd6921cc6f031470a9c0185d14': Don't update call log in CallerInfoQueryThread without permission
| | * | | | | | | | | | | | | | | | | | | am 59308086: am 2b83b0f0: Merge "Don\'t update call log in ↵Yorke Lee2015-07-291-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CallerInfoQueryThread without permission" into mnc-dev * commit '5930808671bd0acfbaffd4773cc275f72204aa94': Don't update call log in CallerInfoQueryThread without permission
| * | | | | | | | | | | | | | | | | | | | | am 4d4eb463: am bb15144e: am 142362f8: Start contact info cache query thread ↵Yorke Lee2015-07-282-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in onResume * commit '4d4eb463e2881625c00e6c84386901749ce89ad2': Start contact info cache query thread in onResume
| | * | | | | | | | | | | | | | | | | | | | am bb15144e: am 142362f8: Start contact info cache query thread in onResumeYorke Lee2015-07-282-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bb15144e72c87ea571e8718b1d788c7a83acbb04': Start contact info cache query thread in onResume
| * | | | | | | | | | | | | | | | | | | | | | am e32de99b: am 0fc67af1: am ed058349: Merge "Fix bug in FAB action" into ↵Yorke Lee2015-07-281-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit 'e32de99beb1de1272a50890ad6b090f0506a9067': Fix bug in FAB action
| | * | | | | | | | | | | | | | | | | | | | | am 0fc67af1: am ed058349: Merge "Fix bug in FAB action" into mnc-devYorke Lee2015-07-281-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0fc67af1e66405946b3af2da3be6595c2e981648': Fix bug in FAB action
| * | | | | | | | | | | | | | | | | | | | | | | am c00b4968: am d57bb10f: am 601eadd8: Remove onPreDrawListener logicYorke Lee2015-07-271-32/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c00b49680025d0a1575262716d34456e03d4c37f': Remove onPreDrawListener logic
| | * | | | | | | | | | | | | | | | | | | | | | am d57bb10f: am 601eadd8: Remove onPreDrawListener logicYorke Lee2015-07-271-32/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd57bb10f00dda90b2bfddc0e4d81e7e69a4937ca': Remove onPreDrawListener logic
| * | | | | | | | | | | | | | | | | | | | | | | | am 9b21c8e7: (-s ours) am db90beee: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9b21c8e7d514cd96e303d09a7387e34d08062bb1': Import translations. DO NOT MERGE
| | * | | | | | | | | | | | | | | | | | | | | | | am db90beee: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db90beee62e1b0cb2d306acdb8e0602d31349ed5': Import translations. DO NOT MERGE
| * | | | | | | | | | | | | | | | | | | | | | | | | am ffeb2959: am 036cb573: am 3f468007: Merge "Protect against lack of ↵Yorke Lee2015-07-255-9/+68
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev * commit 'ffeb2959e177a7f94321ca9ca3b3e55726fd7df2': Protect against lack of WRITE_SYSTEM_SETTINGS AppOp
| | * | | | | | | | | | | | | | | | | | | | | | | | am 036cb573: am 3f468007: Merge "Protect against lack of ↵Yorke Lee2015-07-255-9/+68
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WRITE_SYSTEM_SETTINGS AppOp" into mnc-dev * commit '036cb5730555161e16900129d62d06b308fb4298': Protect against lack of WRITE_SYSTEM_SETTINGS AppOp
| * | | | | | | | | | | | | | | | | | | | | | | | | | am f3feddc3: am 387a3a6f: am 86f3be75: Merge "Set correct view to display ↵Yorke Lee2015-07-251-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback error text" into mnc-dev * commit 'f3feddc3b9b7105b34b52ae89d69127ea2ebaac0': Set correct view to display playback error text