LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out remoteauth dependencies to variables

Browse Source 
This will allow using different values for the variables without having
merge conflicts in the dependencies list for each build rule.

Bug: 295788084
Test: m
Change-Id: I7b64a5a01d1f8139e7ce30ce95903d71cb09de9f
This commit is contained in:
Remi NGUYEN VAN
2023-08-14 15:34:20 +09:00
parent c022bd47a8
commit c41daa4106
7 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
service-t/src/com/android/server/ConnectivityServiceInitializer.java
View File

@@ -17,7 +17,6 @@
package com.android.server;
import android.content.Context;
import android.remoteauth.RemoteAuthManager;
import android.util.Log;
import com.android.modules.utils.build.SdkLevel;
@@ -90,8 +89,8 @@ public final class ConnectivityServiceInitializer extends SystemService {
}
if (mRemoteAuthService != null) {
Log.i(TAG, "Registering " + RemoteAuthManager.REMOTE_AUTH_SERVICE);
publishBinderService(RemoteAuthManager.REMOTE_AUTH_SERVICE, mRemoteAuthService,
Log.i(TAG, "Registering " + RemoteAuthService.SERVICE_NAME);
publishBinderService(RemoteAuthService.SERVICE_NAME, mRemoteAuthService,
/* allowIsolated= */ false);
}
}
@@ -157,8 +156,7 @@ public final class ConnectivityServiceInitializer extends SystemService {
} catch (UnsupportedOperationException e) {
// RemoteAuth is not yet supported in all branches
// TODO: remove catch clause when it is available.
Log.i(TAG, "Skipping unsupported service "
+ RemoteAuthManager.REMOTE_AUTH_SERVICE);
Log.i(TAG, "Skipping unsupported service " + RemoteAuthService.SERVICE_NAME);
return null;
}
}