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

Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev

Browse Source 
am: 0df7c98adf

* commit '0df7c98adf75e2f8a176e742e1bb325aee2808e6':
  Remove @Nullable annotation from getDrawable() methods
This commit is contained in:
Alan Viverette
2016-02-23 20:34:58 +00:00
committed by android-build-merger
parent 45753fef36 0df7c98adf
commit cadb829532
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/res/Resources.java
View File

@@ -769,7 +769,6 @@ public class Resources {
* @deprecated Use {@link #getDrawable(int, Theme)} instead.
*/
@Deprecated
@Nullable
public Drawable getDrawable(@DrawableRes int id) throws NotFoundException {
final Drawable d = getDrawable(id, null);
if (d != null && d.canApplyTheme()) {
@@ -794,7 +793,6 @@ public class Resources {
* @throws NotFoundException Throws NotFoundException if the given ID does
* not exist.
*/
@Nullable
public Drawable getDrawable(@DrawableRes int id, @Nullable Theme theme)
throws NotFoundException {
final TypedValue value = obtainTempTypedValue(id);
@@ -832,7 +830,6 @@ public class Resources {
* @deprecated Use {@link #getDrawableForDensity(int, int, Theme)} instead.
*/
@Deprecated
@Nullable
public Drawable getDrawableForDensity(@DrawableRes int id, int density)
throws NotFoundException {
return getDrawableForDensity(id, density, null);
@@ -852,7 +849,6 @@ public class Resources {
* @throws NotFoundException Throws NotFoundException if the given ID does
* not exist.
*/
@Nullable
public Drawable getDrawableForDensity(@DrawableRes int id, int density, @Nullable Theme theme) {
final TypedValue value = obtainTempTypedValue(id);
try {