From def20a3350ce239b929ef0ebbbf913cc0b42cf5f Mon Sep 17 00:00:00 2001 From: David Christie Date: Thu, 15 Aug 2013 16:01:42 -0700 Subject: Use default class loader when creating a LocationRequest from Parcel. This seems to be the standard usage, and there are rare reports of requestLocationUpdates giving NullPointerExceptions on the first call to requestLocationUpdates but not on subsequent calls (b/10207898). Change-Id: If7a873fba5a2cd77b836ff3fda89105da20104ac --- location/java/android/location/LocationRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'location/java') diff --git a/location/java/android/location/LocationRequest.java b/location/java/android/location/LocationRequest.java index ee748d39a219..a33a1d8945eb 100644 --- a/location/java/android/location/LocationRequest.java +++ b/location/java/android/location/LocationRequest.java @@ -564,7 +564,7 @@ public final class LocationRequest implements Parcelable { request.setHideFromAppOps(in.readInt() != 0); String provider = in.readString(); if (provider != null) request.setProvider(provider); - WorkSource workSource = in.readParcelable(WorkSource.class.getClassLoader()); + WorkSource workSource = in.readParcelable(null); if (workSource != null) request.setWorkSource(workSource); return request; } -- cgit v1.2.3-59-g8ed1b