mirror of
https://github.com/topjohnwu/libsu.git
synced 2024-11-26 21:40:42 +00:00
Make attachBaseContext final to prevent breakage
This commit is contained in:
parent
715bb8f2a4
commit
f0d4bc6824
@ -25,7 +25,6 @@ import android.content.ServiceConnection;
|
||||
import android.os.IBinder;
|
||||
import android.os.Messenger;
|
||||
|
||||
import androidx.annotation.CallSuper;
|
||||
import androidx.annotation.MainThread;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
@ -201,19 +200,28 @@ public abstract class RootService extends ContextWrapper {
|
||||
}
|
||||
|
||||
@Override
|
||||
@CallSuper
|
||||
protected void attachBaseContext(Context base) {
|
||||
super.attachBaseContext(Utils.getContextImpl(base));
|
||||
protected final void attachBaseContext(Context base) {
|
||||
super.attachBaseContext(onAttach(Utils.getContextImpl(base)));
|
||||
RootServiceServer.getInstance(base).register(this);
|
||||
onCreate();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the RootService is getting attached with a {@link Context}.
|
||||
* @param base the context being attached.
|
||||
* @return the passed in context by default.
|
||||
*/
|
||||
@NonNull
|
||||
protected Context onAttach(@NonNull Context base) {
|
||||
return base;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the component name that will be used for service lookup.
|
||||
* <p>
|
||||
* Overriding this method is only for very unusual use cases when a different
|
||||
* component name other than the actual class name is desired.
|
||||
* @return the desired component name
|
||||
* @return the desired component name.
|
||||
*/
|
||||
@NonNull
|
||||
public ComponentName getComponentName() {
|
||||
@ -222,7 +230,7 @@ public abstract class RootService extends ContextWrapper {
|
||||
|
||||
@Override
|
||||
public final Context getApplicationContext() {
|
||||
return getBaseContext();
|
||||
return Utils.context;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user