Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f1c7586 authored by Eric Erfanian's avatar Eric Erfanian
Browse files

Update AOSP Dialer source from internal google3 repository at 

cl/159428781.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/152373142 (4/06/2017) to cl/159428781 (6/19/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030
parent 3d0ca68e

Android.mk

+102 −4
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 
# * removed com.google.android.geo.API_KEY key. This should be added to

#      the manifest files in java/com/android/incallui/calllocation/impl/

#      and /java/com/android/incallui/maps/impl/

# * b/62417801 removed translation string variant:

#      $ find java/com/android/incallui/res/*mcc262*/strings.xml | xargs rm

# * b/62343966 include manually generated GRPC service class:

#      $ protoc --plugin=protoc-gen-grpc-java=prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-linux-x86_64.exe \

#               --grpc-java_out=lite:"packages/apps/Dialer/java/com/android/voicemail/impl/" \

#               --proto_path="packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/" "packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto"

# * b/62787062 / b/37077388 temporarily disable proguard with javac

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)
@@ -20,11 +27,13 @@ BASE_DIR := java/com/android 
SRC_DIRS := \

	$(BASE_DIR)/contacts/common \

	$(BASE_DIR)/dialer \

	$(BASE_DIR)/dialershared \

	$(BASE_DIR)/incallui \

	$(BASE_DIR)/voicemail



# Exclude files incompatible with AOSP.

EXCLUDE_FILES := \

	$(BASE_DIR)/dialer/calllog/testing/FakeCallLogApplication.java \

	$(BASE_DIR)/incallui/calllocation/impl/AuthException.java \

	$(BASE_DIR)/incallui/calllocation/impl/CallLocationImpl.java \

	$(BASE_DIR)/incallui/calllocation/impl/CallLocationModule.java \
@@ -39,7 +48,7 @@ EXCLUDE_FILES := \ 
	$(BASE_DIR)/incallui/calllocation/impl/TrafficStatsTags.java \

	$(BASE_DIR)/incallui/maps/impl/MapsImpl.java \

	$(BASE_DIR)/incallui/maps/impl/MapsModule.java \

	$(BASE_DIR)/incallui/maps/impl/StaticMapFragment.java

	$(BASE_DIR)/incallui/maps/impl/StaticMapFragment.java \



# Exclude testing only class, not used anywhere here

EXCLUDE_FILES += \
@@ -62,19 +71,25 @@ RES_DIRS := \ 
	$(BASE_DIR)/dialer/calllog/ui/res \

	$(BASE_DIR)/dialer/calllogutils/res \

	$(BASE_DIR)/dialer/common/res \

	$(BASE_DIR)/dialer/contactactions/res \

	$(BASE_DIR)/dialer/contactsfragment/res \

	$(BASE_DIR)/dialer/dialpadview/res \

	$(BASE_DIR)/dialer/interactions/res \

	$(BASE_DIR)/dialer/main/impl/res \

	$(BASE_DIR)/dialer/notification/res \

	$(BASE_DIR)/dialer/oem/res \

	$(BASE_DIR)/dialer/phonenumberutil/res \

	$(BASE_DIR)/dialer/postcall/res \

	$(BASE_DIR)/dialer/searchfragment/list/res \

	$(BASE_DIR)/dialer/searchfragment/nearbyplaces/res \

	$(BASE_DIR)/dialer/searchfragment/common/res \

	$(BASE_DIR)/dialer/shortcuts/res \

	$(BASE_DIR)/dialer/speeddial/res \

	$(BASE_DIR)/dialer/theme/res \

	$(BASE_DIR)/dialer/util/res \

	$(BASE_DIR)/dialer/voicemailstatus/res \

	$(BASE_DIR)/dialer/widget/res \

	$(BASE_DIR)/dialershared/bubble/res \

	$(BASE_DIR)/incallui/answer/impl/affordance/res \

	$(BASE_DIR)/incallui/answer/impl/answermethod/res \

	$(BASE_DIR)/incallui/answer/impl/hint/res \
@@ -88,6 +103,7 @@ RES_DIRS := \ 
	$(BASE_DIR)/incallui/incall/impl/res \

	$(BASE_DIR)/incallui/res \

	$(BASE_DIR)/incallui/sessiondata/res \

	$(BASE_DIR)/incallui/speakerbuttonlogic/res \

	$(BASE_DIR)/incallui/telecomeventui/res \

	$(BASE_DIR)/incallui/video/impl/res \

	$(BASE_DIR)/incallui/video/protocol/res \
@@ -113,13 +129,18 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/dialer/calllog/ui/AndroidManifest.xml \

	$(BASE_DIR)/dialer/calllogutils/AndroidManifest.xml \

	$(BASE_DIR)/dialer/common/AndroidManifest.xml \

	$(BASE_DIR)/dialer/contactactions/AndroidManifest.xml \

	$(BASE_DIR)/dialer/contactsfragment/AndroidManifest.xml \

	$(BASE_DIR)/dialer/dialpadview/AndroidManifest.xml \

	$(BASE_DIR)/dialer/interactions/AndroidManifest.xml \

	$(BASE_DIR)/dialer/main/impl/AndroidManifest.xml \

	$(BASE_DIR)/dialer/notification/AndroidManifest.xml \

	$(BASE_DIR)/dialer/oem/AndroidManifest.xml \

	$(BASE_DIR)/dialer/phonenumberutil/AndroidManifest.xml \

	$(BASE_DIR)/dialer/postcall/AndroidManifest.xml \

	$(BASE_DIR)/dialer/searchfragment/list/AndroidManifest.xml \

	$(BASE_DIR)/dialer/searchfragment/nearbyplaces/AndroidManifest.xml \

	$(BASE_DIR)/dialer/searchfragment/common/AndroidManifest.xml \

	$(BASE_DIR)/dialer/shortcuts/AndroidManifest.xml \

	$(BASE_DIR)/dialer/simulator/impl/AndroidManifest.xml \

	$(BASE_DIR)/dialer/speeddial/AndroidManifest.xml \
@@ -127,6 +148,7 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/dialer/util/AndroidManifest.xml \

	$(BASE_DIR)/dialer/voicemailstatus/AndroidManifest.xml \

	$(BASE_DIR)/dialer/widget/AndroidManifest.xml \

	$(BASE_DIR)/dialershared/bubble/AndroidManifest.xml \

	$(BASE_DIR)/incallui/AndroidManifest.xml \

	$(BASE_DIR)/incallui/answer/impl/affordance/AndroidManifest.xml \

	$(BASE_DIR)/incallui/answer/impl/AndroidManifest.xml \
@@ -139,12 +161,13 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/incallui/hold/AndroidManifest.xml \

	$(BASE_DIR)/incallui/incall/impl/AndroidManifest.xml \

	$(BASE_DIR)/incallui/sessiondata/AndroidManifest.xml \

	$(BASE_DIR)/incallui/speakerbuttonlogic/AndroidManifest.xml \

	$(BASE_DIR)/incallui/telecomeventui/AndroidManifest.xml \

	$(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \

	$(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \

	$(BASE_DIR)/incallui/wifi/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/impl/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/permissions.xml \

	$(BASE_DIR)/voicemail/AndroidManifest.xml \





# Merge all manifest files.
@@ -180,19 +203,25 @@ LOCAL_AAPT_FLAGS := \ 
	--extra-packages com.android.dialer.calllog.ui \

	--extra-packages com.android.dialer.calllogutils \

	--extra-packages com.android.dialer.common \

        --extra-packages com.android.dialer.contactactions \

	--extra-packages com.android.dialer.contactsfragment \

	--extra-packages com.android.dialer.dialpadview \

	--extra-packages com.android.dialer.interactions \

	--extra-packages com.android.dialer.main.impl \

	--extra-packages com.android.dialer.notification \

	--extra-packages com.android.dialer.oem \

	--extra-packages com.android.dialer.phonenumberutil \

	--extra-packages com.android.dialer.postcall \

	--extra-packages com.android.dialer.searchfragment.list \

	--extra-packages com.android.dialer.searchfragment.nearbyplaces \

	--extra-packages com.android.dialer.searchfragment.common \

	--extra-packages com.android.dialer.shortcuts \

	--extra-packages com.android.dialer.speeddial \

	--extra-packages com.android.dialer.theme \

	--extra-packages com.android.dialer.util \

	--extra-packages com.android.dialer.voicemailstatus \

	--extra-packages com.android.dialer.widget \

	--extra-packages com.android.dialershared.bubble \

	--extra-packages com.android.incallui \

	--extra-packages com.android.incallui.answer.impl \

	--extra-packages com.android.incallui.answer.impl.affordance \
@@ -209,6 +238,7 @@ LOCAL_AAPT_FLAGS := \ 
	--extra-packages com.android.incallui.incall.impl \

	--extra-packages com.android.incallui.maps.impl \

	--extra-packages com.android.incallui.sessiondata \

	--extra-packages com.android.incallui.speakerbuttonlogic \

	--extra-packages com.android.incallui.telecomeventui \

	--extra-packages com.android.incallui.video \

	--extra-packages com.android.incallui.video.impl \
@@ -223,6 +253,7 @@ LOCAL_AAPT_FLAGS := \ 


LOCAL_STATIC_JAVA_LIBRARIES := \

	android-common \

	android-support-dynamic-animation \

	com.android.vcard \

	dialer-commons-io-target \

	dialer-dagger2-target \
@@ -230,6 +261,11 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	dialer-gifdecoder-target \

	dialer-glide-target \

	dialer-guava-target \

        dialer-grpc-all-target \

        dialer-grpc-core-target \

	dialer-grpc-okhttp-target \

	dialer-grpc-protobuf-lite-target \

        dialer-grpc-stub-target \

	dialer-javax-annotation-api-target \

	dialer-javax-inject-target \

	dialer-libshortcutbadger-target \
@@ -270,6 +306,13 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(PROCESSOR_JARS) 
LOCAL_JACK_FLAGS += --processorpath $(call normalize-path-list,$(PROCESSOR_JARS))

LOCAL_JAVACFLAGS += -processorpath $(call normalize-path-list,$(PROCESSOR_JARS))





# Begin Bug: 37077388

LOCAL_DX_FLAGS := --core-library --multi-dex

LOCAL_JACK_FLAGS := --multi-dex native



LOCAL_PROGUARD_ENABLED := disabled

ifdef LOCAL_JACK_ENABLED

# Proguard includes

LOCAL_PROGUARD_FLAG_FILES := \

    java/com/android/dialer/common/proguard.flags \
@@ -279,11 +322,11 @@ LOCAL_PROGUARD_FLAG_FILES := \ 
    java/com/android/incallui/answer/impl/proguard.flags

LOCAL_PROGUARD_ENABLED := custom



ifdef LOCAL_JACK_ENABLED

# Bug: 37077388

LOCAL_PROGUARD_ENABLED += optimization

endif



# End Bug: 37077388



LOCAL_SDK_VERSION := system_current

LOCAL_MODULE_TAGS := optional

LOCAL_PACKAGE_NAME := Dialer
@@ -314,6 +357,11 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ 
    dialer-dagger2:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-all:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-core:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1$(COMMON_JAVA_PACKAGE_SUFFIX)
@@ -432,3 +480,53 @@ LOCAL_UNINSTALLABLE_MODULE := true 
include $(BUILD_PREBUILT)



include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-grpc-core-target

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-grpc-okhttp-target

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-grpc-protobuf-lite-target

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-grpc-stub-target

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-grpc-all-target

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)

AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  coreApp="true"

  package="com.android.dialer"

  android:versionCode="130000"

  android:versionName="10.0">

  android:versionCode="140000"

  android:versionName="11.0">



  <uses-sdk

    android:minSdkVersion="23"
@@ -55,6 +55,7 @@ 
  <uses-permission android:name="android.permission.BROADCAST_STICKY"/>

  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

  <uses-permission android:name="android.permission.SEND_SMS"/>

  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>



  <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>

  <!-- We use this to disable the status bar buttons of home, back and recent

assets/quantum/res/drawable-hdpi/quantum_ic_bluetooth_audio_white_24.png

0 → 100644
+438 B
Loading image diff...

assets/quantum/res/drawable-hdpi/quantum_ic_check_circle_googblue_24.png

deleted100644 → 0
−407 B
Loading image diff...

assets/quantum/res/drawable-hdpi/quantum_ic_close_white_24.png

−45 B (176 B)
Loading image diff...