diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-13 04:01:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-01-13 04:01:26 +0000 |
| commit | 17744322aff779825af1b10e8255ed4a49c4ab13 (patch) | |
| tree | c020b0b59dd565f06ccef4cb34b172bfc89a3824 | |
| parent | f8d32b95d231693210d8c07ba5dc2462928a7960 (diff) | |
| parent | ebb3c6d1566f0c34a7ea41bded5bd657c33cc46c (diff) | |
| download | packages_apps_Messaging-17744322aff779825af1b10e8255ed4a49c4ab13.tar.gz packages_apps_Messaging-17744322aff779825af1b10e8255ed4a49c4ab13.tar.bz2 packages_apps_Messaging-17744322aff779825af1b10e8255ed4a49c4ab13.zip | |
Snap for 5228332 from ebb3c6d1566f0c34a7ea41bded5bd657c33cc46c to qt-release
Change-Id: I4b7f104a893e0338da64fdc658b89c0ce931df9d
| -rw-r--r-- | src/com/android/messaging/sms/MmsUtils.java | 2 | ||||
| -rw-r--r-- | version.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/messaging/sms/MmsUtils.java b/src/com/android/messaging/sms/MmsUtils.java index 913e9a6..9c4c2d5 100644 --- a/src/com/android/messaging/sms/MmsUtils.java +++ b/src/com/android/messaging/sms/MmsUtils.java @@ -1535,7 +1535,7 @@ public class MmsUtils { cursor = SqliteWrapper.query( context, resolver, - Telephony.Carriers.CONTENT_URI, + Telephony.Carriers.SIM_APN_URI, TEST_CARRIERS_PROJECTION, null/*selection*/, null/*selectionArgs*/, @@ -109,7 +109,7 @@ ifdef TARGET_BUILD_APPS ifeq ($(strip $(HAS_BUILD_NUMBER)),false) git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h) date_string := $$(date +%m%d%y_%H%M%S) - version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density)) + version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(BUILD_USERNAME).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density)) else version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density)) endif |