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

Merge "Fix issue #28431297: Crash in system process" into nyc-dev am: 1a2f993

Browse Source 
am: 2501220

* commit '2501220e1f473752b5eadc663f7486668e9b9fc6':
  Fix issue #28431297: Crash in system process

Change-Id: Icae0787b41e5c47339496e0c08457e331e37162f
This commit is contained in:
Dianne Hackborn
2016-04-28 01:22:01 +00:00
committed by android-build-merger
parent d1bcb3b946 2501220e1f
commit 8aad038614
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/ContentResolver.java
View File

@@ -1748,7 +1748,7 @@ public abstract class ContentResolver {
* *
* @hide * @hide
*/ */
public void notifyChange(Uri uri, ContentObserver observer, boolean syncToNetwork, public void notifyChange(@NonNull Uri uri, ContentObserver observer, boolean syncToNetwork,
@UserIdInt int userHandle) { @UserIdInt int userHandle) {
try { try {
getContentService().notifyChange( getContentService().notifyChange(
@@ -1765,7 +1765,7 @@ public abstract class ContentResolver {
* *
* @hide * @hide
*/ */
public void notifyChange(Uri uri, ContentObserver observer, @NotifyFlags int flags, public void notifyChange(@NonNull Uri uri, ContentObserver observer, @NotifyFlags int flags,
@UserIdInt int userHandle) { @UserIdInt int userHandle) {
try { try {
getContentService().notifyChange( getContentService().notifyChange(

4
services/core/java/com/android/server/content/ContentService.java
View File

@@ -352,6 +352,10 @@ public final class ContentService extends IContentService.Stub {
if (DEBUG) Slog.d(TAG, "Notifying update of " + uri + " for user " + userHandle if (DEBUG) Slog.d(TAG, "Notifying update of " + uri + " for user " + userHandle
+ " from observer " + observer + ", flags " + Integer.toHexString(flags)); + " from observer " + observer + ", flags " + Integer.toHexString(flags));
if (uri == null) {
throw new NullPointerException("Uri must not be null");
}
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
final int pid = Binder.getCallingPid(); final int pid = Binder.getCallingPid();
final int callingUserHandle = UserHandle.getCallingUserId(); final int callingUserHandle = UserHandle.getCallingUserId();