Merge "Fix NPE occurring while accessing the token Map in AppSmsManager" am:...

import com.android.internal.util.Preconditions;

import java.security.SecureRandom;

import java.util.Iterator;

import java.util.Map;

import java.util.Set;

import java.util.concurrent.TimeUnit;

    private void removeExpiredTokenLocked() {

        final long currentTimeMillis = System.currentTimeMillis();

        final Set<String> keySet = mTokenMap.keySet();

        for (String token : keySet) {

            AppRequestInfo request = mTokenMap.get(token);

        Iterator<Map.Entry<String, AppRequestInfo>> iterator = mTokenMap.entrySet().iterator();

        while (iterator.hasNext()) {

            Map.Entry<String, AppRequestInfo> entry = iterator.next();

            AppRequestInfo request = entry.getValue();

            if (request.packageBasedToken

                    && (currentTimeMillis - TIMEOUT_MILLIS > request.timestamp)) {

                // Send the provided intent with SMS retriever status

                } catch (PendingIntent.CanceledException e) {

                    // do nothing

                }

                removeRequestLocked(request);

                // Remove from mTokenMap and mPackageMap

                iterator.remove();

                mPackageMap.remove(entry.getValue().packageName);

            }

        }

    }