Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cce662f2 authored by Zheng Zhang's avatar Zheng Zhang Committed by android-build-merger
Browse files

Merge "Catch (and ignore) any timeout exceptions when releasing WakeLock" into oc-mr1-dev 

am: 3f024415

Change-Id: Idf7f29533bad1eb6c6b9ea8dc1ca9c60e63103d3
parents e4fa69b9 3f024415

services/core/java/com/android/server/location/GnssLocationProvider.java

+9 −2
Original line number Diff line number Diff line
@@ -1054,8 +1054,15 @@ public class GnssLocationProvider implements LocationProviderInterface { 
                // download tasks overrun.

                synchronized (mLock) {

                    if (mDownloadXtraWakeLock.isHeld()) {

                        // This wakelock may have time-out, if a timeout was specified.

                        // Catch (and ignore) any timeout exceptions.

                        try {

                            mDownloadXtraWakeLock.release();

                            if (DEBUG) Log.d(TAG, "WakeLock released by handleDownloadXtraData()");

                        } catch (Exception e) {

                            Log.i(TAG, "Wakelock timeout & release race exception in "

                                    + "handleDownloadXtraData()", e);

                        }

                    } else {

                        Log.e(TAG, "WakeLock expired before release in "

                                + "handleDownloadXtraData()");