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

am bed59864: am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev

Browse Source 
* commit 'bed598649b9eeae6d0112477113bb3904314a10e':
  Allowing a ContentProvider to have a null authority.
This commit is contained in:
Nicolas Prevot
2014-09-09 09:29:19 +00:00
committed by Android Git Automerger
parent 248ae7a3fd 442c275bf6
commit d4ca8a19dd
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/java/android/content/ContentProvider.java
View File

@@ -639,12 +639,14 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
* @param authorities the semi-colon separated authorities of the ContentProvider.
*/
protected final void setAuthorities(String authorities) {
if (authorities.indexOf(';') == -1) {
mAuthority = authorities;
mAuthorities = null;
} else {
mAuthority = null;
mAuthorities = authorities.split(";");
if (authorities != null) {
if (authorities.indexOf(';') == -1) {
mAuthority = authorities;
mAuthorities = null;
} else {
mAuthority = null;
mAuthorities = authorities.split(";");
}
}
}
@@ -653,9 +655,11 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
if (mAuthority != null) {
return mAuthority.equals(authority);
}
int length = mAuthorities.length;
for (int i = 0; i < length; i++) {
if (mAuthorities[i].equals(authority)) return true;
if (mAuthorities != null) {
int length = mAuthorities.length;
for (int i = 0; i < length; i++) {
if (mAuthorities[i].equals(authority)) return true;
}
}
return false;
}