summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Manually integrate upstream oc-dr1-dev changes.Eric Erfanian2017-06-22489-649/+4631
| | | | | | | https://googleplex-android-review.git.corp.google.com/#/c/2446830/ Test: TH, make Change-Id: I39aba7e972bac6e5864e70ed693849d90ecd7e08
* Update AOSP Dialer source from internal google3 repository at cl/159428781. ↵Eric Erfanian2017-06-190-0/+0
|\ | | | | | | | | | | | | | | am: ea7890cd5e am: 0a7b301e28 -s ours Change-Id: Ifc2aaaa33992aaad8d5fa4b16fe47a5862385131
| * Update AOSP Dialer source from internal google3 repository at cl/159428781.Eric Erfanian2017-06-191173-4960/+17496
| |\ | | | | | | | | | | | | | | | am: ea7890cd5e Change-Id: I4f5e2f0040f9d8749856b6a51fb2befa398f8e4c
| | * Update AOSP Dialer source from internal google3 repository atEric Erfanian2017-06-191173-4960/+17496
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/158012278 (6/05/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. Merged-In: Ie60a84b3936efd0ea3d95d7c86bf96d2b1663030 Change-Id: If1fa394df2609f0d38b4f794c83f4db3f1006484
* | | Update AOSP Dialer source from internal google3 repository atEric Erfanian2017-06-191936-10085/+33859
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Fix dependencies of packages that target earlier releases" am: ↵Paul Duffin2017-06-130-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | 8e49b42b6f am: ef26655bcf -s ours am: b3d940136e -s ours am: 444ba7afdf -s ours Change-Id: Ie3c3b5b1b7d3c2b0870219d0c78c80cad3994b25
| * | Merge "Fix dependencies of packages that target earlier releases" am: ↵Paul Duffin2017-06-130-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e49b42b6f am: ef26655bcf -s ours am: b3d940136e -s ours Change-Id: I39e54ed8fb4fe8667df40b094c2dff4cdb20df18
| | * \ Merge "Fix dependencies of packages that target earlier releases" am: 8e49b42b6fPaul Duffin2017-06-130-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: ef26655bcf -s ours Change-Id: Ie6549560c815fb1ee03ff9ec51f27b30f5087cf9
| | | * \ Merge "Fix dependencies of packages that target earlier releases"Paul Duffin2017-06-132-1/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8e49b42b6f Change-Id: If33a227619c50e0d2b19dd3cc9f14e9d45ad5807
| | | | * | Merge "Fix dependencies of packages that target earlier releases"Treehugger Robot2017-06-132-1/+2
| | | |/| |
| | | | * | Fix dependencies of packages that target earlier releasesPaul Duffin2017-06-132-1/+2
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous change added legacy-android-test as a static dependency to all packages that build against the current, test_current or system_current and failed to compile when the junit and android.test classes were removed from the API. Unfortunately, those changes did not take into account that some of those packages target earlier API versions and so will always have the classes available at runtime. This change replaces those static dependencies with dynamic dependencies for any package that targets an earlier API version. The file changes were made automatically by a tool that constructed and then analyzed a full dependency graph of all the Android Java modules. The individual changes were checked manually to ensure that the changes matched the intent. The affected modules were built against an API with the junit and android.test classes removed. Any issues found during this process resulted in either the tool being updated to address the issue or a separate change being made to fix an existing problem with the build. A sample of the affected packages were run to ensure that they worked as expected at runtime; no issues were found during testing. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because Dialer's manifest file (AndroidManifest.xml) targets API level 23 and dynamically includes the android.test.runner library at runtime so there is no point in statically including the classes. It was not added to LOCAL_JAVA_LIBRARIES because module Dialer does not have any dependencies on android.test classes * tests/Android.mk Added 'android.test.mock.sdk' and 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module DialerTests builds against 'LOCAL_SDK_VERSION := current' and uses classes from packages android.test and android.test.mock (possibly indirectly) so will no longer compile once they are removed from the API. They were not added to LOCAL_STATIC_JAVA_LIBRARIES because DialerTests's manifest file (AndroidManifest.xml) targets API level 23 and uses the android.test.runner library which will provide the classes dynamically at runtime. Dependency 'android.test.mock.sdk' is used instead of 'android.test.mock' because module DialerTests builds against the API not internal jars and so should use libraries that build against the API not internal jars. A future change will replace the dependency on 'legacy-android-test', which builds against the internal jars with a dependency on 'android.legacy.test' which will build against the API. Bug: 30188076 Test: make checkbuild and ran a sample of tests Change-Id: Ia69a25caeef20017c311f45d046fbccb83ea7394 Merged-In: I10c2c5f315e442477be81726e7df20d569fe5305 Merged-In: I37a618deba48d87a1a03d82ad4022233b408a788
* | | | | Revert "Update AOSP Dialer source from internal google3 repository at ↵Tobias Thierer2017-06-091223-17070/+5830
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cl/158012278. am: 91ce7d2a47" This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
* | | | | Update AOSP Dialer source from internal google3 repository at cl/158012278. ↵Eric Erfanian2017-06-081223-5831/+17071
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 91ce7d2a47 am: 274b6d320e Change-Id: Iecf4325f314bf6c3324187e6406c8aae4675dd63
| * | | | Update AOSP Dialer source from internal google3 repository at cl/158012278.Eric Erfanian2017-06-081223-5831/+17071
|/| | | | | | |_|/ | |/| | | | | | | | | | | | | | am: 91ce7d2a47 Change-Id: I1744a8bfca09eae5e9c0d7aac122515eca75bb8b
| * | | Update AOSP Dialer source from internal google3 repository atEric Erfanian2017-06-071223-5831/+17071
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cl/158012278. 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/158012278 (6/05/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: I4d3f14b5140e2e51bead9497bc118a205b3ebe76
* | | Merge "Remove usages of ActionBarActivity." into oc-dev am: 28d5e3ca4aAurimas Liutikas2017-06-010-0/+0
|\| | | | | | | | | | | | | | | | | am: 141883f160 Change-Id: Ie019ef02cbc21517e78e8d053b1e7dfd150889e2
| * | Merge "Remove usages of ActionBarActivity." into oc-devAurimas Liutikas2017-06-012-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 28d5e3ca4a Change-Id: Ic4912b727886f3e9a24f6e4a88ab433b57c19057
| | * \ Merge "Remove usages of ActionBarActivity." into oc-devTreeHugger Robot2017-06-012-4/+4
| | |\ \
| | | * | Remove usages of ActionBarActivity.Aurimas Liutikas2017-05-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionBarActivity has been deprecated for 2+ years and has been extending AppCompatActivity for all that time. These changes should be no-ops. Bug: 35253513 Test: None Change-Id: Ic87c8db6f9733fbcfa59d3bc08c77013799ae652 (cherry picked from commit 27b5eaeb2d0cdffb0b89db4971894548da8afdd4)
* | | | | Merge "update glide snapshot"Roger Xue2017-06-011-3/+3
|\ \ \ \ \
| * | | | | update glide snapshotLujiang Xue2017-05-251-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: build the app Change-Id: I819306673e59a3fb53b877adf38e0294cc8c5dbf
* | | | | | Update Dialer to v10 RC45. am: 83b20211c3Eric Erfanian2017-05-3115-66/+95
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | am: ae06b1b3b8 Change-Id: I37dfc5acf163aa0942803da64ec47629622580c4
| * | | | | Update Dialer to v10 RC45.Eric Erfanian2017-05-3115-66/+95
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | am: 83b20211c3 Change-Id: Ide21415247a3ec743f5438c49d29ba2d861081b0
| | * | | | Update Dialer to v10 RC45.Eric Erfanian2017-05-3115-66/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This release was created following the instructions at: go/dialer-aosp-release Subsequent dialer releases will follow as O bugs are fixed, until we reach our final RC. Version: 10 Candidate: RC45 Branch: dialer-android_release_branch/153304843.1 dialer-android_20170416.00/dialer-android_20170416.00_RC45 This release contains the following bug fixes since RC39: Bug: 38131932 38302993 38347350 38368993 38395481 62100344 Test: make, on device Change-Id: Ib4af5dcc58c684d51ea1f4628b301e40184b81b3
* | | | | | Set camera to null when disabling IMS video transmission am: d40e05b9e0Sailesh Nepal2017-05-261-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f7f25f903 Change-Id: I9ecaf153cf214e099228ec43cdcf8b565129ff0a
| * | | | | Set camera to null when disabling IMS video transmissionSailesh Nepal2017-05-261-0/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d40e05b9e0 Change-Id: I083c9e03f38eacd2cb4eff67b07b302e67196add
| | * | | | Set camera to null when disabling IMS video transmissionSailesh Nepal2017-05-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Tyler's investigation: In the past (Marshmallow days) we used to call setCamera(null) as well as sending the downgrade request. Stopping the video transmission is one thing but I think the modem implementation depends on the camera being nulled to clean up its resources. (This CL is a manual cherry pick of cl/157154988 from google3 to gerrit.) Bug: 38395481 Change-Id: I7f71c1ffb7194165b8968cd4a033ffea1af443ed
* | | | | | Fix permissions missing in AOSP build am: 6af9c02cc2Ta-wei Yen2017-05-261-1/+2
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | am: 8b80f2b663 Change-Id: I43a9dacc38f86b7a1286cbaf28eb8b526926e30e
| * | | | Fix permissions missing in AOSP buildTa-wei Yen2017-05-261-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6af9c02cc2 Change-Id: I9862669e6fce83a12fcac9e64287346cd03e72ce
| | * | | Fix permissions missing in AOSP buildTa-wei Yen2017-05-251-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The voicemail module permissions are in a different manifest, and was not merged. Test: manual VVM smoke test Change-Id: I00c7abf16a5ed40d2d3b0e26463663e60fc8b05f Fixes: 38421210
* | | | Update Dialer to v10 RC39 am: 3ed0c281a1Eric Erfanian2017-05-231032-4880/+3159
|\| | | | | | | | | | | | | | | | | | | | | | | am: 651d758b59 Change-Id: Ie6d59b702b6504c3957836597445c9b7c1bf7f72
| * | | Update Dialer to v10 RC39Eric Erfanian2017-05-231032-4880/+3159
| |\| | | | | | | | | | | | | | | | | | | | | | am: 3ed0c281a1 Change-Id: Ibcd2bd797d09d8d5cbc490fb1779db37ec5069e7
| | * | Update Dialer to v10 RC39Eric Erfanian2017-05-231032-4880/+3159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This release was created following the instructions at: go/dialer-aosp-release Subsequent dialer releases will follow as O bugs are fixed, until we reach our final RC. Version: 10 Candidate: RC39 Branch: dialer-android_release_branch/153304843.1 dialer-android_20170416.00/dialer-android_20170416.00_RC39 This release contains the following bug fixes since RC32: Bug: 38137349 38249439 38299262 38329114 Test: make Change-Id: I65f695db8aa20902fa60835d58b41cfdfe42704b
* | | | Remove usages of ActionBarActivity.Aurimas Liutikas2017-05-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionBarActivity has been deprecated for 2+ years and has been extending AppCompatActivity for all that time. These changes should be no-ops. Bug: 35253513 Test: None Change-Id: Ic87c8db6f9733fbcfa59d3bc08c77013799ae652
* | | | Merge "Revert "Tweak app makefile with extra resources"" into oc-dev am: ↵Kirill Grouchnikov2017-05-161-7/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb63fc2c6b am: 0f06aaa508 Change-Id: I54faf5198a845a0c123e46d4e49a04bc1751a9b7
| * | | Merge "Revert "Tweak app makefile with extra resources"" into oc-devKirill Grouchnikov2017-05-161-7/+11
| |\| | | | | | | | | | | | | | | | | | | | | | am: fb63fc2c6b Change-Id: I88573a3020e6394f819245dea10ad741b6ccb81a
| | * | Merge "Revert "Tweak app makefile with extra resources"" into oc-devKirill Grouchnikov2017-05-161-7/+11
| | |\ \
| | | * | Revert "Tweak app makefile with extra resources"Kirill Grouchnikov2017-05-161-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit cb06686aba5b9e080e1b758e2ea17a73be648601. Bug: 30240339 Change-Id: Ida9c44c7d856d9bcbf921fcd8ff05cef88b69b7c
* | | | | Merge "Update Dialer to v10 RC32" into oc-dev am: 0c9dbf507bEric Erfanian2017-05-16426-371/+11867
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c57430a61e Change-Id: Ib32ae1641d7afb8a97852f16fd77dd16cb510fc4
| * | | | Merge "Update Dialer to v10 RC32" into oc-devEric Erfanian2017-05-16426-371/+11867
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0c9dbf507b Change-Id: I5f90090090c6e430d83fcdd294082c1f5237ade8
| | * | | Merge "Update Dialer to v10 RC32" into oc-devTreeHugger Robot2017-05-15426-371/+11867
| | |\ \ \
| | | * | | Update Dialer to v10 RC32Eric Erfanian2017-05-15426-371/+11867
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This release was created following the instructions at: go/dialer-aosp-release Subsequent dialer releases will follow as O bugs are fixed, until we reach our final RC. Version: 10 Candidate: RC32 Branch: dialer-android_release_branch/153304843.1 dialer-android_20170416.00/dialer-android_20170416.00_RC32 This release contains the following bug fixes since RC17: Bug: 33176679 33272455 3646510 36773894 37297649 37413780 37513689 37640315 37680595 37698062 37873639 37901752 37919295 37953423 38062852 38069600 38137349 38173549 38180252 38191514 Test: make, on device Change-Id: I4e4bb630082758e418ff24892b7db3142c6eb09a
* | | | | | Merge "Tweak app makefile with extra resources" into oc-dev am: e724c7b637Kirill Grouchnikov2017-05-161-11/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9842b4a7fd Change-Id: Ic48d984be02fb13395c4d735e673d9e7b1ea7369
| * | | | | Merge "Tweak app makefile with extra resources" into oc-devKirill Grouchnikov2017-05-151-11/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e724c7b637 Change-Id: I63a0ccc8cb1fa4908ff2c5b6f9d6a968079e12fd
| | * | | | Merge "Tweak app makefile with extra resources" into oc-devKirill Grouchnikov2017-05-151-11/+7
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Tweak app makefile with extra resourcesKirill Grouchnikov2017-05-111-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: mmma packages/apps/Dialer Bug: 30240339 Change-Id: Id7c7ba6eaf46b0561a7c186aa87e96a1d407ddcb
* | | | | Exclude SpannedTestUtils from buildPaul Duffin2017-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 922b108f43 -s ours Change-Id: Ic2444901f0fb15185d8f00adbc8c3adce15b13a2
| * | | | Exclude SpannedTestUtils from buildPaul Duffin2017-05-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SpannedTestUtils class which is built into the production Dialer app contains references to JUnit. Rather then embed JUnit in Dialer it was excluded from the build. It is not actually used at all anywhere in Dialer app so may even be able to be deleted. Bug: 30188076 Test: make checkbuild Change-Id: I10c2c5f315e442477be81726e7df20d569fe5305 Merged-In: I37a618deba48d87a1a03d82ad4022233b408a788
* | | | | Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin2017-05-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. The SpannedTestUtils class which is built into the production Dialer app contains references to JUnit. Rather then embed JUnit in Dialer it was excluded from the build. It is not actually used at all anywhere in Dialer app so may even be able to be deleted. Bug: 30188076 Test: make checkbuild Change-Id: I37a618deba48d87a1a03d82ad4022233b408a788
* | | | | Update Dialer to v10 RC17 am: 738bb09adeEric Erfanian2017-05-054-31/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 92a3240cb0 Change-Id: I25162b67d44217daed4fe11c3eb65d9ceb235eb3
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 05:02:34 +0000