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

Merge "Fix an NPE in BatteryService" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-18 20:10:12 +00:00
committed by Android (Google) Code Review
parent 5a2b08a5f9 595002a0ac
commit 2b534bde0e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/BatteryService.java
View File

@@ -1505,6 +1505,8 @@ public final class BatteryService extends SystemService {
if (Objects.equals(newService, oldService)) return; if (Objects.equals(newService, oldService)) return;
Slog.i(TAG, "health: new instance registered " + mInstanceName); Slog.i(TAG, "health: new instance registered " + mInstanceName);
// #init() may be called with null callback. Skip null callbacks.
if (mCallback == null) return;
mCallback.onRegistration(oldService, newService, mInstanceName); mCallback.onRegistration(oldService, newService, mInstanceName);
} catch (NoSuchElementException | RemoteException ex) { } catch (NoSuchElementException | RemoteException ex) {
Slog.e(TAG, "health: Cannot get instance '" + mInstanceName Slog.e(TAG, "health: Cannot get instance '" + mInstanceName