diff options
Diffstat (limited to 'java/com')
21 files changed, 50 insertions, 18 deletions
diff --git a/java/com/android/dialer/app/AndroidManifest.xml b/java/com/android/dialer/app/AndroidManifest.xml index be0015b35..ade5bd447 100644 --- a/java/com/android/dialer/app/AndroidManifest.xml +++ b/java/com/android/dialer/app/AndroidManifest.xml @@ -56,7 +56,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/assisteddialing/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/AndroidManifest.xml index 0c2302bba..6b44f1b1a 100644 --- a/java/com/android/dialer/assisteddialing/AndroidManifest.xml +++ b/java/com/android/dialer/assisteddialing/AndroidManifest.xml @@ -17,6 +17,6 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml index 1405841f7..fb6e30510 100644 --- a/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml +++ b/java/com/android/dialer/assisteddialing/ui/AndroidManifest.xml @@ -17,7 +17,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> <activity diff --git a/java/com/android/dialer/binary/google/AndroidManifest.xml b/java/com/android/dialer/binary/google/AndroidManifest.xml index d504d21d1..8555ff6e0 100644 --- a/java/com/android/dialer/binary/google/AndroidManifest.xml +++ b/java/com/android/dialer/binary/google/AndroidManifest.xml @@ -21,7 +21,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <uses-permission android:name="android.permission.CALL_PHONE"/> <uses-permission android:name="android.permission.READ_CONTACTS"/> diff --git a/java/com/android/dialer/calllog/AndroidManifest.xml b/java/com/android/dialer/calllog/AndroidManifest.xml index a48723355..35a798ec2 100644 --- a/java/com/android/dialer/calllog/AndroidManifest.xml +++ b/java/com/android/dialer/calllog/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/calllog/config/AndroidManifest.xml b/java/com/android/dialer/calllog/config/AndroidManifest.xml index 73a0f1f99..80ba1d5c3 100644 --- a/java/com/android/dialer/calllog/config/AndroidManifest.xml +++ b/java/com/android/dialer/calllog/config/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml index e5b72f233..a7b3aebd2 100644 --- a/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml +++ b/java/com/android/dialer/main/impl/toolbar/res/layout/expanded_search_bar.xml @@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/search_box_expanded" android:layout_width="match_parent" - android:layout_height="@dimen/expanded_search_bar_height" + android:layout_height="@dimen/collapsed_search_bar_height" android:visibility="invisible"> <ImageButton diff --git a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java index df7716cfd..9e3039461 100644 --- a/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java +++ b/java/com/android/dialer/phonenumberutil/PhoneNumberHelper.java @@ -202,6 +202,9 @@ public class PhoneNumberHelper { if (presentation == CallLog.Calls.PRESENTATION_RESTRICTED) { return false; } + if (presentation == CallLog.Calls.PRESENTATION_UNAVAILABLE) { + return false; + } if (presentation == CallLog.Calls.PRESENTATION_PAYPHONE) { return false; } diff --git a/java/com/android/dialer/promotion/impl/AndroidManifest.xml b/java/com/android/dialer/promotion/impl/AndroidManifest.xml index 209072bd8..55a165765 100644 --- a/java/com/android/dialer/promotion/impl/AndroidManifest.xml +++ b/java/com/android/dialer/promotion/impl/AndroidManifest.xml @@ -18,6 +18,6 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/dialer/shortcuts/AndroidManifest.xml b/java/com/android/dialer/shortcuts/AndroidManifest.xml index 826ad9c28..e54b659ca 100644 --- a/java/com/android/dialer/shortcuts/AndroidManifest.xml +++ b/java/com/android/dialer/shortcuts/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application> diff --git a/java/com/android/dialer/simulator/impl/SimulatorDialogFragment.java b/java/com/android/dialer/simulator/impl/SimulatorDialogFragment.java index 96ea62739..dcf803250 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorDialogFragment.java +++ b/java/com/android/dialer/simulator/impl/SimulatorDialogFragment.java @@ -27,7 +27,7 @@ import android.widget.EditText; public final class SimulatorDialogFragment extends DialogFragment { private final String[] callerIdPresentationItems = { - "ALLOWED", "PAYPHONE", "RESTRICTED", "UNKNOWN" + "ALLOWED", "PAYPHONE", "RESTRICTED", "UNKNOWN", "UNAVAILABLE" }; private int callerIdPresentationChoice = 1; @@ -68,6 +68,9 @@ public final class SimulatorDialogFragment extends DialogFragment { case 3: callerIdPresentationChoice = TelecomManager.PRESENTATION_UNKNOWN; break; + case 4: + callerIdPresentationChoice = TelecomManager.PRESENTATION_UNAVAILABLE; + break; default: throw new IllegalStateException("Unknown presentation choice selected!"); } diff --git a/java/com/android/dialer/spannable/AndroidManifest.xml b/java/com/android/dialer/spannable/AndroidManifest.xml index afc1675a7..e768daccd 100644 --- a/java/com/android/dialer/spannable/AndroidManifest.xml +++ b/java/com/android/dialer/spannable/AndroidManifest.xml @@ -18,5 +18,5 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java index 211af86ad..caba77f12 100644 --- a/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java +++ b/java/com/android/dialer/speeddial/database/SpeedDialEntryDatabaseHelper.java @@ -125,7 +125,7 @@ public final class SpeedDialEntryDatabaseHelper extends SQLiteOpenHelper Channel.builder() .setNumber(number) .setPhoneType(cursor.getInt(POSITION_PHONE_TYPE)) - .setLabel(Optional.of(cursor.getString(POSITION_PHONE_LABEL)).or("")) + .setLabel(Optional.fromNullable(cursor.getString(POSITION_PHONE_LABEL)).or("")) .setTechnology(cursor.getInt(POSITION_PHONE_TECHNOLOGY)) .build(); } diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index e2afd9a30..7283702fa 100644 --- a/java/com/android/incallui/AndroidManifest.xml +++ b/java/com/android/incallui/AndroidManifest.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/> <!-- We use this to disable the status bar buttons of home, back and recent diff --git a/java/com/android/incallui/autoresizetext/AndroidManifest.xml b/java/com/android/incallui/autoresizetext/AndroidManifest.xml index 9bff6f20d..f66ee5709 100644 --- a/java/com/android/incallui/autoresizetext/AndroidManifest.xml +++ b/java/com/android/incallui/autoresizetext/AndroidManifest.xml @@ -19,7 +19,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <application /> </manifest> diff --git a/java/com/android/incallui/rtt/protocol/AndroidManifest.xml b/java/com/android/incallui/rtt/protocol/AndroidManifest.xml index c0d39b091..05f475725 100644 --- a/java/com/android/incallui/rtt/protocol/AndroidManifest.xml +++ b/java/com/android/incallui/rtt/protocol/AndroidManifest.xml @@ -18,5 +18,5 @@ package="com.android.incallui.rtt.protocol"> <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="26"/> + android:targetSdkVersion="30"/> </manifest>
\ No newline at end of file diff --git a/java/com/android/incallui/video/protocol/AndroidManifest.xml b/java/com/android/incallui/video/protocol/AndroidManifest.xml index c73ce10b3..8548e9954 100644 --- a/java/com/android/incallui/video/protocol/AndroidManifest.xml +++ b/java/com/android/incallui/video/protocol/AndroidManifest.xml @@ -18,5 +18,5 @@ package="com.android.incallui.video.protocol"> <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> </manifest> diff --git a/java/com/android/voicemail/AndroidManifest.xml b/java/com/android/voicemail/AndroidManifest.xml index ccd89a9a5..d5c9a2d1d 100644 --- a/java/com/android/voicemail/AndroidManifest.xml +++ b/java/com/android/voicemail/AndroidManifest.xml @@ -18,7 +18,7 @@ <uses-sdk android:minSdkVersion="24" - android:targetSdkVersion="29"/> + android:targetSdkVersion="30"/> <!-- Applications using this module should merge these permissions using android_manifest_merge --> diff --git a/java/com/android/voicemail/impl/fetch/FetchVoicemailReceiver.java b/java/com/android/voicemail/impl/fetch/FetchVoicemailReceiver.java index 9fda37343..7be22e45d 100644 --- a/java/com/android/voicemail/impl/fetch/FetchVoicemailReceiver.java +++ b/java/com/android/voicemail/impl/fetch/FetchVoicemailReceiver.java @@ -202,6 +202,9 @@ public class FetchVoicemailReceiver extends BroadcastReceiver { new Runnable() { @Override public void run() { + if (networkCallback != null) { + networkCallback.waitForIpv4(); + } try { while (retryCount > 0) { VvmLog.i(TAG, "fetching voicemail, retry count=" + retryCount); diff --git a/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java b/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java index 86d645215..a7d578d98 100644 --- a/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java +++ b/java/com/android/voicemail/impl/sync/VvmNetworkRequest.java @@ -77,7 +77,11 @@ public class VvmNetworkRequest { new FutureNetworkRequestCallback(config, handle, status); callback.requestNetwork(); try { - return callback.getFuture().get(); + NetworkWrapper ret = callback.getFuture().get(); + if (ret != null) { + callback.waitForIpv4(); + } + return ret; } catch (InterruptedException | ExecutionException e) { callback.releaseNetwork(); VvmLog.e(TAG, "can't get future network", e); diff --git a/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java b/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java index c0ab6788e..5762a09d0 100644 --- a/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java +++ b/java/com/android/voicemail/impl/sync/VvmNetworkRequestCallback.java @@ -18,9 +18,12 @@ package com.android.voicemail.impl.sync; import android.annotation.TargetApi; import android.content.Context; import android.net.ConnectivityManager; +import android.net.InetAddresses; +import android.net.LinkProperties; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkRequest; +import android.os.ConditionVariable; import android.os.Build.VERSION_CODES; import android.os.Handler; import android.os.Looper; @@ -125,6 +128,22 @@ public abstract class VvmNetworkRequestCallback extends ConnectivityManager.Netw resultReceived = true; } + private static final int DEFAULT_IPV4_WAIT_DELAY_MS = 500; // in milliseconds + private final ConditionVariable mWaitV4Cv = new ConditionVariable(); + @Override + @CallSuper + public void onLinkPropertiesChanged(Network network, LinkProperties lp) { + boolean hasIPv4 = (lp != null) && + (lp.isReachable(InetAddresses.parseNumericAddress("8.8.8.8"))); + if(hasIPv4) { + mWaitV4Cv.open(); + } + } + public void waitForIpv4() { + VvmLog.w(TAG, "Waiting for IPV4 address..."); + mWaitV4Cv.block(DEFAULT_IPV4_WAIT_DELAY_MS); + } + @CallSuper public void onUnavailable() { VvmLog.i(TAG, "onUnavailable"); |