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

Context: Fix nullability issues

Browse Source 
Fixes: 126701488
Fixes: 126701488
Test: make checkapi
Change-Id: I9b61d833a68528f168611c83a8539eb095a42e01
This commit is contained in:
Adrian Roos
2019-02-28 16:21:18 +01:00
parent 83624df78e
commit ebc927c382
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -9646,7 +9646,7 @@ package android.content {
public abstract class Context { public abstract class Context {
ctor public Context(); ctor public Context();
method public boolean bindIsolatedService(@RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull String); method public boolean bindIsolatedService(@RequiresPermission @NonNull android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull String);
method public abstract boolean bindService(@RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int); method public abstract boolean bindService(@RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int);
method @CheckResult(suggest="#enforceCallingOrSelfPermission(String,String)") public abstract int checkCallingOrSelfPermission(@NonNull String); method @CheckResult(suggest="#enforceCallingOrSelfPermission(String,String)") public abstract int checkCallingOrSelfPermission(@NonNull String);
method @CheckResult(suggest="#enforceCallingOrSelfUriPermission(Uri,int,String)") public abstract int checkCallingOrSelfUriPermission(android.net.Uri, int); method @CheckResult(suggest="#enforceCallingOrSelfUriPermission(Uri,int,String)") public abstract int checkCallingOrSelfUriPermission(android.net.Uri, int);
@@ -9699,7 +9699,7 @@ package android.content {
method public abstract java.io.File getNoBackupFilesDir(); method public abstract java.io.File getNoBackupFilesDir();
method public abstract java.io.File getObbDir(); method public abstract java.io.File getObbDir();
method public abstract java.io.File[] getObbDirs(); method public abstract java.io.File[] getObbDirs();
method public String getOpPackageName(); method @NonNull public String getOpPackageName();
method public abstract String getPackageCodePath(); method public abstract String getPackageCodePath();
method public abstract android.content.pm.PackageManager getPackageManager(); method public abstract android.content.pm.PackageManager getPackageManager();
method public abstract String getPackageName(); method public abstract String getPackageName();

2
api/system-current.txt
View File

@@ -1318,7 +1318,7 @@ package android.content {
method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle); method public abstract void sendBroadcast(android.content.Intent, @Nullable String, @Nullable android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle); method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public abstract void sendBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, @Nullable android.os.Bundle);
method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle); method public abstract void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable android.os.Bundle, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle); method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void startActivityAsUser(@RequiresPermission @NonNull android.content.Intent, @NonNull android.os.UserHandle);
field public static final String APP_PREDICTION_SERVICE = "app_prediction"; field public static final String APP_PREDICTION_SERVICE = "app_prediction";
field public static final String BACKUP_SERVICE = "backup"; field public static final String BACKUP_SERVICE = "backup";
field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions"; field public static final String CONTENT_SUGGESTIONS_SERVICE = "content_suggestions";

6
core/java/android/content/Context.java
View File

@@ -770,6 +770,7 @@ public abstract class Context {
* <p> * <p>
* This is not generally intended for third party application developers. * This is not generally intended for third party application developers.
*/ */
@NonNull
public String getOpPackageName() { public String getOpPackageName() {
throw new RuntimeException("Not implemented. Must override in a subclass."); throw new RuntimeException("Not implemented. Must override in a subclass.");
} }
@@ -1741,7 +1742,8 @@ public abstract class Context {
*/ */
@RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)
@SystemApi @SystemApi
public void startActivityAsUser(@RequiresPermission Intent intent, UserHandle user) { public void startActivityAsUser(@RequiresPermission @NonNull Intent intent,
@NonNull UserHandle user) {
throw new RuntimeException("Not implemented. Must override in a subclass."); throw new RuntimeException("Not implemented. Must override in a subclass.");
} }
@@ -2981,7 +2983,7 @@ public abstract class Context {
* *
* @see #bindService * @see #bindService
*/ */
public boolean bindIsolatedService(@RequiresPermission Intent service, public boolean bindIsolatedService(@RequiresPermission @NonNull Intent service,
@NonNull ServiceConnection conn, @BindServiceFlags int flags, @NonNull ServiceConnection conn, @BindServiceFlags int flags,
@NonNull String instanceName) { @NonNull String instanceName) {
throw new RuntimeException("Not implemented. Must override in a subclass."); throw new RuntimeException("Not implemented. Must override in a subclass.");