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

Merge "Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache"" into qt-dev

Browse Source 
am: 660c234e9a

Change-Id: I1142efdfe93ff9e5ac8f33af9f58e27d52f02236
This commit is contained in:
Dmitry Dementyev
2019-07-02 12:28:34 -07:00
committed by android-build-merger
parent a708c79937 660c234e9a
commit a51df29cf5
2 changed files with 20 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
core/java/android/content/pm/RegisteredServicesCache.java
View File

@@ -17,7 +17,6 @@
package android.content.pm;
import android.Manifest;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -177,8 +176,7 @@ public abstract class RegisteredServicesCache<V> {
mContext.registerReceiver(mUserRemovedReceiver, userFilter);
}
@VisibleForTesting
protected void handlePackageEvent(Intent intent, int userId) {
private void handlePackageEvent(Intent intent, int userId) {
// Don't regenerate the services map when the package is removed or its
// ASEC container unmounted as a step in replacement. The subsequent
// _ADDED / _AVAILABLE call will regenerate the map in the final state.
@@ -240,9 +238,6 @@ public abstract class RegisteredServicesCache<V> {
public void invalidateCache(int userId) {
synchronized (mServicesLock) {
if (DEBUG) {
Slog.d(TAG, "invalidating cache for " + userId + " " + mInterfaceName);
}
final UserServices<V> user = findOrCreateUserLocked(userId);
user.services = null;
onServicesChangedLocked(userId);
@@ -472,48 +467,34 @@ public abstract class RegisteredServicesCache<V> {
* or null to assume that everything is affected.
* @param userId the user for whom to update the services map.
*/
private void generateServicesMap(@Nullable int[] changedUids, int userId) {
private void generateServicesMap(int[] changedUids, int userId) {
if (DEBUG) {
Slog.d(TAG, "generateServicesMap() for " + userId + ", changed UIDs = "
+ Arrays.toString(changedUids));
}
final ArrayList<ServiceInfo<V>> serviceInfos = new ArrayList<>();
final List<ResolveInfo> resolveInfos = queryIntentServices(userId);
for (ResolveInfo resolveInfo : resolveInfos) {
try {
ServiceInfo<V> info = parseServiceInfo(resolveInfo);
if (info == null) {
Log.w(TAG, "Unable to load service info " + resolveInfo.toString());
continue;
}
serviceInfos.add(info);
} catch (XmlPullParserException | IOException e) {
Log.w(TAG, "Unable to load service info " + resolveInfo.toString(), e);
}
}
synchronized (mServicesLock) {
final UserServices<V> user = findOrCreateUserLocked(userId);
final boolean cacheInvalid = user.services == null;
if (cacheInvalid) {
final boolean firstScan = user.services == null;
if (firstScan) {
user.services = Maps.newHashMap();
}
final ArrayList<ServiceInfo<V>> serviceInfos = new ArrayList<>();
final List<ResolveInfo> resolveInfos = queryIntentServices(userId);
for (ResolveInfo resolveInfo : resolveInfos) {
try {
// when changedUids == null, we want to do a rescan of everything, this means
// it's the initial scan, and containsUid will trivially return true
// when changedUids != null, we got here because a package changed, but
// invalidateCache could have been called (thus user.services == null), and we
// should query from PackageManager again
if (!cacheInvalid
&& !containsUid(
changedUids, resolveInfo.serviceInfo.applicationInfo.uid)) {
if (DEBUG) {
Slog.d(TAG, "Skipping parseServiceInfo for " + resolveInfo);
}
continue;
}
ServiceInfo<V> info = parseServiceInfo(resolveInfo);
if (info == null) {
Log.w(TAG, "Unable to load service info " + resolveInfo.toString());
continue;
}
serviceInfos.add(info);
} catch (XmlPullParserException | IOException e) {
Log.w(TAG, "Unable to load service info " + resolveInfo.toString(), e);
}
}
StringBuilder changes = new StringBuilder();
boolean changed = false;
for (ServiceInfo<V> info : serviceInfos) {
@@ -534,7 +515,7 @@ public abstract class RegisteredServicesCache<V> {
changed = true;
user.services.put(info.type, info);
user.persistentServices.put(info.type, info.uid);
if (!(user.mPersistentServicesFileDidNotExist && cacheInvalid)) {
if (!(user.mPersistentServicesFileDidNotExist && firstScan)) {
notifyListener(info.type, userId, false /* removed */);
}
} else if (previousUid == info.uid) {