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

Revert "Add ability to set and get DefaultPhoneApplication"

Browse Source 
This reverts commit 8bdb1ff3279ab9fde0499231580c76dc2533f3c4.

Change-Id: Idc6d64820c23a650e5f0113ed8ff0860c61ea6af
This commit is contained in:
Yorke Lee
2014-06-19 22:26:34 +00:00
parent eff9661b2a
commit cf9bc5e76d
5 changed files with 0 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -27797,7 +27797,6 @@ package android.telecomm {
field public static final java.lang.String ACTION_CALL_SERVICE;
field public static final java.lang.String ACTION_CALL_SERVICE_PROVIDER;
field public static final java.lang.String ACTION_CALL_SERVICE_SELECTOR;
field public static final java.lang.String ACTION_CHANGE_DEFAULT_PHONE = "android.telecomm.ACTION_CHANGE_DEFAULT_PHONE";
field public static final java.lang.String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL";
field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
@@ -27805,7 +27804,6 @@ package android.telecomm {
field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecomm.extra.CALL_DISCONNECT_MESSAGE";
field public static final java.lang.String EXTRA_CALL_SERVICE_DESCRIPTOR = "android.intent.extra.CALL_SERVICE_DESCRIPTOR";
field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.intent.extra.INCOMING_CALL_EXTRAS";
field public static final java.lang.String EXTRA_PACKAGE_NAME = "package";
field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.intent.extra.START_CALL_WITH_SPEAKERPHONE";
}

6
core/java/android/provider/Settings.java
View File

@@ -4536,12 +4536,6 @@ public final class Settings {
*/
public static final String SMS_DEFAULT_APPLICATION = "sms_default_application";
/**
* Specifies the package name currently configured to be the primary phone application
* @hide
*/
public static final String PHONE_DEFAULT_APPLICATION = "phone_default_application";
/**
* Name of a package that the current user has explicitly allowed to see all of that
* user's notifications.

183
telecomm/java/android/telecomm/PhoneApplication.java
View File

@@ -1,183 +0,0 @@
package android.telecomm;
import android.annotation.SystemApi;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.telecomm.ITelecommService;
import java.util.ArrayList;
import java.util.List;
/**
* Class for managing the primary phone application that will receive incoming calls, and be allowed
* to make emergency outgoing calls.
*
* @hide
*/
public class PhoneApplication {
private static final String TAG = PhoneApplication.class.getSimpleName();
private static final String TELECOMM_SERVICE_NAME = "telecomm";
/**
* Sets the specified package name as the default phone application. The caller of this method
* needs to have permission to write to secure settings.
*
* @hide
* */
@SystemApi
public static void setDefaultPhoneApplication(String packageName, Context context) {
// Get old package name
String oldPackageName = Settings.Secure.getString(context.getContentResolver(),
Settings.Secure.PHONE_DEFAULT_APPLICATION);
if (packageName != null && oldPackageName != null && packageName.equals(oldPackageName)) {
// No change
return;
}
// Only make the change if the new package belongs to a valid phone application
List<ComponentName> componentNames = getInstalledPhoneApplications(context);
ComponentName foundComponent = null;
for (ComponentName componentName : componentNames) {
if (TextUtils.equals(componentName.getPackageName(), packageName)) {
foundComponent = componentName;
break;
}
}
if (foundComponent != null) {
// Update the secure setting.
Settings.Secure.putString(context.getContentResolver(),
Settings.Secure.PHONE_DEFAULT_APPLICATION, foundComponent.getPackageName());
}
}
/**
* Returns the installed phone application that will be used to receive incoming calls, and is
* allowed to make emergency calls.
*
* The application will be returned in order of preference:
* 1) User selected phone application (if still installed)
* 2) Pre-installed system dialer (if not disabled)
* 3) Null
*
* @hide
* */
@SystemApi
public static ComponentName getDefaultPhoneApplication(Context context) {
String defaultPackageName = Settings.Secure.getString(context.getContentResolver(),
Settings.Secure.PHONE_DEFAULT_APPLICATION);
final List<ComponentName> componentNames = getInstalledPhoneApplications(context);
if (!TextUtils.isEmpty(defaultPackageName)) {
for (ComponentName componentName : componentNames) {
if (TextUtils.equals(componentName.getPackageName(), defaultPackageName)) {
return componentName;
}
}
}
// No user-set dialer found, fallback to system dialer
ComponentName systemDialer = null;
try {
systemDialer = getTelecommService().getSystemPhoneApplication();
} catch (RemoteException e) {
Log.e(TAG, "Error calling ITelecommService#getSystemPhoneApplication", e);
return null;
}
if (systemDialer == null) {
// No system dialer configured at build time
return null;
}
// Verify that the system dialer has not been disabled.
return getComponentName(componentNames, systemDialer.getPackageName());
}
/**
* Returns a list of installed and available phone applications.
*
* In order to appear in the list, a phone application must implement an intent-filter with
* the DIAL intent for the following schemes:
*
* 1) Empty scheme
* 2) tel Uri scheme
*
* @hide
**/
@SystemApi
public static List<ComponentName> getInstalledPhoneApplications(Context context) {
PackageManager packageManager = context.getPackageManager();
// Get the list of apps registered for the DIAL intent with empty scheme
Intent intent = new Intent(Intent.ACTION_DIAL);
List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, 0);
List<ComponentName> componentNames = new ArrayList<ComponentName> ();
for (ResolveInfo resolveInfo : resolveInfoList) {
final ActivityInfo activityInfo = resolveInfo.activityInfo;
if (activityInfo == null) {
continue;
}
final ComponentName componentName =
new ComponentName(activityInfo.packageName, activityInfo.name);
componentNames.add(componentName);
}
// TODO: Filter for apps that don't handle DIAL intent with tel scheme
return componentNames;
}
/**
* Returns the {@link ComponentName} for the installed phone application for a given package
* name.
*
* @param context A valid context.
* @param packageName to retrieve the {@link ComponentName} for.
*
* @return The {@link ComponentName} for the installed phone application corresponding to the
* package name, or null if none is found.
*
* @hide
*/
@SystemApi
public static ComponentName getPhoneApplicationForPackageName(Context context,
String packageName) {
return getComponentName(getInstalledPhoneApplications(context), packageName);
}
/**
* Returns the component from a list of application components that corresponds to the package
* name.
*
* @param componentNames A list of component names
* @param packageName The package name to look for
* @return The {@link ComponentName} that matches the provided packageName, or null if not
* found.
*/
private static ComponentName getComponentName(List<ComponentName> componentNames,
String packageName) {
for (ComponentName componentName : componentNames) {
if (TextUtils.equals(packageName, componentName.getPackageName())) {
return componentName;
}
}
return null;
}
private static ITelecommService getTelecommService() {
return ITelecommService.Stub.asInterface(ServiceManager.getService(TELECOMM_SERVICE_NAME));
}
}

15
telecomm/java/android/telecomm/TelecommConstants.java
View File

@@ -55,21 +55,6 @@ public final class TelecommConstants {
*/
public static final String ACTION_CALL_SERVICE_SELECTOR = CallServiceSelector.class.getName();
/**
* Activity action: Ask the user to change the default phone application. This will show a
* dialog that asks the user whether they want to replace the current default phone application
* with the one defined in {@link #EXTRA_PACKAGE_NAME}.
*/
public static final String ACTION_CHANGE_DEFAULT_PHONE =
"android.telecomm.ACTION_CHANGE_DEFAULT_PHONE";
/**
* The PackageName string passed in as an extra for {@link #ACTION_CHANGE_DEFAULT_PHONE}.
*
* @see #ACTION_CHANGE_DEFAULT_PHONE
*/
public static final String EXTRA_PACKAGE_NAME = "package";
/**
* Optional extra for {@link Intent#ACTION_CALL} containing a boolean that determines whether
* the speakerphone should be automatically turned on for an outgoing call.

6
telecomm/java/com/android/internal/telecomm/ITelecommService.aidl
View File

@@ -17,7 +17,6 @@
package com.android.internal.telecomm;
import android.telecomm.Subscription;
import android.content.ComponentName;
/**
* Interface used to interact with Telecomm. Mostly this is used by TelephonyManager for passing
@@ -42,11 +41,6 @@ interface ITelecommService {
*/
void showCallScreen(boolean showDialpad);
/**
* Returns the component name of the phone application installed on the system partition.
*/
ComponentName getSystemPhoneApplication();
/**
* Gets a list of Subscriptions.
*/