Merge "DO NOT MERGE Removes additional subtypes when clearing data." into udc-dev

            }

        }

        @Override

        public void onPackageDataCleared(String packageName, int uid) {

            boolean changed = false;

            for (InputMethodInfo imi : mMethodList) {

                if (imi.getPackageName().equals(packageName)) {

                    mAdditionalSubtypeMap.remove(imi.getId());

                    changed = true;

                }

            }

            if (changed) {

                AdditionalSubtypeUtils.save(

                        mAdditionalSubtypeMap, mMethodMap, mSettings.getCurrentUserId());

                mChangedPackages.add(packageName);

            }

        }

        @Override

        public void onFinishPackageChanges() {

            onFinishPackageChangesInternal();