Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61217232 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "API Compatibility: Fix incompatible abstract methods on Context"

parents a47310fd fe6aeaf2

api/current.txt

+3 −6
Original line number Diff line number Diff line
@@ -9625,7 +9625,7 @@ package android.content { 














  public abstract class Context {















    ctor public Context();













    method public abstract boolean bindIsolatedService(@RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull String);













    method public boolean bindIsolatedService(@RequiresPermission 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 @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);










@@ -9678,7 +9678,7 @@ package android.content {













    method public abstract java.io.File getNoBackupFilesDir();















    method public abstract java.io.File getObbDir();















    method public abstract java.io.File[] getObbDirs();













    method public abstract String getOpPackageName();













    method public String getOpPackageName();















    method public abstract String getPackageCodePath();















    method public abstract android.content.pm.PackageManager getPackageManager();















    method public abstract String getPackageName();










@@ -9745,7 +9745,7 @@ package android.content {













    method public abstract void unbindService(@NonNull android.content.ServiceConnection);















    method public void unregisterComponentCallbacks(android.content.ComponentCallbacks);















    method public abstract void unregisterReceiver(android.content.BroadcastReceiver);













    method public abstract void updateServiceGroup(@NonNull android.content.ServiceConnection, int, int);













    method public void updateServiceGroup(@NonNull android.content.ServiceConnection, int, int);















    field public static final String ACCESSIBILITY_SERVICE = "accessibility";















    field public static final String ACCOUNT_SERVICE = "account";















    field public static final String ACTIVITY_SERVICE = "activity";










@@ -9839,7 +9839,6 @@ package android.content {













  public class ContextWrapper extends android.content.Context {















    ctor public ContextWrapper(android.content.Context);















    method protected void attachBaseContext(android.content.Context);













    method public boolean bindIsolatedService(android.content.Intent, android.content.ServiceConnection, int, String);















    method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);















    method public int checkCallingOrSelfPermission(String);















    method public int checkCallingOrSelfUriPermission(android.net.Uri, int);










@@ -9889,7 +9888,6 @@ package android.content {













    method public java.io.File getNoBackupFilesDir();















    method public java.io.File getObbDir();















    method public java.io.File[] getObbDirs();













    method public String getOpPackageName();















    method public String getPackageCodePath();















    method public android.content.pm.PackageManager getPackageManager();















    method public String getPackageName();










@@ -9945,7 +9943,6 @@ package android.content {













    method public boolean stopService(android.content.Intent);















    method public void unbindService(android.content.ServiceConnection);















    method public void unregisterReceiver(android.content.BroadcastReceiver);













    method public void updateServiceGroup(android.content.ServiceConnection, int, int);















  }





























  @Deprecated public class CursorLoader extends android.content.AsyncTaskLoader<android.database.Cursor> {

























core/java/android/content/Context.java



+11
−5




























Original line number
Diff line number
Diff line








@@ -771,7 +771,9 @@ public abstract class Context {













     * <p>















     * This is not generally intended for third party application developers.















     */













    public abstract String getOpPackageName();













    public String getOpPackageName() {













        throw new RuntimeException("Not implemented. Must override in a subclass.");













    }































    /** Return the full application info for this context's package. */















    public abstract ApplicationInfo getApplicationInfo();










@@ -2980,9 +2982,11 @@ public abstract class Context {













     *















     * @see #bindService















     */













    public abstract boolean bindIsolatedService(@RequiresPermission Intent service,













    public boolean bindIsolatedService(@RequiresPermission Intent service,















            @NonNull ServiceConnection conn, @BindServiceFlags int flags,













            @NonNull String instanceName);













            @NonNull String instanceName) {













        throw new RuntimeException("Not implemented. Must override in a subclass.");













    }































    /**















     * Same as {@link #bindService(Intent, ServiceConnection, int)}, but with an explicit userHandle










@@ -3037,8 +3041,10 @@ public abstract class Context {













     *                   a related groups -- higher importance values will be killed before















     *                   lower ones.















     */













    public abstract void updateServiceGroup(@NonNull ServiceConnection conn, int group,













            int importance);













    public void updateServiceGroup(@NonNull ServiceConnection conn, int group,













            int importance) {













        throw new RuntimeException("Not implemented. Must override in a subclass.");













    }































    /**















     * Disconnect from an application service.  You will no longer receive

































test-mock/api/current.txt



+0
−3




























Original line number
Diff line number
Diff line








@@ -32,7 +32,6 @@ package android.test.mock {





























  public class MockContext extends android.content.Context {















    ctor public MockContext();













    method public boolean bindIsolatedService(android.content.Intent, android.content.ServiceConnection, int, String);















    method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);















    method public int checkCallingOrSelfPermission(String);















    method public int checkCallingOrSelfUriPermission(android.net.Uri, int);










@@ -81,7 +80,6 @@ package android.test.mock {













    method public java.io.File getNoBackupFilesDir();















    method public java.io.File getObbDir();















    method public java.io.File[] getObbDirs();













    method public String getOpPackageName();















    method public String getPackageCodePath();















    method public android.content.pm.PackageManager getPackageManager();















    method public String getPackageName();










@@ -137,7 +135,6 @@ package android.test.mock {













    method public boolean stopService(android.content.Intent);















    method public void unbindService(android.content.ServiceConnection);















    method public void unregisterReceiver(android.content.BroadcastReceiver);













    method public void updateServiceGroup(android.content.ServiceConnection, int, int);















  }































  @Deprecated public class MockCursor implements android.database.Cursor {