diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 | ||||
| -rw-r--r-- | telecomm/java/android/telecomm/ConnectionService.java | 18 |
3 files changed, 24 insertions, 16 deletions
diff --git a/api/current.txt b/api/current.txt index 8302bbaa163c..d89f2dd19fb4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28694,7 +28694,6 @@ package android.telecomm { method public final android.telecomm.RemoteConnection createRemoteIncomingConnection(android.telecomm.ConnectionRequest); method public final android.telecomm.RemoteConnection createRemoteOutgoingConnection(android.telecomm.ConnectionRequest); method public final java.util.Collection<android.telecomm.Connection> getAllConnections(); - method public final void maybeRespondToAccountLookup(); method public final android.os.IBinder onBind(android.content.Intent); method public void onConnectionAdded(android.telecomm.Connection); method public void onConnectionRemoved(android.telecomm.Connection); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index fe201cdec2ab..eed250a5cfd7 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -884,6 +884,27 @@ public final class Settings { public static final String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS"; + /** + * Activity Action: Show notification settings. + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_NOTIFICATION_SETTINGS + = "android.settings.NOTIFICATION_SETTINGS"; + + /** + * Activity Action: Show notification settings for a single app. + * + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_APP_NOTIFICATION_SETTINGS + = "android.settings.APP_NOTIFICATION_SETTINGS"; + + /** @hide */ public static final String EXTRA_APP_UID = "app_uid"; + /** @hide */ public static final String EXTRA_APP_PACKAGE = "app_package"; + // End of Intent actions for Settings /** diff --git a/telecomm/java/android/telecomm/ConnectionService.java b/telecomm/java/android/telecomm/ConnectionService.java index cefa92935b6c..fb719a398a48 100644 --- a/telecomm/java/android/telecomm/ConnectionService.java +++ b/telecomm/java/android/telecomm/ConnectionService.java @@ -80,8 +80,6 @@ public abstract class ConnectionService extends Service { private final Map<Connection, String> mIdByConnection = new HashMap<>(); private final RemoteConnectionManager mRemoteConnectionManager = new RemoteConnectionManager(); - private SimpleResponse<Uri, List<PhoneAccountHandle>> mAccountLookupResponse; - private Uri mAccountLookupHandle; private boolean mAreAccountsInitialized = false; private final ConnectionServiceAdapter mAdapter = new ConnectionServiceAdapter(); @@ -474,6 +472,9 @@ public abstract class ConnectionService extends Service { } else if (createdConnection.getState() == Connection.State.CANCELED) { // Tell telecomm not to attempt any more services. mAdapter.handleCreateConnectionCancelled(request); + } else if (createdConnection.getState() == Connection.State.FAILED) { + mAdapter.handleCreateConnectionFailed(request, createdConnection.getFailureCode(), + createdConnection.getFailureMessage()); } else { connectionCreated(request, createdConnection); } @@ -625,7 +626,6 @@ public abstract class ConnectionService extends Service { } mAreAccountsInitialized = true; Log.d(this, "remote connection services found: " + services); - maybeRespondToAccountLookup(); } }); } @@ -635,24 +635,12 @@ public abstract class ConnectionService extends Service { mHandler.post(new Runnable() { @Override public void run() { mAreAccountsInitialized = true; - maybeRespondToAccountLookup(); } }); } }); } - public final void maybeRespondToAccountLookup() { - if (mAreAccountsInitialized && mAccountLookupResponse != null) { - mAccountLookupResponse.onResult( - mAccountLookupHandle, - mRemoteConnectionManager.getAccounts(mAccountLookupHandle)); - - mAccountLookupHandle = null; - mAccountLookupResponse = null; - } - } - public final RemoteConnection createRemoteIncomingConnection(ConnectionRequest request) { return mRemoteConnectionManager.createRemoteConnection(request, true); } |