Merge "[Mainline] Use SmsManager method instead of ISms"

This commit is contained in:
Betty Chang
2020-01-14 03:51:34 +00:00
committed by Android (Google) Code Review

View File

@@ -14,10 +14,8 @@
package com.android.settings.applications; package com.android.settings.applications;
import android.content.Context; import android.content.Context;
import android.os.RemoteException; import android.telephony.SmsManager;
import android.os.ServiceManager;
import com.android.internal.telephony.ISms;
import com.android.internal.telephony.SmsUsageMonitor; import com.android.internal.telephony.SmsUsageMonitor;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -31,12 +29,12 @@ import java.util.ArrayList;
public class AppStateSmsPremBridge extends AppStateBaseBridge { public class AppStateSmsPremBridge extends AppStateBaseBridge {
private final Context mContext; private final Context mContext;
private final ISms mSmsManager; private final SmsManager mSmsManager;
public AppStateSmsPremBridge(Context context, ApplicationsState appState, Callback callback) { public AppStateSmsPremBridge(Context context, ApplicationsState appState, Callback callback) {
super(appState, callback); super(appState, callback);
mContext = context; mContext = context;
mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms")); mSmsManager = SmsManager.getDefault();
} }
@Override @Override
@@ -61,18 +59,11 @@ public class AppStateSmsPremBridge extends AppStateBaseBridge {
} }
private int getSmsState(String pkg) { private int getSmsState(String pkg) {
try { return mSmsManager.getPremiumSmsConsent(pkg);
return mSmsManager.getPremiumSmsPermission(pkg);
} catch (RemoteException e) {
return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
}
} }
public void setSmsState(String pkg, int state) { public void setSmsState(String pkg, int state) {
try { mSmsManager.setPremiumSmsConsent(pkg, state);
mSmsManager.setPremiumSmsPermission(pkg, state);
} catch (RemoteException e) {
}
} }
public static class SmsState { public static class SmsState {