Add support for per-package policy for sending premium SMS.
The default behavior for sending a message to a premium SMS short code (or suspected premium SMS number) is to ask the user for confirmation. Enable the user to set a default policy ("remember this choice" checkbox) to always/never allow the app to send SMS to premium short codes in the future. The policy can be changed by the Settings app in the app info screen. Bug: 5513975 Change-Id: I93053fef1524ee7772cc87364c760cb3dbf01ad7
This commit is contained in:
@@ -393,6 +393,27 @@
|
|||||||
style="?android:attr/listSeparatorTextViewStyle"
|
style="?android:attr/listSeparatorTextViewStyle"
|
||||||
android:layout_marginTop="8dip"
|
android:layout_marginTop="8dip"
|
||||||
android:text="@string/permissions_label" />
|
android:text="@string/permissions_label" />
|
||||||
|
<TextView android:id="@+id/security_settings_billing_desc"
|
||||||
|
android:text="@string/security_settings_billing_desc"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||||
|
android:paddingTop="6dip"
|
||||||
|
android:paddingStart="6dip"
|
||||||
|
android:paddingBottom="6dip"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content" />
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/security_settings_billing_list"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
<TextView
|
||||||
|
android:text="@string/security_settings_premium_sms_desc" />
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/security_settings_premium_sms_list"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:spinnerMode="dropdown" />
|
||||||
|
</LinearLayout>
|
||||||
<TextView android:id="@+id/security_settings_desc"
|
<TextView android:id="@+id/security_settings_desc"
|
||||||
android:text="@string/security_settings_desc"
|
android:text="@string/security_settings_desc"
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||||
|
@@ -746,4 +746,14 @@
|
|||||||
<item>2</item>
|
<item>2</item>
|
||||||
<item>1</item>
|
<item>1</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
|
||||||
|
<string-array name="security_settings_premium_sms_values">
|
||||||
|
<!-- Ask user before sending to premium SMS short code. -->
|
||||||
|
<item>Ask</item>
|
||||||
|
<!-- Never allow app to send to premium SMS short code. -->
|
||||||
|
<item>Never allow</item>
|
||||||
|
<!-- Always allow app to send to premium SMS short code. -->
|
||||||
|
<item>Always allow</item>
|
||||||
|
</string-array>
|
||||||
</resources>
|
</resources>
|
||||||
|
@@ -2559,6 +2559,10 @@
|
|||||||
<string name="join_many_items_first"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="all_but_first_and_last_item">%2$s</xliff:g></string>
|
<string name="join_many_items_first"><xliff:g id="first_item">%1$s</xliff:g>, <xliff:g id="all_but_first_and_last_item">%2$s</xliff:g></string>
|
||||||
<!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
|
<!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
|
||||||
<string name="join_many_items_middle"><xliff:g id="added_item">%1$s</xliff:g>, <xliff:g id="rest_of_items">%2$s</xliff:g></string>
|
<string name="join_many_items_middle"><xliff:g id="added_item">%1$s</xliff:g>, <xliff:g id="rest_of_items">%2$s</xliff:g></string>
|
||||||
|
<!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
|
||||||
|
<string name="security_settings_billing_desc">This app may charge you money:</string>
|
||||||
|
<!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
|
||||||
|
<string name="security_settings_premium_sms_desc">Send premium SMS</string>
|
||||||
<string name="computing_size">Computing\u2026</string>
|
<string name="computing_size">Computing\u2026</string>
|
||||||
<string name="invalid_size_value">Couldn\'t compute package size.</string>
|
<string name="invalid_size_value">Couldn\'t compute package size.</string>
|
||||||
<!-- String displayed when list is empty -->
|
<!-- String displayed when list is empty -->
|
||||||
|
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package com.android.settings.applications;
|
package com.android.settings.applications;
|
||||||
|
|
||||||
|
import com.android.internal.telephony.ISms;
|
||||||
|
import com.android.internal.telephony.SmsUsageMonitor;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.Utils;
|
import com.android.settings.Utils;
|
||||||
import com.android.settings.applications.ApplicationsState.AppEntry;
|
import com.android.settings.applications.ApplicationsState.AppEntry;
|
||||||
@@ -66,12 +68,15 @@ import java.util.List;
|
|||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.AdapterView;
|
||||||
import android.widget.AppSecurityPermissions;
|
import android.widget.AppSecurityPermissions;
|
||||||
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.CheckBox;
|
import android.widget.CheckBox;
|
||||||
import android.widget.CompoundButton;
|
import android.widget.CompoundButton;
|
||||||
import android.widget.ImageView;
|
import android.widget.ImageView;
|
||||||
import android.widget.LinearLayout;
|
import android.widget.LinearLayout;
|
||||||
|
import android.widget.Spinner;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -96,6 +101,7 @@ public class InstalledAppDetails extends Fragment
|
|||||||
private IUsbManager mUsbManager;
|
private IUsbManager mUsbManager;
|
||||||
private AppWidgetManager mAppWidgetManager;
|
private AppWidgetManager mAppWidgetManager;
|
||||||
private DevicePolicyManager mDpm;
|
private DevicePolicyManager mDpm;
|
||||||
|
private ISms mSmsManager;
|
||||||
private ApplicationsState mState;
|
private ApplicationsState mState;
|
||||||
private ApplicationsState.Session mSession;
|
private ApplicationsState.Session mSession;
|
||||||
private ApplicationsState.AppEntry mAppEntry;
|
private ApplicationsState.AppEntry mAppEntry;
|
||||||
@@ -371,6 +377,7 @@ public class InstalledAppDetails extends Fragment
|
|||||||
mUsbManager = IUsbManager.Stub.asInterface(b);
|
mUsbManager = IUsbManager.Stub.asInterface(b);
|
||||||
mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
|
mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
|
||||||
mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
|
mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
|
||||||
|
mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));
|
||||||
|
|
||||||
mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
|
mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
|
||||||
}
|
}
|
||||||
@@ -595,8 +602,43 @@ public class InstalledAppDetails extends Fragment
|
|||||||
// Security permissions section
|
// Security permissions section
|
||||||
LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
|
LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);
|
||||||
AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), packageName);
|
AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), packageName);
|
||||||
if (asp.getPermissionCount() > 0) {
|
int premiumSmsPermission = getPremiumSmsPermission(packageName);
|
||||||
|
// Premium SMS permission implies the app also has SEND_SMS permission, so the original
|
||||||
|
// application permissions list doesn't have to be shown/hidden separately. The premium
|
||||||
|
// SMS subsection should only be visible if the app has tried to send to a premium SMS.
|
||||||
|
if (asp.getPermissionCount() > 0
|
||||||
|
|| premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
|
||||||
permsView.setVisibility(View.VISIBLE);
|
permsView.setVisibility(View.VISIBLE);
|
||||||
|
} else {
|
||||||
|
permsView.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
// Premium SMS permission subsection
|
||||||
|
TextView securityBillingDesc = (TextView) permsView.findViewById(
|
||||||
|
R.id.security_settings_billing_desc);
|
||||||
|
LinearLayout securityBillingList = (LinearLayout) permsView.findViewById(
|
||||||
|
R.id.security_settings_billing_list);
|
||||||
|
if (premiumSmsPermission != SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN) {
|
||||||
|
// Show the premium SMS permission selector
|
||||||
|
securityBillingDesc.setVisibility(View.VISIBLE);
|
||||||
|
securityBillingList.setVisibility(View.VISIBLE);
|
||||||
|
Spinner spinner = (Spinner) permsView.findViewById(
|
||||||
|
R.id.security_settings_premium_sms_list);
|
||||||
|
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(getActivity(),
|
||||||
|
R.array.security_settings_premium_sms_values,
|
||||||
|
android.R.layout.simple_spinner_item);
|
||||||
|
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||||
|
spinner.setAdapter(adapter);
|
||||||
|
// List items are in the same order as SmsUsageMonitor constants, offset by 1.
|
||||||
|
spinner.setSelection(premiumSmsPermission - 1);
|
||||||
|
spinner.setOnItemSelectedListener(new PremiumSmsSelectionListener(
|
||||||
|
packageName, mSmsManager));
|
||||||
|
} else {
|
||||||
|
// Hide the premium SMS permission selector
|
||||||
|
securityBillingDesc.setVisibility(View.GONE);
|
||||||
|
securityBillingList.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
// App permissions subsection
|
||||||
|
if (asp.getPermissionCount() > 0) {
|
||||||
// Make the security sections header visible
|
// Make the security sections header visible
|
||||||
LinearLayout securityList = (LinearLayout) permsView.findViewById(
|
LinearLayout securityList = (LinearLayout) permsView.findViewById(
|
||||||
R.id.security_settings_list);
|
R.id.security_settings_list);
|
||||||
@@ -642,8 +684,6 @@ public class InstalledAppDetails extends Fragment
|
|||||||
mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
|
mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
permsView.setVisibility(View.GONE);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
checkForceStop();
|
checkForceStop();
|
||||||
@@ -653,6 +693,42 @@ public class InstalledAppDetails extends Fragment
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static class PremiumSmsSelectionListener implements AdapterView.OnItemSelectedListener {
|
||||||
|
private final String mPackageName;
|
||||||
|
private final ISms mSmsManager;
|
||||||
|
|
||||||
|
PremiumSmsSelectionListener(String packageName, ISms smsManager) {
|
||||||
|
mPackageName = packageName;
|
||||||
|
mSmsManager = smsManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onItemSelected(AdapterView<?> parent, View view, int position,
|
||||||
|
long id) {
|
||||||
|
if (position >= 0 && position < 3) {
|
||||||
|
Log.d(TAG, "Selected premium SMS policy " + position);
|
||||||
|
setPremiumSmsPermission(mPackageName, (position + 1));
|
||||||
|
} else {
|
||||||
|
Log.e(TAG, "Error: unknown premium SMS policy " + position);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onNothingSelected(AdapterView<?> parent) {
|
||||||
|
// Ignored
|
||||||
|
}
|
||||||
|
|
||||||
|
private void setPremiumSmsPermission(String packageName, int permission) {
|
||||||
|
try {
|
||||||
|
if (mSmsManager != null) {
|
||||||
|
mSmsManager.setPremiumSmsPermission(packageName, permission);
|
||||||
|
}
|
||||||
|
} catch (RemoteException ex) {
|
||||||
|
// ignored
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void resetLaunchDefaultsUi(TextView title, TextView autoLaunchView) {
|
private void resetLaunchDefaultsUi(TextView title, TextView autoLaunchView) {
|
||||||
title.setText(R.string.auto_launch_label);
|
title.setText(R.string.auto_launch_label);
|
||||||
autoLaunchView.setText(R.string.auto_launch_disable_text);
|
autoLaunchView.setText(R.string.auto_launch_disable_text);
|
||||||
@@ -1027,6 +1103,17 @@ public class InstalledAppDetails extends Fragment
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int getPremiumSmsPermission(String packageName) {
|
||||||
|
try {
|
||||||
|
if (mSmsManager != null) {
|
||||||
|
return mSmsManager.getPremiumSmsPermission(packageName);
|
||||||
|
}
|
||||||
|
} catch (RemoteException ex) {
|
||||||
|
// ignored
|
||||||
|
}
|
||||||
|
return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Method implementing functionality of buttons clicked
|
* Method implementing functionality of buttons clicked
|
||||||
* @see android.view.View.OnClickListener#onClick(android.view.View)
|
* @see android.view.View.OnClickListener#onClick(android.view.View)
|
||||||
|
Reference in New Issue
Block a user