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

Merge "Clean up usage of Settings.Secure.DIALER_DEFAULT_APPLICATION." into qt-dev

Browse Source 
am: 4e7f954817

Change-Id: Ib9b1f6d8820726aa52aee857d41856d8f0f5fa9b
This commit is contained in:
Hai Zhang
2019-05-28 13:21:45 -07:00
committed by android-build-merger
parent 5e3a1c803f 4e7f954817
commit 820ddfee82
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/telecom/TelecomLoaderService.java
View File

@@ -16,21 +16,17 @@
package com.android.server.telecom; package com.android.server.telecom;
import android.app.role.RoleManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings;
import android.telecom.DefaultDialerManager; import android.telecom.DefaultDialerManager;
import android.telecom.PhoneAccountHandle; import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager; import android.telecom.TelecomManager;
@@ -221,19 +217,10 @@ public class TelecomLoaderService extends SystemService {
private void registerDefaultAppNotifier() { private void registerDefaultAppNotifier() {
final DefaultPermissionGrantPolicy permissionPolicy = getDefaultPermissionGrantPolicy(); final DefaultPermissionGrantPolicy permissionPolicy = getDefaultPermissionGrantPolicy();
// Notify the package manager on default app changes // Notify the package manager on default app changes
final Uri defaultDialerAppUri = Settings.Secure.getUriFor( final RoleManager roleManager = mContext.getSystemService(RoleManager.class);
Settings.Secure.DIALER_DEFAULT_APPLICATION); roleManager.addOnRoleHoldersChangedListenerAsUser(mContext.getMainExecutor(),
ContentObserver contentObserver = new ContentObserver( (roleName, user) -> updateSimCallManagerPermissions(permissionPolicy,
new Handler(Looper.getMainLooper())) { user.getIdentifier()), UserHandle.ALL);
@Override
public void onChange(boolean selfChange, Uri uri, int userId) {
if (defaultDialerAppUri.equals(uri)) {
updateSimCallManagerPermissions(permissionPolicy, userId);
}
}
};
mContext.getContentResolver().registerContentObserver(defaultDialerAppUri,
false, contentObserver, UserHandle.USER_ALL);
} }