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

Commit 5ca3e861 authored by Wei Liu's avatar Wei Liu
Browse files

Merge commit '1080bc10' into manual_merge_1080bc1 

Change-Id: Ida1d99be96e5e637d454d68906fe8bebeb21ed09
parents e55e65c9 1080bc10

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2532,4 +2532,6 @@ 
         is installed. -->

    <bool name="config_permissionReviewRequired">false</bool>



    <string name="config_networkOverLimitComponent" translatable="false">com.android.systemui/com.android.systemui.net.NetworkOverLimitActivity</string>

    <string name="config_dataUsageSummaryComponent" translatable="false">com.android.settings/com.android.settings.Settings$DataUsageSummaryActivity</string>

</resources>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -2648,6 +2648,10 @@ 
  <!-- Colon separated list of package names that should be granted DND access -->

  <java-symbol type="string" name="config_defaultDndAccessPackages" />



  <!-- For NetworkPolicyManagerService -->

  <java-symbol type="string" name="config_networkOverLimitComponent" />

  <java-symbol type="string" name="config_dataUsageSummaryComponent" />



  <java-symbol type="string" name="lockscreen_storage_locked" />



  <!-- Used for MimeIconUtils. -->

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+10 −10
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
     */

    private void notifyOverLimitNL(NetworkTemplate template) {

        if (!mOverLimitNotified.contains(template)) {

            mContext.startActivity(buildNetworkOverLimitIntent(template));

            mContext.startActivity(buildNetworkOverLimitIntent(mContext.getResources(), template));

            mOverLimitNotified.add(template);

        }

    }
@@ -1081,7 +1081,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                builder.setDeleteIntent(PendingIntent.getBroadcast(

                        mContext, 0, snoozeIntent, PendingIntent.FLAG_UPDATE_CURRENT));



                final Intent viewIntent = buildViewDataUsageIntent(policy.template);

                final Intent viewIntent = buildViewDataUsageIntent(res, policy.template);

                builder.setContentIntent(PendingIntent.getActivity(

                        mContext, 0, viewIntent, PendingIntent.FLAG_UPDATE_CURRENT));
@@ -1117,7 +1117,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                builder.setContentTitle(title);

                builder.setContentText(body);



                final Intent intent = buildNetworkOverLimitIntent(policy.template);

                final Intent intent = buildNetworkOverLimitIntent(res, policy.template);

                builder.setContentIntent(PendingIntent.getActivity(

                        mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT));

                break;
@@ -1152,7 +1152,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                builder.setContentTitle(title);

                builder.setContentText(body);



                final Intent intent = buildViewDataUsageIntent(policy.template);

                final Intent intent = buildViewDataUsageIntent(res, policy.template);

                builder.setContentIntent(PendingIntent.getActivity(

                        mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT));

                break;
@@ -3525,19 +3525,19 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        return intent;

    }



    private static Intent buildNetworkOverLimitIntent(NetworkTemplate template) {

    private static Intent buildNetworkOverLimitIntent(Resources res, NetworkTemplate template) {

        final Intent intent = new Intent();

        intent.setComponent(new ComponentName(

                "com.android.systemui", "com.android.systemui.net.NetworkOverLimitActivity"));

        intent.setComponent(ComponentName.unflattenFromString(

                res.getString(R.string.config_networkOverLimitComponent)));

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);

        return intent;

    }



    private static Intent buildViewDataUsageIntent(NetworkTemplate template) {

    private static Intent buildViewDataUsageIntent(Resources res, NetworkTemplate template) {

        final Intent intent = new Intent();

        intent.setComponent(new ComponentName(

                "com.android.settings", "com.android.settings.Settings$DataUsageSummaryActivity"));

        intent.setComponent(ComponentName.unflattenFromString(

                res.getString(R.string.config_dataUsageSummaryComponent)));

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        intent.putExtra(EXTRA_NETWORK_TEMPLATE, template);

        return intent;