summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-11Merge "Added extra message enabled check when receiving alerts"Jack Yu
am: dea5466530 Change-Id: If3d6cf17366897da5509bba7afcc6e383cf128bc
2017-07-11Merge "Added extra message enabled check when receiving alerts"android-o-preview-4Treehugger Robot
2017-07-11Made message body duplicate detection customizableJack Yu
For all Japanese carriers, we should consider message body when performing duplicate detection. Test: Manual bug: 62184395 Change-Id: I044b9c8d2e0fe71567ac5ae4fc0abf33284fb487
2017-07-11Added extra message enabled check when receiving alertsJack Yu
Though we are not supposed to receive messages that are not enabled, it is still safer to add extra enablement check when receiving the alerts. bug: 62184825 Test: Cell broadcast receiver unit tests Merged-In: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5 Change-Id: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5
2017-07-11Merge "Added extra message enabled check when receiving alerts"Jack Yu
2017-07-10Added extra message enabled check when receiving alertsJack Yu
Though we are not supposed to receive messages that are not enabled, it is still safer to add extra enablement check when receiving the alerts. bug: 62184825 Test: Cell broadcast receiver unit tests Change-Id: I04bd6ebfb5672c39b25c4bcbd36b94e58e8a0ee5
2017-07-07release-request-ccd04736-6e66-4825-a227-ecd69d8b5337-for-git_oc-mr1-release- ↵android-build-team Robot
4163697 snap-temp-L79500000080559163 Change-Id: Iaa531bee538449aaf29da63f9df55b4e1744f4f6
2017-07-07Import translations. DO NOT MERGE am: f7dd464d80 -s oursBill Yi
am: 042d23be66 -s ours Change-Id: I8674b7e5287a2e89d84ec5b7f2cc000a81e10be1
2017-07-07Import translations. DO NOT MERGEBill Yi
am: f7dd464d80 -s ours Change-Id: Ia64bdd9f252423bede7aba8396ab4e318c60b4be
2017-07-07Import translations. DO NOT MERGEBill Yi
Change-Id: Ie2d3f4e680729f4bc521ba16a37e8c7c80f59c26 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-07-07Import translations. DO NOT MERGEBill Yi
Change-Id: Ib912ee2f4394bfa92b8f6b3724b4649cac5fd3ec Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
2017-07-02release-request-d9dc98f7-19b2-484c-b4d1-f35dc43e9c05-for-git_oc-mr1-release- ↵android-build-team Robot
4152006 snap-temp-L91700000079405440 Change-Id: I7c9113eb5cd0540749c0abc4cfb45fa6122b248e
2017-07-01Import translations. DO NOT MERGE am: edc6795a6c -s oursBill Yi
am: 1936f60722 -s ours Change-Id: Iada4c5902003966a2ce4fac044919f7fd27592e3
2017-07-01Import translations. DO NOT MERGEBill Yi
am: edc6795a6c -s ours Change-Id: I402552db4bd48601ebf6f2a1f60eea5f21787553
2017-07-01Import translations. DO NOT MERGEBill Yi
Change-Id: I040ec379fd3666703a8bade66c33d127a294ed64 Auto-generated-cl: translation import
2017-07-01Import translations. DO NOT MERGEBill Yi
Change-Id: I4bc3cf0afc77ca42bb08bce2b5e1d594a50b5cf5 Auto-generated-cl: translation import
2017-06-28release-request-1b0d6769-ebfa-4e2d-b128-039ac0dcd5c9-for-git_oc-mr1-release- ↵android-build-team Robot
4140700 snap-temp-L81200000078275553 Change-Id: I8a88a87d918b42443433bfb911eb353f521ce602
2017-06-27Import translations. DO NOT MERGE am: a4ba198295 -s oursBill Yi
am: edd7744711 -s ours Change-Id: Ie9b12d6e87bb018615ebc6f97509c5e8ff808357
2017-06-27Import translations. DO NOT MERGEBill Yi
am: a4ba198295 -s ours Change-Id: I0f9e53916ff7a431a55138e193f9da02da202466
2017-06-27Import translations. DO NOT MERGEBill Yi
Change-Id: I09ce002cde7b4ab4558874c21ede1028b0851b35 Auto-generated-cl: translation import
2017-06-27Import translations. DO NOT MERGEBill Yi
Change-Id: I3cf54ad7fe28cb43a96d991157ff7bf56b82184f Auto-generated-cl: translation import
2017-06-25release-request-7bfcab52-d1c0-4256-9d6b-5b5092bc78ca-for-git_oc-mr1-release- ↵android-build-team Robot
4133428 snap-temp-L95800000077479875 Change-Id: I44969e2bceecd528bca886da2c69a72e025414c8
2017-06-24resolve merge conflicts of 424bb84 to oc-dr1-dev-plus-aospJack Yu
am: 3757b935ce -s ours Change-Id: I90e08bcbc6573de30bd554f701165d7ab43d8b00
2017-06-23resolve merge conflicts of 424bb84 to oc-dr1-dev-plus-aospJack Yu
Test: I solemnly swear I tested this conflict resolution. Change-Id: I2bd6478f79b42d2eb3c4fda7b55773da67dab168
2017-06-23Merge "Refactored area update info support" into oc-dr1-devJack Yu
2017-06-23Refactored area update info supportJack Yu
1. Refactored area update information support so it is not limited to channel 50 and Brazil. 2. Added channel 60 for India. Test: Manual bug: 37746109 Merged-In: Ib4918471d2ce0d18502b82c8bde8beca4e4896be Change-Id: Ib4918471d2ce0d18502b82c8bde8beca4e4896be
2017-06-23Merge "Refactored area update info support"TreeHugger Robot
2017-06-23Import translations. DO NOT MERGE am: 21fe312d88 -s oursBill Yi
am: 8b15d6e8c0 -s ours Change-Id: Id7d46c294c53cd8cca7af3755c554db05c7c933d
2017-06-23Import translations. DO NOT MERGEBill Yi
am: 21fe312d88 -s ours Change-Id: I6807fa40cb61120fa9e7363a289567c264590bb4
2017-06-23Import translations. DO NOT MERGEBill Yi
Change-Id: I12abc722f65423a1f329f63b4efe561e86897a52 Auto-generated-cl: translation import
2017-06-23Import translations. DO NOT MERGEBill Yi
Change-Id: Ie045ce45017bb7cd509defb4cfe4b5429e7839d9 Auto-generated-cl: translation import
2017-06-22Refactored area update info supportJack Yu
1. Refactored area update information support so it is not limited to channel 50 and Brazil. 2. Added channel 60 for India. Test: Manual bug: 37746109 Change-Id: Ib4918471d2ce0d18502b82c8bde8beca4e4896be
2017-06-22release-request-36fe639f-9404-4c33-86fb-47bc4ab2221f-for-git_oc-mr1-release- ↵android-build-team Robot
4124666 snap-temp-L64200000076596327 Change-Id: I6be7b1e967418af7c52a73757047d0a867818da6
2017-06-21Import translations. DO NOT MERGE am: f0f8f1fa91 -s oursBill Yi
am: d5b7f9b5ba -s ours Change-Id: I1ffe91333f9cfad509984ed01bdae3119d9041ff
2017-06-21Import translations. DO NOT MERGEBill Yi
am: f0f8f1fa91 -s ours Change-Id: I3e236b2305e9c54a3cf6b9ff1fdbc60702996932
2017-06-21Import translations. DO NOT MERGEBill Yi
Change-Id: I03c3ed49de7f02cde3825f5eb65688f5d0abfe63 Auto-generated-cl: translation import
2017-06-21Import translations. DO NOT MERGEBill Yi
Change-Id: Ife328e0686c0f90b33d639302fc4602a1b315c2b Auto-generated-cl: translation import
2017-06-18release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release- ↵android-build-team Robot
4111654 snap-temp-L22900000075285650 Change-Id: I6725d06d05342fb3417b6166102acca230cf3112
2017-06-16Import translations. DO NOT MERGE am: db4c835d47 -s oursBill Yi
am: 01c9ccab9a -s ours Change-Id: I7bf54029e3642cd12ac8da6079c1082fc165d00f
2017-06-16Import translations. DO NOT MERGEBill Yi
am: db4c835d47 -s ours Change-Id: If2c85aaec18301dfda9ca8f852f3c84fe651b952
2017-06-15Import translations. DO NOT MERGEBill Yi
Change-Id: Ia151e7806105fbf2c2e01c6ae49b725f542fc490 Auto-generated-cl: translation import
2017-06-15Import translations. DO NOT MERGEBill Yi
Change-Id: I2ac6d46f3aef06ef3fe923de986d2012ae0eabdc Auto-generated-cl: translation import
2017-06-16Merge "Make "Developer options" category in CellBroadcast not searchable." ↵Xiangyu/Malcolm Chen
into oc-dr1-dev am: a87a105c06 am: 074c0f2b05 Change-Id: I64330c8900f81266d0bf10b2f6005ae4063e34d7
2017-06-16Merge "Make "Developer options" category in CellBroadcast not searchable." ↵Xiangyu/Malcolm Chen
into oc-dr1-dev am: a87a105c06 Change-Id: I00b589734049b33646e9b9d9fd67b28e71b759ea
2017-06-16Merge "Make "Developer options" category in CellBroadcast not searchable." ↵Xiangyu/Malcolm Chen
into oc-dr1-dev
2017-06-14release-request-b1bd0f0e-f3c4-414e-8f22-d9235831ae23-for-git_oc-mr1-release- ↵android-build-team Robot
4099045 snap-temp-L41300000074003051 Change-Id: I53980f4c1d9c2db5e7b089e029f88e3aa49cb3ca
2017-06-14Merge "Import translations. DO NOT MERGE"TreeHugger Robot
2017-06-13Make "Developer options" category in CellBroadcast not searchable.Malcolm Chen
Make "Developer options" category in CellBroadcastReceiver as a NonIndexableKey so that it won't show up in search result. Bug: 37664696 Test: manual Change-Id: I1f636521606562d4230a43c16d554cb18a7fc0d3
2017-06-13Merge "When creating Setting activity, only create fragment if needed." into ↵Malcolm Chen
oc-dr1-dev am: b60bb52588 am: 4bf488aff0 -s ours Change-Id: I9c0b9754fcb4d9565f7ff64020d9ccc5a1f8f40b
2017-06-13Merge "When creating Setting activity, only create fragment if needed." into ↵Malcolm Chen
oc-dr1-dev am: b60bb52588 Change-Id: I0215d2dcbafe4f9984280f50eb746e8fa4f4f8ac
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 15:16:56 +0000