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

Merge "Don\'t throw RemoteException from new NLS APIs" into nyc-dev

Browse Source 
am: 28d9ef8112

* commit '28d9ef811291921ddb22e7b4b92e1222e673154e':
  Don't throw RemoteException from new NLS APIs

Change-Id: Ibafc3d9adeb046b2b43593285b6f605693b8682e
This commit is contained in:
Chris Wren
2016-05-23 19:01:21 +00:00
committed by android-build-merger
parent a3e767a73d 28d9ef8112
commit 4da0296e23
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -34737,8 +34737,8 @@ package android.service.notification {
method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap); method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
method public final void requestInterruptionFilter(int); method public final void requestInterruptionFilter(int);
method public final void requestListenerHints(int); method public final void requestListenerHints(int);
method public static void requestRebind(android.content.ComponentName) throws android.os.RemoteException; method public static void requestRebind(android.content.ComponentName);
method public final void requestUnbind() throws android.os.RemoteException; method public final void requestUnbind();
method public final void setNotificationsShown(java.lang.String[]); method public final void setNotificationsShown(java.lang.String[]);
field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4 field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4
field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1

4
api/system-current.txt
View File

@@ -37463,8 +37463,8 @@ package android.service.notification {
method public void registerAsSystemService(android.content.Context, android.content.ComponentName, int) throws android.os.RemoteException; method public void registerAsSystemService(android.content.Context, android.content.ComponentName, int) throws android.os.RemoteException;
method public final void requestInterruptionFilter(int); method public final void requestInterruptionFilter(int);
method public final void requestListenerHints(int); method public final void requestListenerHints(int);
method public static void requestRebind(android.content.ComponentName) throws android.os.RemoteException; method public static void requestRebind(android.content.ComponentName);
method public final void requestUnbind() throws android.os.RemoteException; method public final void requestUnbind();
method public final void setNotificationsShown(java.lang.String[]); method public final void setNotificationsShown(java.lang.String[]);
method public final void setOnNotificationPostedTrim(int); method public final void setOnNotificationPostedTrim(int);
method public void unregisterAsSystemService() throws android.os.RemoteException; method public void unregisterAsSystemService() throws android.os.RemoteException;

4
api/test-current.txt
View File

@@ -34815,8 +34815,8 @@ package android.service.notification {
method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap); method public void onNotificationRemoved(android.service.notification.StatusBarNotification, android.service.notification.NotificationListenerService.RankingMap);
method public final void requestInterruptionFilter(int); method public final void requestInterruptionFilter(int);
method public final void requestListenerHints(int); method public final void requestListenerHints(int);
method public static void requestRebind(android.content.ComponentName) throws android.os.RemoteException; method public static void requestRebind(android.content.ComponentName);
method public final void requestUnbind() throws android.os.RemoteException; method public final void requestUnbind();
method public final void setNotificationsShown(java.lang.String[]); method public final void setNotificationsShown(java.lang.String[]);
field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4 field public static final int HINT_HOST_DISABLE_CALL_EFFECTS = 4; // 0x4
field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1

13
core/java/android/service/notification/NotificationListenerService.java
View File

@@ -790,11 +790,14 @@ public abstract class NotificationListenerService extends Service {
* <p>This method will fail for listeners that have * <p>This method will fail for listeners that have
* not been granted the permission by the user. * not been granted the permission by the user.
*/ */
public static void requestRebind(ComponentName componentName) public static void requestRebind(ComponentName componentName) {
throws RemoteException {
INotificationManager noMan = INotificationManager.Stub.asInterface( INotificationManager noMan = INotificationManager.Stub.asInterface(
ServiceManager.getService(Context.NOTIFICATION_SERVICE)); ServiceManager.getService(Context.NOTIFICATION_SERVICE));
try {
noMan.requestBindListener(componentName); noMan.requestBindListener(componentName);
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
/** /**
@@ -807,12 +810,16 @@ public abstract class NotificationListenerService extends Service {
* <p>The service should wait for the {@link #onListenerConnected()} event * <p>The service should wait for the {@link #onListenerConnected()} event
* before performing this operation. I know it's tempting, but you must wait. * before performing this operation. I know it's tempting, but you must wait.
*/ */
public final void requestUnbind() throws RemoteException { public final void requestUnbind() {
if (mWrapper != null) { if (mWrapper != null) {
INotificationManager noMan = getNotificationInterface(); INotificationManager noMan = getNotificationInterface();
try {
noMan.requestUnbindListener(mWrapper); noMan.requestUnbindListener(mWrapper);
// Disable future messages. // Disable future messages.
isConnected = false; isConnected = false;
} catch (RemoteException ex) {
throw ex.rethrowFromSystemServer();
}
} }
} }