drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a missing null object check" into nyc-dev

Browse Source
This commit is contained in:
Svetoslav Ganov
2016-04-27 21:19:05 +00:00
committed by Android (Google) Code Review
parent 8b5e9f1bcf 83a1f7fe91
commit 44cc663f78
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@ -846,7 +846,7 @@ public class SettingsProvider extends ContentProvider {
// Special case for location (sigh). // Special case for location (sigh).
if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) { if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) {
return null; continue;
} }
Setting setting = mSettingsRegistry.getSettingLocked( Setting setting = mSettingsRegistry.getSettingLocked(
@ -871,7 +871,8 @@ public class SettingsProvider extends ContentProvider {
// Special case for location (sigh). // Special case for location (sigh).
if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) { if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) {
return null; return mSettingsRegistry.getSettingsLocked(SETTINGS_TYPE_SECURE,
owningUserId).getNullSetting();
} }
// Get the value. // Get the value.

5
packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
View File

@ -16,7 +16,6 @@
package com.android.providers.settings; package com.android.providers.settings;
import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.SystemClock; import android.os.SystemClock;
@ -159,6 +158,10 @@ final class SettingsState {
return mVersion; return mVersion;
} }
public Setting getNullSetting() {
return mNullSetting;
}
// The settings provider must hold its lock when calling here. // The settings provider must hold its lock when calling here.
public void setVersionLocked(int version) { public void setVersionLocked(int version) {
if (version == mVersion) { if (version == mVersion) {