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

Add null check for AccessibilityButtonController.isAccessibilityButtonAvailable

Browse Source 
Just add a null check to reduce NullPointerException happening.

Bug: 110361782
Test: Test: a11y CTS & unit test
Change-Id: Ia4e39c5b3af4943fba2f9ad545b96d5983ee780d
This commit is contained in:
mincheli
2019-03-20 12:23:05 +08:00
parent d4b81682e1
commit 7ab28d5126
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;
}
/**