diff options
3 files changed, 11 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 09a518553997..61a5282b4561 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -19308,6 +19308,7 @@ public final class ActivityManagerService extends ActivityManagerNative } boolean mayBeTop = false; + app.whitelistManager = false; for (int is = app.services.size()-1; is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ @@ -19348,8 +19349,6 @@ public final class ActivityManagerService extends ActivityManagerNative } } - app.whitelistManager = false; - for (int conni = s.connections.size()-1; conni >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ || schedGroup == ProcessList.SCHED_GROUP_BACKGROUND diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 2fc14ecac865..173f76fa52f5 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -899,6 +899,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // hold wake lock while task runs mWakeLock.acquire(); + Log.i(TAG, "WakeLock acquired by handleInjectNtpTime()"); AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() { @Override public void run() { @@ -951,6 +952,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // release wake lock held by task mWakeLock.release(); + Log.i(TAG, "WakeLock released by handleInjectNtpTime()"); } }); } @@ -969,6 +971,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // hold wake lock while task runs mWakeLock.acquire(); + Log.i(TAG, "WakeLock acquired by handleDownloadXtraData()"); AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() { @Override public void run() { @@ -991,6 +994,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // release wake lock held by task mWakeLock.release(); + Log.i(TAG, "WakeLock released by handleDownloadXtraData()"); } }); } @@ -2040,6 +2044,7 @@ public class GnssLocationProvider implements LocationProviderInterface { // note that this assumes the message will not be removed from the queue before // it is handled (otherwise the wake lock would be leaked). mWakeLock.acquire(); + Log.i(TAG, "WakeLock acquired by sendMessage(" + message + ", " + arg + ", " + obj + ")"); mHandler.obtainMessage(message, arg, 1, obj).sendToTarget(); } @@ -2099,6 +2104,8 @@ public class GnssLocationProvider implements LocationProviderInterface { if (msg.arg2 == 1) { // wakelock was taken for this message, release it mWakeLock.release(); + Log.i(TAG, "WakeLock released by handleMessage(" + message + ", " + msg.arg1 + ", " + + msg.obj + ")"); } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 2a8569480bb8..96513b98f02e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -12526,13 +12526,12 @@ public class PackageManagerService extends IPackageManager.Stub { } if (mSuccess) { - final boolean mounted; - if (Environment.isExternalStorageEmulated()) { - mounted = true; - } else { + boolean mounted = false; + try { final String status = Environment.getExternalStorageState(); mounted = (Environment.MEDIA_MOUNTED.equals(status) || Environment.MEDIA_MOUNTED_READ_ONLY.equals(status)); + } catch (Exception e) { } if (mounted) { |