Colin Cross 09d3aef926 Merge changes from topic "hidl-system-api" ...

am: 88a2b68252

Change-Id: I862274d2d6a258f252370a9ae3843a31c038d684

2018-04-10 10:43:52 -07:00

..

java

Merge changes from topic "hidl-system-api"

2018-04-10 10:43:52 -07:00

jni

Fix seccomp filter set up in zygote

2018-03-28 16:26:28 -07:00

proto/android

Bluetooth: Separate enable and disable Reasons from package name

2018-03-08 01:38:48 +00:00

res

Merge "Fixed the Premium SMS bug reported by our partner The detail is that : === <shortcode country="ae" free="3214|1017"/> === As displayed above, Arab Emirates is registered in sms_short_codes.xml. There is only CATEGORY_FREE_SHORT_CODE number for the county code "ae". All other numbers which include length under 5 digits is set as CATEGORY_NOT_SHORT_CODE, and so Premium SMS pop-up does not appear for both case. pattern="\\d{1,5}" is added to all similar entries BUG:66911380"

2018-03-29 07:40:39 +00:00

tests

Merge "Add Telecom debug setting for enabling enhanced call blocking."

2018-03-21 22:11:33 +00:00