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

Commit 9b98e89d authored by Marissa Wall's avatar Marissa Wall Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b143889121" 

* changes:
  Revert "Add a job to prune UsageStats data on package removals."
  Revert "Prune obsolete UsageStats data on upgrade."
parents 72672006 1a1c61b2

core/res/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -5045,10 +5045,6 @@ 
                 android:permission="android.permission.BIND_JOB_SERVICE" >

        </service>



        <service android:name="com.android.server.usage.UsageStatsIdleService"

                 android:permission="android.permission.BIND_JOB_SERVICE" >

        </service>



        <service android:name="com.android.server.net.watchlist.ReportWatchlistJobService"

                 android:permission="android.permission.BIND_JOB_SERVICE" >

        </service>

services/core/java/android/app/usage/UsageStatsManagerInternal.java

+0 −9
Original line number Diff line number Diff line
@@ -281,13 +281,4 @@ public abstract class UsageStatsManagerInternal { 
            return mUsageRemaining;

        }

    }



    /**

     * Called by {@link com.android.server.usage.UsageStatsIdleService} when the device is idle to

     * prune usage stats data for uninstalled packages.

     *

     * @param userId the user associated with the job

     * @return {@code true} if the pruning was successful, {@code false} otherwise

     */

    public abstract boolean pruneUninstalledPackagesData(@UserIdInt int userId);

}

services/tests/servicestests/src/com/android/server/usage/UsageStatsDatabaseTest.java

+11 −101
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import java.io.FileOutputStream; 
import java.io.IOException;

import java.util.List;

import java.util.Locale;

import java.util.Set;



@RunWith(AndroidJUnit4.class)

@SmallTest
@@ -94,8 +93,6 @@ public class UsageStatsDatabaseTest { 
                for (File f : usageFiles) {

                    f.delete();

                }

            } else {

                intervalDir.delete();

            }

        }

    }
@@ -590,7 +587,6 @@ public class UsageStatsDatabaseTest { 
        db.readMappingsLocked();

        db.init(1);

        db.putUsageStats(interval, mIntervalStats);

        db.writeMappingsLocked();



        final String removedPackage = "fake.package.name0";

        // invoke handler call directly from test to remove package
@@ -598,21 +594,21 @@ public class UsageStatsDatabaseTest { 


        List<IntervalStats> stats = db.queryUsageStats(interval, 0, mEndTime,

                mIntervalStatsVerifier);

        assertEquals(1, stats.size(),

                "Only one interval stats object should exist for the given time range.");

        final IntervalStats stat = stats.get(0);

        for (int i = 0; i < stats.size(); i++) {

            final IntervalStats stat = stats.get(i);

            if (stat.packageStats.containsKey(removedPackage)) {

                fail("Found removed package " + removedPackage + " in package stats.");

                return;

            }

        for (int i = 0; i < stat.events.size(); i++) {

            final Event event = stat.events.get(i);

            for (int j = 0; j < stat.events.size(); j++) {

                final Event event = stat.events.get(j);

                if (removedPackage.equals(event.mPackage)) {

                    fail("Found an event from removed package " + removedPackage);

                    return;

                }

            }

        }

    }



    @Test

    public void testPackageRetention() throws IOException {
@@ -621,90 +617,4 @@ public class UsageStatsDatabaseTest { 
        verifyPackageNotRetained(UsageStatsManager.INTERVAL_MONTHLY);

        verifyPackageNotRetained(UsageStatsManager.INTERVAL_YEARLY);

    }



    private void verifyPackageDataIsRemoved(UsageStatsDatabase db, int interval,

            String removedPackage) {

        List<IntervalStats> stats = db.queryUsageStats(interval, 0, mEndTime,

                mIntervalStatsVerifier);

        assertEquals(1, stats.size(),

                "Only one interval stats object should exist for the given time range.");

        final IntervalStats stat = stats.get(0);

        if (stat.packageStats.containsKey(removedPackage)) {

            fail("Found removed package " + removedPackage + " in package stats.");

            return;

        }

        for (int i = 0; i < stat.events.size(); i++) {

            final Event event = stat.events.get(i);

            if (removedPackage.equals(event.mPackage)) {

                fail("Found an event from removed package " + removedPackage);

                return;

            }

        }

    }



    private void verifyPackageDataIsNotRemoved(UsageStatsDatabase db, int interval,

            Set<String> installedPackages) {

        List<IntervalStats> stats = db.queryUsageStats(interval, 0, mEndTime,

                mIntervalStatsVerifier);

        assertEquals(1, stats.size(),

                "Only one interval stats object should exist for the given time range.");

        final IntervalStats stat = stats.get(0);

        if (!stat.packageStats.containsAll(installedPackages)) {

            fail("Could not find some installed packages in package stats.");

            return;

        }

        // attempt to find an event from each installed package

        for (String installedPackage : installedPackages) {

            for (int i = 0; i < stat.events.size(); i++) {

                if (installedPackage.equals(stat.events.get(i).mPackage)) {

                    break;

                }

                if (i == stat.events.size() - 1) {

                    fail("Could not find any event for: " + installedPackage);

                    return;

                }

            }

        }

    }



    @Test

    public void testPackageDataIsRemoved() throws IOException {

        UsageStatsDatabase db = new UsageStatsDatabase(mTestDir);

        db.readMappingsLocked();

        db.init(1);



        // write stats to disk for each interval

        db.putUsageStats(UsageStatsManager.INTERVAL_DAILY, mIntervalStats);

        db.putUsageStats(UsageStatsManager.INTERVAL_WEEKLY, mIntervalStats);

        db.putUsageStats(UsageStatsManager.INTERVAL_MONTHLY, mIntervalStats);

        db.putUsageStats(UsageStatsManager.INTERVAL_YEARLY, mIntervalStats);

        db.writeMappingsLocked();



        final Set<String> installedPackages = mIntervalStats.packageStats.keySet();

        final String removedPackage = installedPackages.iterator().next();

        installedPackages.remove(removedPackage);



        // mimic a package uninstall

        db.onPackageRemoved(removedPackage, System.currentTimeMillis());



        // mimic the idle prune job being triggered

        db.pruneUninstalledPackagesData();



        // read data from disk into a new db instance

        UsageStatsDatabase newDB = new UsageStatsDatabase(mTestDir);

        newDB.readMappingsLocked();

        newDB.init(mEndTime);



        // query data for each interval and ensure data for package doesn't exist

        verifyPackageDataIsRemoved(newDB, UsageStatsManager.INTERVAL_DAILY, removedPackage);

        verifyPackageDataIsRemoved(newDB, UsageStatsManager.INTERVAL_WEEKLY, removedPackage);

        verifyPackageDataIsRemoved(newDB, UsageStatsManager.INTERVAL_MONTHLY, removedPackage);

        verifyPackageDataIsRemoved(newDB, UsageStatsManager.INTERVAL_YEARLY, removedPackage);



        // query data for each interval and ensure some data for installed packages exists

        verifyPackageDataIsNotRemoved(newDB, UsageStatsManager.INTERVAL_DAILY, installedPackages);

        verifyPackageDataIsNotRemoved(newDB, UsageStatsManager.INTERVAL_WEEKLY, installedPackages);

        verifyPackageDataIsNotRemoved(newDB, UsageStatsManager.INTERVAL_MONTHLY, installedPackages);

        verifyPackageDataIsNotRemoved(newDB, UsageStatsManager.INTERVAL_YEARLY, installedPackages);

    }

}

services/usage/java/com/android/server/usage/IntervalStats.java

+5 −19
Original line number Diff line number Diff line
@@ -448,11 +448,8 @@ public class IntervalStats { 
    /**

     * Parses all of the tokens to strings in the obfuscated usage stats data. This includes

     * deobfuscating each of the package tokens and chooser actions and categories.

     *

     * @return {@code true} if any stats were omitted while deobfuscating, {@code false} otherwise.

     */

    private boolean deobfuscateUsageStats(PackagesTokenData packagesTokenData) {

        boolean dataOmitted = false;

    private void deobfuscateUsageStats(PackagesTokenData packagesTokenData) {

        final int usageStatsSize = packageStatsObfuscated.size();

        for (int statsIndex = 0; statsIndex < usageStatsSize; statsIndex++) {

            final int packageToken = packageStatsObfuscated.keyAt(statsIndex);
@@ -460,7 +457,6 @@ public class IntervalStats { 
            usageStats.mPackageName = packagesTokenData.getPackageString(packageToken);

            if (usageStats.mPackageName == null) {

                Slog.e(TAG, "Unable to parse usage stats package " + packageToken);

                dataOmitted = true;

                continue;

            }
@@ -493,18 +489,14 @@ public class IntervalStats { 
            }

            packageStats.put(usageStats.mPackageName, usageStats);

        }

        return dataOmitted;

    }



    /**

     * Parses all of the tokens to strings in the obfuscated events data. This includes

     * deobfuscating the package token, along with any class, task root package/class tokens, and

     * shortcut or notification channel tokens.

     *

     * @return {@code true} if any events were omitted while deobfuscating, {@code false} otherwise.

     */

    private boolean deobfuscateEvents(PackagesTokenData packagesTokenData) {

        boolean dataOmitted = false;

    private void deobfuscateEvents(PackagesTokenData packagesTokenData) {

        for (int i = this.events.size() - 1; i >= 0; i--) {

            final Event event = this.events.get(i);

            final int packageToken = event.mPackageToken;
@@ -512,7 +504,6 @@ public class IntervalStats { 
            if (event.mPackage == null) {

                Slog.e(TAG, "Unable to parse event package " + packageToken);

                this.events.remove(i);

                dataOmitted = true;

                continue;

            }
@@ -552,7 +543,6 @@ public class IntervalStats { 
                        Slog.e(TAG, "Unable to parse shortcut " + event.mShortcutIdToken

                                + " for package " + packageToken);

                        this.events.remove(i);

                        dataOmitted = true;

                        continue;

                    }

                    break;
@@ -564,25 +554,21 @@ public class IntervalStats { 
                                + event.mNotificationChannelIdToken + " for package "

                                + packageToken);

                        this.events.remove(i);

                        dataOmitted = true;

                        continue;

                    }

                    break;

            }

        }

        return dataOmitted;

    }



    /**

     * Parses the obfuscated tokenized data held in this interval stats object.

     *

     * @return {@code true} if any data was omitted while deobfuscating, {@code false} otherwise.

     * @hide

     */

    public boolean deobfuscateData(PackagesTokenData packagesTokenData) {

        final boolean statsOmitted = deobfuscateUsageStats(packagesTokenData);

        final boolean eventsOmitted = deobfuscateEvents(packagesTokenData);

        return statsOmitted || eventsOmitted;

    public void deobfuscateData(PackagesTokenData packagesTokenData) {

        deobfuscateUsageStats(packagesTokenData);

        deobfuscateEvents(packagesTokenData);

    }



    /**

services/usage/java/com/android/server/usage/PackagesTokenData.java

+2 −5
Original line number Diff line number Diff line
@@ -162,18 +162,15 @@ public final class PackagesTokenData { 
     *

     * @param packageName the package to be removed

     * @param timeRemoved the time stamp of when the package was removed

     * @return the token mapped to the package removed or {@code PackagesTokenData.UNASSIGNED_TOKEN}

     *         if not mapped

     */

    public int removePackage(String packageName, long timeRemoved) {

    public void removePackage(String packageName, long timeRemoved) {

        removedPackagesMap.put(packageName, timeRemoved);



        if (!packagesToTokensMap.containsKey(packageName)) {

            return UNASSIGNED_TOKEN;

            return;

        }

        final int packageToken = packagesToTokensMap.get(packageName).get(packageName);

        packagesToTokensMap.remove(packageName);

        tokensToPackagesMap.delete(packageToken);

        return packageToken;

    }

}