commit a03686cc2ecc694f26e3bb211a490fb00c47a806
author Android Build Merger (Role) <android-build-merger@google.com> Fri Mar 17 23:10:41 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 17 23:10:46 2017 +0000
tree d92708a58c09c1b3eaf19a38353420c8760e6864
parent a5ccbd9993791919fbc730ec51192b68699f0818
parent def6fee7f5c14cffca787b820b4697862494c096

Merge "Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f am: 07d79aa3b0 am: acd3953ea1"

services/core/java/com/android/server/om/OverlayManagerServiceImpl.java

diff --git a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
index 6af1c3b..db133f8 100644
--- a/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
+++ b/services/core/java/com/android/server/om/OverlayManagerServiceImpl.java
@@ -130,7 +130,7 @@
         // installed and should be removed
         final int storedOverlayInfosSize = storedOverlayInfos.size();
         for (int i = 0; i < storedOverlayInfosSize; i++) {
-            final OverlayInfo oi = storedOverlayInfos.get(i);
+            final OverlayInfo oi = storedOverlayInfos.valueAt(i);
             mSettings.remove(oi.packageName, oi.userId);
             removeIdmapIfPossible(oi);
             packagesToUpdateAssets.add(oi.targetPackageName);