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

Merge "Add null check for AccessibilityButtonController.isAccessibilityButtonAvailable"

Browse Source
This commit is contained in:
Minche Li
2019-03-21 08:25:39 +00:00
committed by Android (Google) Code Review
parent 702540117f 7ab28d5126
commit 00db4956ef
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/accessibilityservice/AccessibilityButtonController.java
View File

@@ -17,7 +17,6 @@
package android.accessibilityservice;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.os.Handler;
import android.os.Looper;
import android.os.RemoteException;
@@ -76,13 +75,16 @@ public final class AccessibilityButtonController {
* available to the calling service, {@code false} otherwise
*/
public boolean isAccessibilityButtonAvailable() {
try {
return mServiceConnection.isAccessibilityButtonAvailable();
} catch (RemoteException re) {
Slog.w(LOG_TAG, "Failed to get accessibility button availability.", re);
re.rethrowFromSystemServer();
return false;
if (mServiceConnection != null) {
try {
return mServiceConnection.isAccessibilityButtonAvailable();
} catch (RemoteException re) {
Slog.w(LOG_TAG, "Failed to get accessibility button availability.", re);
re.rethrowFromSystemServer();
return false;
}
}
return false;
}
/**