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

Commit fc37b02f authored by Eric Erfanian's avatar Eric Erfanian
Browse files

Update AOSP Dialer source from internal google3 repository at 

cl/150756069

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/150392808 (3/16/2017) to cl/150756069 (3/21/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: I0888b5db52efb28eb8194600e0c7804592f975f3
parent 30ccc4f3

Android.mk

+0 −6
Original line number Diff line number Diff line 
# Local modifications:

# * b/36287059 Dagger classes have been manually crafted.

# * b/31757757 Precompiled proto classes have been included.

# * b/36215428 dialer/oem/res/values-mcc3* have been pruned

# * b/36383971 StubCallLocationModule modified to return null.

# * removed com.google.android.backup.api_key. This should be added to

#      the manifest in the top level directory.

# * removed com.google.android.geo.API_KEY key. This should be added to
@@ -31,10 +29,6 @@ SRC_DIRS := \ 


# Exclude files incompatible with AOSP.

EXCLUDE_FILES := \

	$(BASE_DIR)/dialer/debug/bindings/impl/DebugBindings.java \

	$(BASE_DIR)/dialer/debug/bindings/stub/DebugBindings.java \

	$(BASE_DIR)/dialer/debug/impl/DebugConnection.java \

	$(BASE_DIR)/dialer/debug/impl/DebugConnectionService.java \

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

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

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

AndroidManifest.xml

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

  coreApp="true"

  package="com.android.dialer"

  android:versionCode="100000"

  android:versionCode="130000"

  android:versionName="10.0">



  <uses-sdk

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

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

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

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

assets/quantum/res/drawable-mdpi/quantum_ic_dialpad_white_24.png

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