Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add the assisted dialing carrier config.""

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-26 16:02:34 +00:00
committed by Android (Google) Code Review
parent be01248470 dd2db2f5a3
commit c73f954cc7
7 changed files with 9 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/current.txt
View File

@@ -34637,10 +34637,9 @@ package android.provider {
field public static final java.lang.String DURATION = "duration";
field public static final java.lang.String EXTRA_CALL_TYPE_FILTER = "android.provider.extra.CALL_TYPE_FILTER";
field public static final java.lang.String FEATURES = "features";
field public static final int FEATURES_ASSISTED_DIALING_USED = 16; // 0x10
field public static final int FEATURES_HD_CALL = 4; // 0x4
field public static final int FEATURES_PULLED_EXTERNALLY = 2; // 0x2
field public static final int FEATURES_RTT = 32; // 0x20
field public static final int FEATURES_RTT = 16; // 0x10
field public static final int FEATURES_VIDEO = 1; // 0x1
field public static final int FEATURES_WIFI = 8; // 0x8
field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";
@@ -40630,7 +40629,6 @@ package android.telecom {
field public static final int CAPABILITY_SUPPORT_DEFLECT = 16777216; // 0x1000000
field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
field public static final int PROPERTY_ASSISTED_DIALING_USED = 512; // 0x200
field public static final int PROPERTY_CONFERENCE = 1; // 0x1
field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20
@@ -40855,7 +40853,6 @@ package android.telecom {
field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";
field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
field public static final int PROPERTY_ASSISTED_DIALING_USED = 512; // 0x200
field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20
field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10
field public static final int PROPERTY_IS_RTT = 256; // 0x100
@@ -41279,7 +41276,6 @@ package android.telecom {
field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";
field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
field public static final java.lang.String EXTRA_ASSISTED_DIALING_TRANSFORMATION_INFO = "android.telecom.extra.ASSISTED_DIALING_TRANSFORMATION_INFO";
field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
@@ -41295,7 +41291,6 @@ package android.telecom {
field public static final java.lang.String EXTRA_START_CALL_WITH_RTT = "android.telecom.extra.START_CALL_WITH_RTT";
field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
field public static final java.lang.String EXTRA_USE_ASSISTED_DIALING = "android.telecom.extra.USE_ASSISTED_DIALING";
field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
field public static final java.lang.String METADATA_INCLUDE_EXTERNAL_CALLS = "android.telecom.INCLUDE_EXTERNAL_CALLS";
@@ -41308,18 +41303,6 @@ package android.telecom {
field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
}
public final class TransformationInfo implements android.os.Parcelable {
ctor public TransformationInfo(java.lang.String, java.lang.String, java.lang.String, java.lang.String, int);
method public int describeContents();
method public java.lang.String getOriginalNumber();
method public java.lang.String getTransformedNumber();
method public int getTransformedNumberCountryCallingCode();
method public java.lang.String getUserHomeCountryCode();
method public java.lang.String getUserRoamingCountryCode();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telecom.TransformationInfo> CREATOR;
}
public class VideoProfile implements android.os.Parcelable {
ctor public VideoProfile(int);
ctor public VideoProfile(int, int);
@@ -41486,7 +41469,6 @@ package android.telephony {
field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";
field public static final java.lang.String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
field public static final java.lang.String KEY_ASSISTED_DIALING_ENABLED_BOOL = "assisted_dialing_enabled_bool";
field public static final java.lang.String KEY_AUTO_RETRY_ENABLED_BOOL = "auto_retry_enabled_bool";
field public static final java.lang.String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";
field public static final java.lang.String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL = "carrier_allow_turnoff_ims_bool";

9
core/java/android/provider/CallLog.java
View File

@@ -223,13 +223,14 @@ public class CallLog {
/** Call was WIFI call. */
public static final int FEATURES_WIFI = 1 << 3;
/** Call was on RTT at some point */
public static final int FEATURES_RTT = 1 << 4;
/**
* Indicates the call underwent Assisted Dialing.
* @hide
*/
public static final int FEATURES_ASSISTED_DIALING_USED = 1 << 4;
/** Call was on RTT at some point */
public static final int FEATURES_RTT = 1 << 5;
public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10;
/**
* The phone number as the user entered it.

1
telecomm/java/android/telecom/Call.java
View File

@@ -422,6 +422,7 @@ public final class Call {
/**
* Indicates the call used Assisted Dialing.
* See also {@link Connection#PROPERTY_ASSISTED_DIALING_USED}
* @hide
*/
public static final int PROPERTY_ASSISTED_DIALING_USED = 0x00000200;

15
telecomm/java/android/telecom/Connection.java
View File

@@ -35,7 +35,6 @@ import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.Parcelable;
import android.os.RemoteException;
import android.os.SystemClock;
import android.util.ArraySet;
@@ -407,6 +406,7 @@ public abstract class Connection extends Conferenceable {
/**
* Set by the framework to indicate that a connection is using assisted dialing.
* @hide
*/
public static final int PROPERTY_ASSISTED_DIALING_USED = 1 << 9;
@@ -2552,19 +2552,6 @@ public abstract class Connection extends Conferenceable {
putExtras(newExtras);
}
/**
* Adds a parcelable extra to this {@code Connection}.
*
* @param key The extra key.
* @param value The value.
* @hide
*/
public final void putExtra(@NonNull String key, @NonNull Parcelable value) {
Bundle newExtras = new Bundle();
newExtras.putParcelable(key, value);
putExtras(newExtras);
}
/**
* Removes extras from this {@code Connection}.
*

7
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -619,16 +619,11 @@ public class TelecomManager {
/**
* The boolean indicated by this extra controls whether or not a call is eligible to undergo
* assisted dialing. This extra is stored under {@link #EXTRA_OUTGOING_CALL_EXTRAS}.
* @hide
*/
public static final String EXTRA_USE_ASSISTED_DIALING =
"android.telecom.extra.USE_ASSISTED_DIALING";
/**
* The bundle indicated by this extra store information related to the assisted dialing action.
*/
public static final String EXTRA_ASSISTED_DIALING_TRANSFORMATION_INFO =
"android.telecom.extra.ASSISTED_DIALING_TRANSFORMATION_INFO";
/**
* The following 4 constants define how properties such as phone numbers and names are
* displayed to the user.

127
telecomm/java/android/telecom/TransformationInfo.java
View File

@@ -1,127 +0,0 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.telecom;
import android.os.Parcelable;
import android.os.Parcel;
/**
* A container class to hold information related to the Assisted Dialing operation. All member
* variables must be set when constructing a new instance of this class.
*/
public final class TransformationInfo implements Parcelable {
private String mOriginalNumber;
private String mTransformedNumber;
private String mUserHomeCountryCode;
private String mUserRoamingCountryCode;
private int mTransformedNumberCountryCallingCode;
public TransformationInfo(String originalNumber,
String transformedNumber,
String userHomeCountryCode,
String userRoamingCountryCode,
int transformedNumberCountryCallingCode) {
String missing = "";
if (originalNumber == null) {
missing += " mOriginalNumber";
}
if (transformedNumber == null) {
missing += " mTransformedNumber";
}
if (userHomeCountryCode == null) {
missing += " mUserHomeCountryCode";
}
if (userRoamingCountryCode == null) {
missing += " mUserRoamingCountryCode";
}
if (!missing.isEmpty()) {
throw new IllegalStateException("Missing required properties:" + missing);
}
this.mOriginalNumber = originalNumber;
this.mTransformedNumber = transformedNumber;
this.mUserHomeCountryCode = userHomeCountryCode;
this.mUserRoamingCountryCode = userRoamingCountryCode;
this.mTransformedNumberCountryCallingCode = transformedNumberCountryCallingCode;
}
public int describeContents() {
return 0;
}
public void writeToParcel(Parcel out, int flags) {
out.writeString(mOriginalNumber);
out.writeString(mTransformedNumber);
out.writeString(mUserHomeCountryCode);
out.writeString(mUserRoamingCountryCode);
out.writeInt(mTransformedNumberCountryCallingCode);
}
public static final Parcelable.Creator<TransformationInfo> CREATOR
= new Parcelable.Creator<TransformationInfo>() {
public TransformationInfo createFromParcel(Parcel in) {
return new TransformationInfo(in);
}
public TransformationInfo[] newArray(int size) {
return new TransformationInfo[size];
}
};
private TransformationInfo(Parcel in) {
mOriginalNumber = in.readString();
mTransformedNumber = in.readString();
mUserHomeCountryCode = in.readString();
mUserRoamingCountryCode = in.readString();
mTransformedNumberCountryCallingCode = in.readInt();
}
/**
* The original number that underwent Assisted Dialing.
*/
public String getOriginalNumber() {
return mOriginalNumber;
}
/**
* The number after it underwent Assisted Dialing.
*/
public String getTransformedNumber() {
return mTransformedNumber;
}
/**
* The user's home country code that was used when attempting to transform the number.
*/
public String getUserHomeCountryCode() {
return mUserHomeCountryCode;
}
/**
* The users's roaming country code that was used when attempting to transform the number.
*/
public String getUserRoamingCountryCode() {
return mUserRoamingCountryCode;
}
/**
* The country calling code that was used in the transformation.
*/
public int getTransformedNumberCountryCallingCode() {
return mTransformedNumberCountryCallingCode;
}
}

8
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1703,13 +1703,6 @@ public class CarrierConfigManager {
public static final String KEY_ROAMING_OPERATOR_STRING_ARRAY =
"roaming_operator_string_array";
/**
* Controls whether Assisted Dialing is enabled and the preference is shown. This feature
* transforms numbers when the user is roaming.
*/
public static final String KEY_ASSISTED_DIALING_ENABLED_BOOL =
"assisted_dialing_enabled_bool";
/**
* URL from which the proto containing the public key of the Carrier used for
* IMSI encryption will be downloaded.
@@ -2131,7 +2124,6 @@ public class CarrierConfigManager {
false);
sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);
sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);
sDefaults.putBoolean(KEY_ASSISTED_DIALING_ENABLED_BOOL, true);
sDefaults.putBoolean(KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
sDefaults.putBoolean(KEY_RTT_SUPPORTED_BOOL, false);
sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);