summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | | am 50595fdf: Added the body hash code to the message id for duplicate message...Jack Yu2015-06-231-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75e70083: Change to make serviceState in CellBroadcastReceiver static.Amit Mahajan2015-06-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f6bd914: Change to ensure CellBroadcast service does not hold wakeLock in...Amit Mahajan2015-06-031-4/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 96d6b6e0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 12d864c5: Switch CellBroadcastSettings to Theme.Material.SettingsJason Monk2015-05-201-5/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f70e75a0: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-05-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2016-03-0513-0/+1475
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide CMAS dev options in user buildsLuis Vidal2016-02-231-4/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Themes: Expose hardcoded styles and colors for themesBryan Owens2015-12-295-7/+49
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatic translation importMichael Bestas2015-12-254-0/+514
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/pac...Steve Kondik2015-12-072-3/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE. Fixed emergency alert TTS not playing on bluetooth speaker.Jack Yu2015-10-161-2/+21
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that emergency alert reminder does not trigger every 2 minutes.Jack Yu2015-10-141-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fixed that "Turn on notification" does not work." into mnc-dr-devJack Yu2015-09-253-12/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that "Turn on notification" does not work.Jack Yu2015-09-243-12/+23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-0511-61/+111
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that "Turn on notification" does not work.Jack Yu2015-09-253-12/+23
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | / Import translations. DO NOT MERGEBaligh Uddin2015-09-242-26/+26
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-186-16/+16
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Always show "Turn on Notification" for some carriers." into mnc-dr-devJack Yu2015-09-161-1/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Always show "Turn on Notification" for some carriers.Jack Yu2015-09-141-1/+33
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am a0b0023a: Fixed the incorrect audio duration used for ETWS messages.Jack Yu2015-09-161-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Fixed the incorrect audio duration used for ETWS messages.Jack Yu2015-09-151-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | Make CMAS monthly test messages additional language enabled for all SIMs.Jack Yu2015-09-151-16/+6
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Added CMAS monthly test additional language messages support.Jack Yu2015-09-091-19/+36
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 07a6c467: Fixed that severe CMAS messages were not disabled.Jack Yu2015-09-021-6/+5
| |\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fixed that severe CMAS messages were not disabled.Jack Yu2015-09-021-6/+5
| * | | | | | | | | | | | | | | | | | | | am 870b4faa: Merge "Fixed that CMAS duplicate detection is not working" into ...Jack Yu2015-08-041-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am db67df1f: Don\'t vibrate cell broadcast alerts if phone is on silent.Julia Reynolds2015-08-031-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am dd9555e7: Allow carriers to force disable ETWS/CMAS test messages.Jack Yu2015-07-234-11/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 26f398e2: Added multi-sim support to the test app.Jack Yu2015-07-233-58/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am c4ef6116: Make CellBroadCast MSIM awareSanket Padawe2015-07-167-195/+556
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 343f0512: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 6881bc35: Fix typo in permission in Android Manifest for Cellbroadcast.Sanket Padawe2015-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 141aca85: Send broadcast twice - once for READ_PHONE_STATE & once for PRIV...Amit Mahajan2015-07-132-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-118-10/+10
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | CB: Add system property to enable/disable dup detectionRika Brooks2015-10-061-25/+33
* | | | | | | | | | | | | | | | | | | Fixed the incorrect audio duration used for ETWS messages.Jack Yu2015-09-151-1/+2
* | | | | | | | | | | | | | | | | | | Fixed that severe CMAS messages were not disabled.Jack Yu2015-09-021-6/+5
| |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "Fixed that CMAS duplicate detection is not working" into mnc-devJack Yu2015-08-041-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixed that CMAS duplicate detection is not workingJack Yu2015-08-031-1/+8
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | Don't vibrate cell broadcast alerts if phone is on silent.Julia Reynolds2015-08-031-0/+1
|/ / / / / / / / / / / / / / / /
* | | | | | / / / / / / / / / / Allow carriers to force disable ETWS/CMAS test messages.Jack Yu2015-07-234-11/+64
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Added multi-sim support to the test app.Jack Yu2015-07-223-58/+81
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Make CellBroadCast MSIM awareSanket Padawe2015-07-157-195/+556
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-159-18/+18
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Fix typo in permission in Android Manifest for Cellbroadcast.Sanket Padawe2015-07-141-1/+1
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Send broadcast twice - once for READ_PHONE_STATE & once for PRIVILEGEDAmit Mahajan2015-07-132-0/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge "Fix permissions on TelephonyManager" into mnc-devRobert Greenwalt2015-07-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix permissions on TelephonyManagerRobert Greenwalt2015-07-071-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |