ADHOC/replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsdk: Prevent NPE in CMWeatherManager

Browse Source 
Verify that we have an instance of to the weather manager service
before we try to register/unregister a listener or query the
current weather provider.

Change-Id: Iec09073615f85626c6f64e4a55758aae52231ca8
This commit is contained in:
Luis Vidal 2016-06-16 17:25:29 -07:00 committed by Gerrit Code Review
parent ee2dc2db08
commit 46bed1698d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/src/java/cyanogenmod/weather/CMWeatherManager.java
View File

@ -246,6 +246,8 @@ public class CMWeatherManager {
*/ */
public void registerWeatherServiceProviderChangeListener( public void registerWeatherServiceProviderChangeListener(
@NonNull WeatherServiceProviderChangeListener listener) { @NonNull WeatherServiceProviderChangeListener listener) {
if (sWeatherManagerService == null) return;
synchronized (mProviderChangedListeners) { synchronized (mProviderChangedListeners) {
if (mProviderChangedListeners.contains(listener)) { if (mProviderChangedListeners.contains(listener)) {
throw new IllegalArgumentException("Listener already registered"); throw new IllegalArgumentException("Listener already registered");
@ -267,6 +269,8 @@ public class CMWeatherManager {
*/ */
public void unregisterWeatherServiceProviderChangeListener( public void unregisterWeatherServiceProviderChangeListener(
@NonNull WeatherServiceProviderChangeListener listener) { @NonNull WeatherServiceProviderChangeListener listener) {
if (sWeatherManagerService == null) return;
synchronized (mProviderChangedListeners) { synchronized (mProviderChangedListeners) {
if (!mProviderChangedListeners.contains(listener)) { if (!mProviderChangedListeners.contains(listener)) {
throw new IllegalArgumentException("Listener was never registered"); throw new IllegalArgumentException("Listener was never registered");
@ -287,6 +291,8 @@ public class CMWeatherManager {
* @return the service's label * @return the service's label
*/ */
public String getActiveWeatherServiceProviderLabel() { public String getActiveWeatherServiceProviderLabel() {
if (sWeatherManagerService == null) return null;
try { try {
return sWeatherManagerService.getActiveWeatherServiceProviderLabel(); return sWeatherManagerService.getActiveWeatherServiceProviderLabel();
} catch(RemoteException e){ } catch(RemoteException e){