commit 454d7fcca892390e69e0c386a60ac6ea9fbd59f7
author Felipe Leme <felipeal@google.com> Mon Aug 08 11:04:30 2016 -0700
committer Felipe Leme <felipeal@google.com> Mon Aug 15 23:35:53 2016 +0000
tree 539e3e07e2c1bd6c5aca509b34e207df137f860b
parent dfe576b3e47ce69ba7b4a3055c8593042d491a74

Fixed storage calculation when SD card is adopted as internal storage.

A SD Card can be set as internal storage, in which case its total must
be added to the total internal storage size.

Prior to this change, the total internal storage size was hardcoded as
the value returned by Storage Manager.

Also fixed the storage summary total to exclude portable devices.

** Cherrypick of c53410c41148a3882673ba1a3d95dd050649ea2a **

Fixes: 30689428
BUG: 30742322

Change-Id: I1e33038eeebc91f3c525a387a97987391c10f2f9