OSDN Git Service

Offer to "merge" subscribers for data usage.
authorJeff Sharkey <jsharkey@android.com>
Wed, 3 Dec 2014 21:44:26 +0000 (13:44 -0800)
committerJeff Sharkey <jsharkey@android.com>
Mon, 8 Dec 2014 16:42:12 +0000 (08:42 -0800)
commit4e2d16cdc068ccf9f2b8e98b266a50edc97b6eee
tree85ee1d0d0ddd7ea067394a4878a79cae5b041966
parent838d6dc94970201792bc825091c9b520fb96821a
Offer to "merge" subscribers for data usage.

When picking a template to use for querying statistics and setting
policies, normalize it so we widen the template to cover any merged
subscribers.

Also remove some code related to long-dormant split policies.

Bug: 18012787
Change-Id: I1e07dc09016df21ecfd7b3fad49759fa57570391
src/com/android/settings/DataUsageSummary.java
src/com/android/settings/net/NetworkPolicyEditor.java