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

Commit d527e8b9 authored by kholoud mohamed's avatar kholoud mohamed Committed by Automerger Merge Worker
Browse files

Update Enterprise search keywords/results am: f0645d4c am: b5c6708b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/18184960



Change-Id: Ia15aa5fd44242b770954340531afff46604cd969
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b3871ad b5c6708b

src/com/android/settings/intelligence/search/indexing/DevicePolicyResourcesUtils.java

0 → 100644
+414 −0

File added.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/intelligence/search/indexing/IndexDatabaseHelper.java

+19 −1
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.settings.intelligence.search.indexing;



import static com.android.settings.intelligence.search.indexing.DevicePolicyResourcesUtils.DEVICE_POLICY_RESOURCES_VERSION_KEY;



import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.pm.PackageInfo;
@@ -291,11 +294,15 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper { 
        final String fingerprint = Build.FINGERPRINT;

        final String providerVersionedNames =

                IndexDatabaseHelper.buildProviderVersionedNames(context, providers);

        final String devicePolicyResourcesVersion = context.getSystemService(

                DevicePolicyManager.class).getResources().getString(

                        DEVICE_POLICY_RESOURCES_VERSION_KEY, () -> null);

        context.getSharedPreferences(SHARED_PREFS_TAG, Context.MODE_PRIVATE)

                .edit()

                .putBoolean(localeStr, true)

                .putBoolean(fingerprint, true)

                .putString(PREF_KEY_INDEXED_PROVIDERS, providerVersionedNames)

                .putString(DEVICE_POLICY_RESOURCES_VERSION_KEY, devicePolicyResourcesVersion)

                .apply();

    }
@@ -318,10 +325,21 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper { 
        final boolean isIndexed = prefs.getBoolean(fingerprint, false)

                && prefs.getBoolean(localeStr, false)

                && TextUtils.equals(

                prefs.getString(PREF_KEY_INDEXED_PROVIDERS, null), providerVersionedNames);

                prefs.getString(PREF_KEY_INDEXED_PROVIDERS, null), providerVersionedNames)

                && !enterpriseResourcesUpdated(context, prefs);

        return !isIndexed;

    }



    /**

     * returns true if device policy resources have been updated and need reindexing.

     */

    private static boolean enterpriseResourcesUpdated(Context context, SharedPreferences prefs) {

        final String currentVersion = context.getSystemService(DevicePolicyManager.class)

                .getResources().getString(DEVICE_POLICY_RESOURCES_VERSION_KEY, () -> null);

        return !TextUtils.equals(

                prefs.getString(DEVICE_POLICY_RESOURCES_VERSION_KEY, null), currentVersion);

    }



    private void dropTables(SQLiteDatabase db) {

        db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_META_INDEX);

        db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_PREFS_INDEX);

src/com/android/settings/intelligence/search/indexing/XmlParserUtils.java

+11 −2
Original line number Diff line number Diff line
@@ -85,7 +85,11 @@ public class XmlParserUtils { 
            // It's a resource

            try  {

                final int resValue = Integer.parseInt(keywordRes.substring(1));

                if (DevicePolicyResourcesUtils.isDevicePolicyResource(context, resValue)) {

                    return DevicePolicyResourcesUtils.getDevicePolicyResource(context, resValue);

                } else {

                    return context.getString(resValue);

                }

            } catch (NumberFormatException e) {

                Log.w(TAG, "Failed to parse keyword attribute, skipping " + keywordRes);

                return null;
@@ -111,7 +115,12 @@ public class XmlParserUtils { 
    @Nullable

    private static String getData(Context context, AttributeSet set, int[] attrs, int resId) {

        final TypedArray ta = context.obtainStyledAttributes(set, attrs);

        String data = ta.getString(resId);

        String data;

        if (DevicePolicyResourcesUtils.isDevicePolicyResource(context, ta, resId)) {

            data = DevicePolicyResourcesUtils.getDevicePolicyResource(context, ta, resId);

        } else {

            data = ta.getString(resId);

        }

        ta.recycle();

        return data;

    }