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

Commit e24780ed authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

resolve merge conflicts of 75ae46d0 to lmp-mr1-dev 

Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:
parents 56d630a3 75ae46d0

src/com/android/settings/accounts/ManageAccountsSettings.java

+20 −10
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.preference.Preference;

import android.preference.Preference.OnPreferenceClickListener;

import android.preference.PreferenceGroup;

import android.preference.PreferenceScreen;

import android.util.Log;

import android.view.LayoutInflater;
@@ -432,15 +433,18 @@ public class ManageAccountsSettings extends AccountPreferenceBase 
    }



    /**

     * Filters through the preference list provided by GoogleLoginService.

     * Recursively filters through the preference list provided by GoogleLoginService.

     *

     * This method removes all the invalid intent from the list, adds account name as extra into the

     * intent, and hack the location settings to start it as a fragment.

     */

    private void updatePreferenceIntents(PreferenceScreen prefs) {

    private void updatePreferenceIntents(PreferenceGroup prefs) {

        final PackageManager pm = getActivity().getPackageManager();

        for (int i = 0; i < prefs.getPreferenceCount();) {

            Preference pref = prefs.getPreference(i);

            if (pref instanceof PreferenceGroup) {

                updatePreferenceIntents((PreferenceGroup) pref);

            }

            Intent intent = pref.getIntent();

            if (intent != null) {

                // Hack. Launch "Location" as fragment instead of as activity.
@@ -510,20 +514,26 @@ public class ManageAccountsSettings extends AccountPreferenceBase 
    private boolean isSafeIntent(PackageManager pm, Intent intent) {

        AuthenticatorDescription authDesc =

                mAuthenticatorHelper.getAccountTypeDescription(mAccountType);

        ResolveInfo resolveInfo = pm.resolveActivity(intent, 0);

        ResolveInfo resolveInfo =

            pm.resolveActivityAsUser(intent, 0, mUserHandle.getIdentifier());

        if (resolveInfo == null) {

            return false;

        }

        ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;

        ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;

        try {

            if (resolvedActivityInfo.exported) {

                if (resolvedActivityInfo.permission == null) {

                    return true; // exported activity without permission.

                } else if (pm.checkPermission(resolvedActivityInfo.permission,

                        authDesc.packageName) == PackageManager.PERMISSION_GRANTED) {

                    return true;

                }

            }

            ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);

            return resolvedActivityInfo.exported

                    || resolvedAppInfo.uid == authenticatorAppInf.uid;

            return  resolvedAppInfo.uid == authenticatorAppInf.uid;

        } catch (NameNotFoundException e) {

            Log.e(TAG,

                    "Intent considered unsafe due to exception.",

                    e);

            Log.e(TAG, "Intent considered unsafe due to exception.", e);

            return false;

        }

    }