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

Commit 2d5d6067 authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

Merge "Clean up usage of Settings.Secure.DIALER_DEFAULT_APPLICATION." into qt-dev am: 4e7f9548

am: 820ddfee

Change-Id: Ie2244aad7ee4be5f48df07aecc22cf5179e7ff3a
parents edeb8fd8 820ddfee
Loading
Loading
Loading
Loading
+5 −18
Original line number Original line Diff line number Diff line
@@ -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);
    }
    }