Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev

Browse Source 
am: 33001945a8

* commit '33001945a82ba8cd5b5ad27b808312aa2ef210af':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on
This commit is contained in:
Ian Pedowitz
2016-01-14 22:21:37 +00:00
committed by android-build-merger
parent ca6b87fea6 33001945a8
commit 33b55366c5
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
services/core/java/com/android/server/content/SyncManager.java
View File

@@ -2604,6 +2604,31 @@ public class SyncManager {
} }
continue; continue;
} }
String packageName = getPackageName(op.target);
ApplicationInfo ai = null;
if (packageName != null) {
try {
ai = mContext.getPackageManager().getApplicationInfo(packageName,
PackageManager.GET_UNINSTALLED_PACKAGES
| PackageManager.GET_DISABLED_COMPONENTS);
} catch (NameNotFoundException e) {
operationIterator.remove();
mSyncStorageEngine.deleteFromPending(op.pendingOperation);
continue;
}
}
// If app is considered idle, then skip for now and backoff
if (ai != null
&& mAppIdleMonitor.isAppIdle(packageName, ai.uid, op.target.userId)) {
increaseBackoffSetting(op);
op.appIdle = true;
if (isLoggable) {
Log.v(TAG, "Sync backing off idle app " + packageName);
}
continue;
} else {
op.appIdle = false;
}
if (!isOperationValidLocked(op)) { if (!isOperationValidLocked(op)) {
operationIterator.remove(); operationIterator.remove();
mSyncStorageEngine.deleteFromPending(op.pendingOperation); mSyncStorageEngine.deleteFromPending(op.pendingOperation);
@@ -2622,28 +2647,6 @@ public class SyncManager {
} }
continue; continue;
} }
String packageName = getPackageName(op.target);
ApplicationInfo ai = null;
if (packageName != null) {
try {
ai = mContext.getPackageManager().getApplicationInfo(packageName,
PackageManager.GET_UNINSTALLED_PACKAGES
| PackageManager.GET_DISABLED_COMPONENTS);
} catch (NameNotFoundException e) {
}
}
// If app is considered idle, then skip for now and backoff
if (ai != null
&& mAppIdleMonitor.isAppIdle(packageName, ai.uid, op.target.userId)) {
increaseBackoffSetting(op);
op.appIdle = true;
if (isLoggable) {
Log.v(TAG, "Sync backing off idle app " + packageName);
}
continue;
} else {
op.appIdle = false;
}
// Add this sync to be run. // Add this sync to be run.
operations.add(op); operations.add(op);
} }