diff options
Diffstat (limited to 'telecomm/java')
8 files changed, 221 insertions, 9 deletions
diff --git a/telecomm/java/android/telecom/DefaultDialerManager.java b/telecomm/java/android/telecom/DefaultDialerManager.java index 1806aee27e31..2680af76d803 100644 --- a/telecomm/java/android/telecom/DefaultDialerManager.java +++ b/telecomm/java/android/telecom/DefaultDialerManager.java @@ -74,7 +74,7 @@ public class DefaultDialerManager { } // Only make the change if the new package belongs to a valid phone application - List<String> packageNames = getInstalledDialerApplications(context); + List<String> packageNames = getInstalledDialerApplications(context, user); if (packageNames.contains(packageName)) { // Update the secure setting. diff --git a/telecomm/java/android/telecom/PhoneAccountSuggestion.aidl b/telecomm/java/android/telecom/PhoneAccountSuggestion.aidl new file mode 100644 index 000000000000..e2fa7e4032c1 --- /dev/null +++ b/telecomm/java/android/telecom/PhoneAccountSuggestion.aidl @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2018 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; + +/** + * {@hide} + */ +parcelable PhoneAccountSuggestion;
\ No newline at end of file diff --git a/telecomm/java/android/telecom/PhoneAccountSuggestion.java b/telecomm/java/android/telecom/PhoneAccountSuggestion.java index 4e6a178c8170..b401bcf0f876 100644 --- a/telecomm/java/android/telecom/PhoneAccountSuggestion.java +++ b/telecomm/java/android/telecom/PhoneAccountSuggestion.java @@ -24,6 +24,7 @@ import android.os.Parcelable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Objects; public final class PhoneAccountSuggestion implements Parcelable { @@ -132,4 +133,19 @@ public final class PhoneAccountSuggestion implements Parcelable { dest.writeInt(mReason); dest.writeByte((byte) (mShouldAutoSelect ? 1 : 0)); } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + PhoneAccountSuggestion that = (PhoneAccountSuggestion) o; + return mReason == that.mReason + && mShouldAutoSelect == that.mShouldAutoSelect + && Objects.equals(mHandle, that.mHandle); + } + + @Override + public int hashCode() { + return Objects.hash(mHandle, mReason, mShouldAutoSelect); + } } diff --git a/telecomm/java/android/telecom/PhoneAccountSuggestionService.java b/telecomm/java/android/telecom/PhoneAccountSuggestionService.java new file mode 100644 index 000000000000..ba3822cb9951 --- /dev/null +++ b/telecomm/java/android/telecom/PhoneAccountSuggestionService.java @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2018 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.annotation.NonNull; +import android.annotation.SdkConstant; +import android.annotation.SystemApi; +import android.annotation.TestApi; +import android.app.Service; +import android.content.Intent; +import android.os.IBinder; +import android.os.RemoteException; + +import com.android.internal.telecom.IPhoneAccountSuggestionCallback; +import com.android.internal.telecom.IPhoneAccountSuggestionService; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Base class for service that allows system apps to suggest phone accounts for outgoing calls. + * + * Phone account suggestions allow OEMs to intelligently select phone accounts based on knowledge + * about the user's past behavior, carrier billing patterns, or other factors unknown to the AOSP + * Telecom system. + * OEMs who wish to provide a phone account suggestion service on their device should implement this + * service in an app that resides in the /system/priv-app/ directory on their device. For security + * reasons, the service's entry {@code AndroidManifest.xml} file must declare the + * {@link android.Manifest.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE} permission: + * <pre> + * {@code + * <service android:name="your.package.YourServiceName" + * android:permission="android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE"> + * <intent-filter> + * <action android:name="android.telecom.PhoneAccountSuggestionService"/> + * </intent-filter> + * </service> + * } + * </pre> + * Only one system app on each device may implement this service. If multiple system apps implement + * this service, none of them will be queried for suggestions. + * @hide + */ +@SystemApi +@TestApi +public class PhoneAccountSuggestionService extends Service { + /** + * The {@link Intent} that must be declared in the {@code intent-filter} element of the + * service's manifest entry. + */ + @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION) + public static final String SERVICE_INTERFACE = "android.telecom.PhoneAccountSuggestionService"; + + private IPhoneAccountSuggestionService mInterface = new IPhoneAccountSuggestionService.Stub() { + @Override + public void onAccountSuggestionRequest(IPhoneAccountSuggestionCallback callback, + String number) { + mCallbackMap.put(number, callback); + PhoneAccountSuggestionService.this.onAccountSuggestionRequest(number); + } + }; + + private final Map<String, IPhoneAccountSuggestionCallback> mCallbackMap = + new HashMap<>(); + + @Override + public IBinder onBind(Intent intent) { + return mInterface.asBinder(); + } + + /** + * The system calls this method during the outgoing call flow if it needs account suggestions. + * + * The implementer of this service must override this method to implement its account suggestion + * logic. After preparing the suggestions, the implementation of the service must call + * {@link #suggestPhoneAccounts(String, List)} to deliver the suggestions back to the system. + * + * Note that the system will suspend the outgoing call process after it calls this method until + * this service calls {@link #suggestPhoneAccounts}. + * + * @param number The phone number to provide suggestions for. + */ + public void onAccountSuggestionRequest(@NonNull String number) {} + + /** + * The implementation of this service calls this method to deliver suggestions to the system. + * + * The implementation of this service must call this method after receiving a call to + * {@link #onAccountSuggestionRequest(String)}. If no suggestions are available, pass an empty + * list as the {@code suggestions} argument. + * + * @param number The phone number to provide suggestions for. + * @param suggestions The list of suggestions. + */ + public final void suggestPhoneAccounts(@NonNull String number, + @NonNull List<PhoneAccountSuggestion> suggestions) { + IPhoneAccountSuggestionCallback callback = mCallbackMap.remove(number); + if (callback == null) { + Log.w(this, "No suggestions requested for the number %s", Log.pii(number)); + return; + } + try { + callback.suggestPhoneAccounts(number, suggestions); + } catch (RemoteException e) { + Log.w(this, "Remote exception calling suggestPhoneAccounts"); + } + } +} diff --git a/telecomm/java/android/telecom/VideoProfile.java b/telecomm/java/android/telecom/VideoProfile.java index bbac8eb88aec..7b2306128b7b 100644 --- a/telecomm/java/android/telecom/VideoProfile.java +++ b/telecomm/java/android/telecom/VideoProfile.java @@ -369,16 +369,13 @@ public class VideoProfile implements Parcelable { } /** - * Create a call camera capabilities instance that optionally - * supports zoom. + * Create a call camera capabilities instance that optionally supports zoom. * * @param width The width of the camera video (in pixels). * @param height The height of the camera video (in pixels). * @param zoomSupported True when camera supports zoom. * @param maxZoom Maximum zoom supported by camera. - * @hide */ - @UnsupportedAppUsage public CameraCapabilities(int width, int height, boolean zoomSupported, float maxZoom) { mWidth = width; mHeight = height; @@ -455,16 +452,14 @@ public class VideoProfile implements Parcelable { } /** - * Whether the camera supports zoom. - * @hide + * Returns {@code true} is zoom is supported, {@code false} otherwise. */ public boolean isZoomSupported() { return mZoomSupported; } /** - * The maximum zoom supported by the camera. - * @hide + * Returns the maximum zoom supported by the camera. */ public float getMaxZoom() { return mMaxZoom; diff --git a/telecomm/java/com/android/internal/telecom/IPhoneAccountSuggestionCallback.aidl b/telecomm/java/com/android/internal/telecom/IPhoneAccountSuggestionCallback.aidl new file mode 100644 index 000000000000..cb142417451c --- /dev/null +++ b/telecomm/java/com/android/internal/telecom/IPhoneAccountSuggestionCallback.aidl @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2018 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 com.android.internal.telecom; + +import android.telecom.PhoneAccountSuggestion; +/** + * Internal remote callback interface for a phone acct suggestion service. + * @hide + */ +oneway interface IPhoneAccountSuggestionCallback{ + void suggestPhoneAccounts(in String number, in List<PhoneAccountSuggestion> suggestions); +} diff --git a/telecomm/java/com/android/internal/telecom/IPhoneAccountSuggestionService.aidl b/telecomm/java/com/android/internal/telecom/IPhoneAccountSuggestionService.aidl new file mode 100644 index 000000000000..0ffab93d9f1b --- /dev/null +++ b/telecomm/java/com/android/internal/telecom/IPhoneAccountSuggestionService.aidl @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2018 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 com.android.internal.telecom; + +import com.android.internal.telecom.IPhoneAccountSuggestionCallback; + +/** + * Internal remote interface for a phone acct suggestion service. + * @hide + */ +oneway interface IPhoneAccountSuggestionService { + void onAccountSuggestionRequest(in IPhoneAccountSuggestionCallback callback, + in String number); +} diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index 50204e70f63d..954a7098f6be 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -292,6 +292,8 @@ interface ITelecomService { void setTestDefaultCallRedirectionApp(String packageName); + void setTestPhoneAcctSuggestionComponent(String flattenedComponentName); + void setTestDefaultCallScreeningApp(String packageName); void addOrRemoveTestCallCompanionApp(String packageName, boolean isAdded); |