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

Commit 67cd6ab9 authored by Tony Mantler's avatar Tony Mantler
Browse files

Move ApplicationsState to SettingsLib 

Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings

b/21328967

Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
parent 7e38eea8

AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -4,6 +4,9 @@ 
        coreApp="true"

        coreApp="true"

        android:sharedUserId="android.uid.system">

        android:sharedUserId="android.uid.system">





    <uses-sdk

        android:minSdkVersion="21" />



    <original-package android:name="com.android.settings" />

    <original-package android:name="com.android.settings" />





    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

src/com/android/settings/Utils.java

+3 −6
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 




package com.android.settings;

package com.android.settings;





import static android.content.Intent.EXTRA_USER;



import android.annotation.Nullable;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityManager;

import android.app.ActivityManagerNative;

import android.app.ActivityManagerNative;
@@ -70,8 +68,6 @@ import android.provider.ContactsContract.Data; 
import android.provider.ContactsContract.Profile;

import android.provider.ContactsContract.Profile;

import android.provider.ContactsContract.RawContacts;

import android.provider.ContactsContract.RawContacts;

import android.service.persistentdata.PersistentDataBlockManager;

import android.service.persistentdata.PersistentDataBlockManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;
@@ -87,20 +83,21 @@ import android.widget.TabWidget; 




import com.android.internal.util.UserIcons;

import com.android.internal.util.UserIcons;

import com.android.settings.UserAdapter.UserDetails;

import com.android.settings.UserAdapter.UserDetails;

import com.android.settings.applications.ApplicationsState;

import com.android.settings.dashboard.DashboardTile;

import com.android.settings.dashboard.DashboardTile;

import com.android.settings.drawable.CircleFramedDrawable;

import com.android.settings.drawable.CircleFramedDrawable;

import com.android.settingslib.applications.ApplicationsState;





import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;

import java.net.InetAddress;

import java.net.InetAddress;

import java.text.NumberFormat;

import java.text.NumberFormat;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Iterator;

import java.util.Iterator;

import java.util.List;

import java.util.List;

import java.util.Locale;

import java.util.Locale;





import static android.content.Intent.EXTRA_USER;



public final class Utils {

public final class Utils {

    private static final String TAG = "Settings";

    private static final String TAG = "Settings";

src/com/android/settings/applications/AdvancedAppSettings.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -23,10 +23,11 @@ import android.preference.Preference; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsLogger;

import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.applications.ApplicationsState.AppEntry;

import com.android.settings.applications.ApplicationsState.Session;

import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;

import com.android.settings.applications.PermissionsSummaryHelper.PermissionsResultCallback;

import com.android.settings.fuelgauge.PowerWhitelistBackend;

import com.android.settings.fuelgauge.PowerWhitelistBackend;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.applications.ApplicationsState.AppEntry;

import com.android.settingslib.applications.ApplicationsState.Session;





import java.util.ArrayList;

import java.util.ArrayList;

src/com/android/settings/applications/AppInfoBase.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,8 @@ import android.util.Log; 
import com.android.settings.SettingsActivity;

import com.android.settings.SettingsActivity;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.Utils;

import com.android.settings.applications.ApplicationsState.AppEntry;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.applications.ApplicationsState.AppEntry;





import java.util.ArrayList;

import java.util.ArrayList;

src/com/android/settings/applications/AppPermissionSettings.java

deleted100644 → 0
+0 −236
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.applications;



import android.app.AlertDialog;

import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.os.Build;

import android.os.Bundle;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.AdapterView;

import android.widget.AppSecurityPermissions;

import android.widget.ArrayAdapter;

import android.widget.LinearLayout;

import android.widget.Spinner;

import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.telephony.ISms;

import com.android.internal.telephony.SmsUsageMonitor;

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.applications.ApplicationsState.AppEntry;



import java.util.ArrayList;



public class AppPermissionSettings extends AppInfoWithHeader {



    private ISms mSmsManager;

    private View mRootView;



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mSmsManager = ISms.Stub.asInterface(ServiceManager.getService("isms"));

    }



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        final View view = inflater.inflate(R.layout.permission_settings, container, false);



        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);

        Utils.forceCustomPadding(allDetails, true /* additive padding */);



        mRootView = view;

        return view;

    }



    @Override

    protected boolean refreshUi() {

        retrieveAppEntry();

        // Security permissions section

        LinearLayout permsView = (LinearLayout) mRootView.findViewById(R.id.permissions_section);

        AppSecurityPermissions asp = new AppSecurityPermissions(getActivity(), mPackageName);

        int premiumSmsPermission = getPremiumSmsPermission(mPackageName);

        // 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);

        } 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(

                    mPackageName, 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

            LinearLayout securityList = (LinearLayout) permsView.findViewById(

                    R.id.security_settings_list);

            securityList.removeAllViews();

            securityList.addView(asp.getPermissionsViewWithRevokeButtons());

            // If this app is running under a shared user ID with other apps,

            // update the description to explain this.

            String[] packages = mPm.getPackagesForUid(mPackageInfo.applicationInfo.uid);

            if (packages != null && packages.length > 1) {

                ArrayList<CharSequence> pnames = new ArrayList<CharSequence>();

                for (int i=0; i<packages.length; i++) {

                    String pkg = packages[i];

                    if (mPackageInfo.packageName.equals(pkg)) {

                        continue;

                    }

                    try {

                        ApplicationInfo ainfo = mPm.getApplicationInfo(pkg, 0);

                        pnames.add(ainfo.loadLabel(mPm));

                    } catch (PackageManager.NameNotFoundException e) {

                    }

                }

                final int N = pnames.size();

                if (N > 0) {

                    final Resources res = getActivity().getResources();

                    String appListStr;

                    if (N == 1) {

                        appListStr = pnames.get(0).toString();

                    } else if (N == 2) {

                        appListStr = res.getString(R.string.join_two_items, pnames.get(0),

                                pnames.get(1));

                    } else {

                        appListStr = pnames.get(N-2).toString();

                        for (int i=N-3; i>=0; i--) {

                            appListStr = res.getString(i == 0 ? R.string.join_many_items_first

                                    : R.string.join_many_items_middle, pnames.get(i), appListStr);

                        }

                        appListStr = res.getString(R.string.join_many_items_last,

                                appListStr, pnames.get(N-1));

                    }

                    TextView descr = (TextView) mRootView.findViewById(

                            R.id.security_settings_desc);

                    descr.setText(res.getString(R.string.security_settings_desc_multi,

                            mPackageInfo.applicationInfo.loadLabel(mPm), appListStr));

                }

            }

        }

        return true;

    }



    private int getPremiumSmsPermission(String packageName) {

        try {

            if (mSmsManager != null) {

                return mSmsManager.getPremiumSmsPermission(packageName);

            }

        } catch (RemoteException ex) {

            // ignored

        }

        return SmsUsageMonitor.PREMIUM_SMS_PERMISSION_UNKNOWN;

    }



    @Override

    protected AlertDialog createDialog(int id, int errorCode) {

        // No dialogs for Permissions screen.

        return null;

    }



    public static CharSequence getSummary(AppEntry appEntry, Context context) {

        if (appEntry.info.targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1) {

            AppPermissions appPerms = new AppPermissions(context, appEntry.info.packageName);

            int count = appPerms.getPermissionCount();

            int grantedCount = appPerms.getGrantedPermissionsCount();

            return context.getResources().getQuantityString(R.plurals.runtime_permissions_summary,

                    count, grantedCount, count);

        }

        AppSecurityPermissions asp = new AppSecurityPermissions(context,

                appEntry.info.packageName);

        int count = asp.getPermissionCount();

        return context.getResources().getQuantityString(R.plurals.permissions_summary,

                count, count);

    }



    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.APPLICATIONS_APP_PERMISSION;

    }



    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) {

                if (localLOGV) 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

            }

        }

    }



}
 
 No newline at end of file