Skip to content

Commit 2fb0c0b

Browse files
authored
Merge pull request #508 from lendylongli/fix_nullpoint
fix nullpointer bug
2 parents 6716a05 + 6885207 commit 2fb0c0b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/main/java/org/altbeacon/beacon/BeaconManager.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import android.content.Intent;
3131
import android.content.ServiceConnection;
3232
import android.content.pm.PackageManager;
33+
import android.content.pm.ResolveInfo;
3334
import android.os.IBinder;
3435
import android.os.Message;
3536
import android.os.Messenger;
@@ -1086,10 +1087,10 @@ private long getBetweenScanPeriod() {
10861087
private void verifyServiceDeclaration() {
10871088
final PackageManager packageManager = mContext.getPackageManager();
10881089
final Intent intent = new Intent(mContext, BeaconService.class);
1089-
List resolveInfo =
1090+
List<ResolveInfo> resolveInfo =
10901091
packageManager.queryIntentServices(intent,
10911092
PackageManager.MATCH_DEFAULT_ONLY);
1092-
if (resolveInfo.size() == 0) {
1093+
if (resolveInfo != null && resolveInfo.size() == 0) {
10931094
throw new ServiceNotDeclaredException();
10941095
}
10951096
}

0 commit comments

Comments
 (0)