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

Merge "Fix system crash due to mismatching begin/finishBroadcast()" into nyc-mr1-dev

Browse Source
This commit is contained in:
Makoto Onuki
2016-09-16 17:13:15 +00:00
committed by Android (Google) Code Review
parent bce7e65b36 7bdb9ce978
commit d6f06df5ec
2 changed files with 101 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/os/RemoteCallbackList.java
View File

@@ -288,20 +288,22 @@ public class RemoteCallbackList<E extends IInterface> {
* @see #beginBroadcast * @see #beginBroadcast
*/ */
public void finishBroadcast() { public void finishBroadcast() {
if (mBroadcastCount < 0) { synchronized (mCallbacks) {
throw new IllegalStateException( if (mBroadcastCount < 0) {
"finishBroadcast() called outside of a broadcast"); throw new IllegalStateException(
} "finishBroadcast() called outside of a broadcast");
Object[] active = mActiveBroadcast;
if (active != null) {
final int N = mBroadcastCount;
for (int i=0; i<N; i++) {
active[i] = null;
} }
Object[] active = mActiveBroadcast;
if (active != null) {
final int N = mBroadcastCount;
for (int i=0; i<N; i++) {
active[i] = null;
}
}
mBroadcastCount = -1;
} }
mBroadcastCount = -1;
} }
/** /**

152
services/core/java/com/android/server/pm/LauncherAppsService.java
View File

@@ -631,17 +631,20 @@ public class LauncherAppsService extends SystemService {
public void onPackageAdded(String packageName, int uid) { public void onPackageAdded(String packageName, int uid) {
UserHandle user = new UserHandle(getChangingUserId()); UserHandle user = new UserHandle(getChangingUserId());
final int n = mListeners.beginBroadcast(); final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { try {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); for (int i = 0; i < n; i++) {
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
if (!isEnabledProfileOf(user, cookie.user, "onPackageAdded")) continue; BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
try { if (!isEnabledProfileOf(user, cookie.user, "onPackageAdded")) continue;
listener.onPackageAdded(user, packageName); try {
} catch (RemoteException re) { listener.onPackageAdded(user, packageName);
Slog.d(TAG, "Callback failed ", re); } catch (RemoteException re) {
Slog.d(TAG, "Callback failed ", re);
}
} }
} finally {
mListeners.finishBroadcast();
} }
mListeners.finishBroadcast();
super.onPackageAdded(packageName, uid); super.onPackageAdded(packageName, uid);
} }
@@ -650,17 +653,20 @@ public class LauncherAppsService extends SystemService {
public void onPackageRemoved(String packageName, int uid) { public void onPackageRemoved(String packageName, int uid) {
UserHandle user = new UserHandle(getChangingUserId()); UserHandle user = new UserHandle(getChangingUserId());
final int n = mListeners.beginBroadcast(); final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { try {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); for (int i = 0; i < n; i++) {
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
if (!isEnabledProfileOf(user, cookie.user, "onPackageRemoved")) continue; BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
try { if (!isEnabledProfileOf(user, cookie.user, "onPackageRemoved")) continue;
listener.onPackageRemoved(user, packageName); try {
} catch (RemoteException re) { listener.onPackageRemoved(user, packageName);
Slog.d(TAG, "Callback failed ", re); } catch (RemoteException re) {
Slog.d(TAG, "Callback failed ", re);
}
} }
} finally {
mListeners.finishBroadcast();
} }
mListeners.finishBroadcast();
super.onPackageRemoved(packageName, uid); super.onPackageRemoved(packageName, uid);
} }
@@ -669,17 +675,20 @@ public class LauncherAppsService extends SystemService {
public void onPackageModified(String packageName) { public void onPackageModified(String packageName) {
UserHandle user = new UserHandle(getChangingUserId()); UserHandle user = new UserHandle(getChangingUserId());
final int n = mListeners.beginBroadcast(); final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { try {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); for (int i = 0; i < n; i++) {
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
if (!isEnabledProfileOf(user, cookie.user, "onPackageModified")) continue; BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
try { if (!isEnabledProfileOf(user, cookie.user, "onPackageModified")) continue;
listener.onPackageChanged(user, packageName); try {
} catch (RemoteException re) { listener.onPackageChanged(user, packageName);
Slog.d(TAG, "Callback failed ", re); } catch (RemoteException re) {
Slog.d(TAG, "Callback failed ", re);
}
} }
} finally {
mListeners.finishBroadcast();
} }
mListeners.finishBroadcast();
super.onPackageModified(packageName); super.onPackageModified(packageName);
} }
@@ -688,17 +697,20 @@ public class LauncherAppsService extends SystemService {
public void onPackagesAvailable(String[] packages) { public void onPackagesAvailable(String[] packages) {
UserHandle user = new UserHandle(getChangingUserId()); UserHandle user = new UserHandle(getChangingUserId());
final int n = mListeners.beginBroadcast(); final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { try {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); for (int i = 0; i < n; i++) {
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
if (!isEnabledProfileOf(user, cookie.user, "onPackagesAvailable")) continue; BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
try { if (!isEnabledProfileOf(user, cookie.user, "onPackagesAvailable")) continue;
listener.onPackagesAvailable(user, packages, isReplacing()); try {
} catch (RemoteException re) { listener.onPackagesAvailable(user, packages, isReplacing());
Slog.d(TAG, "Callback failed ", re); } catch (RemoteException re) {
Slog.d(TAG, "Callback failed ", re);
}
} }
} finally {
mListeners.finishBroadcast();
} }
mListeners.finishBroadcast();
super.onPackagesAvailable(packages); super.onPackagesAvailable(packages);
} }
@@ -707,17 +719,20 @@ public class LauncherAppsService extends SystemService {
public void onPackagesUnavailable(String[] packages) { public void onPackagesUnavailable(String[] packages) {
UserHandle user = new UserHandle(getChangingUserId()); UserHandle user = new UserHandle(getChangingUserId());
final int n = mListeners.beginBroadcast(); final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { try {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); for (int i = 0; i < n; i++) {
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
if (!isEnabledProfileOf(user, cookie.user, "onPackagesUnavailable")) continue; BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
try { if (!isEnabledProfileOf(user, cookie.user, "onPackagesUnavailable")) continue;
listener.onPackagesUnavailable(user, packages, isReplacing()); try {
} catch (RemoteException re) { listener.onPackagesUnavailable(user, packages, isReplacing());
Slog.d(TAG, "Callback failed ", re); } catch (RemoteException re) {
Slog.d(TAG, "Callback failed ", re);
}
} }
} finally {
mListeners.finishBroadcast();
} }
mListeners.finishBroadcast();
super.onPackagesUnavailable(packages); super.onPackagesUnavailable(packages);
} }
@@ -726,17 +741,20 @@ public class LauncherAppsService extends SystemService {
public void onPackagesSuspended(String[] packages) { public void onPackagesSuspended(String[] packages) {
UserHandle user = new UserHandle(getChangingUserId()); UserHandle user = new UserHandle(getChangingUserId());
final int n = mListeners.beginBroadcast(); final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { try {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); for (int i = 0; i < n; i++) {
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
if (!isEnabledProfileOf(user, cookie.user, "onPackagesSuspended")) continue; BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
try { if (!isEnabledProfileOf(user, cookie.user, "onPackagesSuspended")) continue;
listener.onPackagesSuspended(user, packages); try {
} catch (RemoteException re) { listener.onPackagesSuspended(user, packages);
Slog.d(TAG, "Callback failed ", re); } catch (RemoteException re) {
Slog.d(TAG, "Callback failed ", re);
}
} }
} finally {
mListeners.finishBroadcast();
} }
mListeners.finishBroadcast();
super.onPackagesSuspended(packages); super.onPackagesSuspended(packages);
} }
@@ -745,17 +763,20 @@ public class LauncherAppsService extends SystemService {
public void onPackagesUnsuspended(String[] packages) { public void onPackagesUnsuspended(String[] packages) {
UserHandle user = new UserHandle(getChangingUserId()); UserHandle user = new UserHandle(getChangingUserId());
final int n = mListeners.beginBroadcast(); final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { try {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); for (int i = 0; i < n; i++) {
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
if (!isEnabledProfileOf(user, cookie.user, "onPackagesUnsuspended")) continue; BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
try { if (!isEnabledProfileOf(user, cookie.user, "onPackagesUnsuspended")) continue;
listener.onPackagesUnsuspended(user, packages); try {
} catch (RemoteException re) { listener.onPackagesUnsuspended(user, packages);
Slog.d(TAG, "Callback failed ", re); } catch (RemoteException re) {
Slog.d(TAG, "Callback failed ", re);
}
} }
} finally {
mListeners.finishBroadcast();
} }
mListeners.finishBroadcast();
super.onPackagesUnsuspended(packages); super.onPackagesUnsuspended(packages);
} }
@@ -768,10 +789,10 @@ public class LauncherAppsService extends SystemService {
private void onShortcutChangedInner(@NonNull String packageName, private void onShortcutChangedInner(@NonNull String packageName,
@UserIdInt int userId) { @UserIdInt int userId) {
final int n = mListeners.beginBroadcast();
try { try {
final UserHandle user = UserHandle.of(userId); final UserHandle user = UserHandle.of(userId);
final int n = mListeners.beginBroadcast();
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
IOnAppsChangedListener listener = mListeners.getBroadcastItem(i); IOnAppsChangedListener listener = mListeners.getBroadcastItem(i);
BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i); BroadcastCookie cookie = (BroadcastCookie) mListeners.getBroadcastCookie(i);
@@ -803,10 +824,11 @@ public class LauncherAppsService extends SystemService {
Slog.d(TAG, "Callback failed ", re); Slog.d(TAG, "Callback failed ", re);
} }
} }
mListeners.finishBroadcast();
} catch (RuntimeException e) { } catch (RuntimeException e) {
// When the user is locked we get IllegalState, so just catch all. // When the user is locked we get IllegalState, so just catch all.
Log.w(TAG, e.getMessage(), e); Log.w(TAG, e.getMessage(), e);
} finally {
mListeners.finishBroadcast();
} }
} }
} }